Merge pull request #18567 from lnicola/sync-from-rust

minor: fix proc macro test
rust-lang · Nov 28, 2024 · ab44866 · ab44866
2 parents 1d0e0cb + 1017216
commit ab44866
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/crates/rust-analyzer/tests/slow-tests/main.rs b/crates/rust-analyzer/tests/slow-tests/main.rs
@@ -1085,6 +1085,7 @@ fn resolve_proc_macro() {
     let sysroot = project_model::Sysroot::discover(
         &AbsPathBuf::assert_utf8(std::env::current_dir().unwrap()),
         &Default::default(),
+        project_model::SysrootQueryMetadata::CargoMetadata,
     );
 
     let proc_macro_server_path = sysroot.discover_proc_macro_srv().unwrap();

diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-f005c7437def424a1c43cbc380352a58d8ac920b
+9b4d7c6a40b328d212095c28670c629facf1557d
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		f005c7437def424a1c43cbc380352a58d8ac920b
		9b4d7c6a40b328d212095c28670c629facf1557d