diff --git a/crates/menu2/src/menu2.rs b/crates/menu2/src/menu2.rs index f7610849371f3df03947ece7a70dc983299e222c..6dfcce5d4f751c3e990d1a3c440ddebdf237d162 100644 --- a/crates/menu2/src/menu2.rs +++ b/crates/menu2/src/menu2.rs @@ -1,7 +1,10 @@ use gpui::actions; -// If the zed binary doesn't use anything in this crate, it will be optimized out -// and the actions won't initialize. So we just call an empty initialization function. +// If the zed binary doesn't use anything in this crate, it will be optimized away +// and the actions won't initialize. So we just provide an empty initialization function +// to be called from main. +// +// These may provide relevant context: // https://github.com/rust-lang/rust/issues/47384 // https://github.com/mmastrac/rust-ctor/issues/280 pub fn init() {} diff --git a/crates/zed2/src/main.rs b/crates/zed2/src/main.rs index 52349edd2c8ce32e4329606cf96cc59955f1ca7b..309746181e5e288fb2f7457422c814c855e468a8 100644 --- a/crates/zed2/src/main.rs +++ b/crates/zed2/src/main.rs @@ -56,10 +56,7 @@ use zed2::{ mod open_listener; fn main() { - //TODO!(figure out what the linker issues are here) - // https://github.com/rust-lang/rust/issues/47384 - // https://github.com/mmastrac/rust-ctor/issues/280 - // menu::unused(); + menu::init(); let http = http::client(); init_paths(); init_logger();