diff --git a/zed/src/main.rs b/zed/src/main.rs index 5340cedc61..d808ee0fc3 100644 --- a/zed/src/main.rs +++ b/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); diff --git a/zed/src/menus.rs b/zed/src/menus.rs index bb53445e6f..e9d50c7824 100644 --- a/zed/src/menus.rs +++ b/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) -> Vec> { +pub fn menus(state: AppState) -> Vec> { vec![ Menu { name: "Zed", @@ -37,7 +36,7 @@ pub fn menus(settings: watch::Receiver) -> Vec> { name: "Open…", keystroke: Some("cmd-o"), action: "workspace:open", - arg: Some(Box::new(settings)), + arg: Some(Box::new(state)), }, ], },