language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-30 13:51:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Implement per-edition preludes

Browse source
This commit is contained in:
Jonas Schievink 2021-06-01 13:39:19 +02:00
parent 71117e6812
commit f96c1a0414
12 changed files with 318 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

24
crates/hir_def/src/find_path.rs
View file

@ -682,9 +682,11 @@ pub struct S;
//- /main.rs crate:main deps:std
$0
//- /std.rs crate:std
pub mod prelude { pub struct S; }
#[prelude_import]
pub use prelude::*;
pub mod prelude {
pub mod rust_2018 {
pub struct S;
}
}
"#,
"S",
"S",
@ -700,11 +702,11 @@ pub use prelude::*;
$0
//- /std.rs crate:std
pub mod prelude {
pub enum Option<T> { Some(T), None }
pub use Option::*;
pub mod rust_2018 {
pub enum Option<T> { Some(T), None }
pub use Option::*;
}
}
#[prelude_import]
pub use prelude::*;
"#;
check_found_path(code, "None", "None", "None", "None");
check_found_path(code, "Some", "Some", "Some", "Some");
@ -1080,11 +1082,11 @@ fn f() {
}
//- /std.rs crate:std
pub mod prelude {
pub enum Option { None }
pub use Option::*;
pub mod rust_2018 {
pub enum Option { None }
pub use Option::*;
}
}
#[prelude_import]
pub use prelude::*;
"#,
"None",
"None",