From d8c80e7d95f3544b08f14e5fd243bd91c9181296 Mon Sep 17 00:00:00 2001 From: Lukas Wirth Date: Thu, 9 Mar 2023 12:32:16 +0100 Subject: [PATCH] Add core lib to proc_macro dependencies --- crates/project-model/src/sysroot.rs | 5 ++++- crates/project-model/src/tests.rs | 9 +++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/crates/project-model/src/sysroot.rs b/crates/project-model/src/sysroot.rs index 99578f425c8..74e41eda763 100644 --- a/crates/project-model/src/sysroot.rs +++ b/crates/project-model/src/sysroot.rs @@ -276,4 +276,7 @@ unwind std_detect test"; -const PROC_MACRO_DEPS: &str = "std"; +// core is required for our builtin derives to work in the proc_macro lib currently +const PROC_MACRO_DEPS: &str = " +std +core"; diff --git a/crates/project-model/src/tests.rs b/crates/project-model/src/tests.rs index 9e9691d11e8..749eee531ee 100644 --- a/crates/project-model/src/tests.rs +++ b/crates/project-model/src/tests.rs @@ -1547,6 +1547,15 @@ fn rust_project_hello_world_project_model() { ), prelude: true, }, + Dependency { + crate_id: CrateId( + 1, + ), + name: CrateName( + "core", + ), + prelude: true, + }, ], proc_macro: Err( "no proc macro loaded for sysroot crate",