Fix error when running workspace:open command

Max Brunsfeld created 4 years ago

Change summary

zed/src/main.rs  | 2 +-
zed/src/menus.rs | 7 +++----
2 files changed, 4 insertions(+), 5 deletions(-)

Detailed changes

zed/src/main.rs

@@ -25,7 +25,7 @@ fn main() {
     };
 
     app.run(move |cx| {
-        cx.set_menus(menus::menus(app_state.settings.clone()));
+        cx.set_menus(menus::menus(app_state.clone()));
         workspace::init(cx);
         editor::init(cx);
         file_finder::init(cx);

zed/src/menus.rs

@@ -1,9 +1,8 @@
-use crate::settings::Settings;
+use crate::AppState;
 use gpui::{Menu, MenuItem};
-use postage::watch;
 
 #[cfg(target_os = "macos")]
-pub fn menus(settings: watch::Receiver<Settings>) -> Vec<Menu<'static>> {
+pub fn menus(state: AppState) -> Vec<Menu<'static>> {
     vec![
         Menu {
             name: "Zed",
@@ -37,7 +36,7 @@ pub fn menus(settings: watch::Receiver<Settings>) -> Vec<Menu<'static>> {
                     name: "Open…",
                     keystroke: Some("cmd-o"),
                     action: "workspace:open",
-                    arg: Some(Box::new(settings)),
+                    arg: Some(Box::new(state)),
                 },
             ],
         },