diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-06-01 12:46:59 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2021-06-01 12:46:59 +0100 |
commit | 4f63e79eb30a0695675a560dfe7ebae6f1dd8a94 (patch) | |
tree | 6de19b3c128809cd56641f70873c35f17974aced /crates/hir_expand | |
parent | 71117e6812f87e014bc8e984e195a75e222ac227 (diff) | |
parent | f96c1a0414ee302fe96503d89f2998483345c8a9 (diff) |
Merge #9097
9097: feat: Implement per-edition preludes r=jonas-schievink a=jonas-schievink
Part of https://github.com/rust-analyzer/rust-analyzer/issues/9056
Our previous implementation was incorrect (presumably because of the misleading comment in libstd [here](https://github.com/rust-lang/rust/blob/a7890c7952bdc9445eb6c63dc671fa7a1ab0260d/library/std/src/lib.rs#L339-L343)). `#[prelude_import]` does not define the prelude, it can only override the implicit prelude for the current crate.
This PR fixes that, which also makes the prelude imports in `rustc_span` work. Closes https://github.com/rust-analyzer/rust-analyzer/issues/8815.
bors r+
Co-authored-by: Jonas Schievink <[email protected]>
Diffstat (limited to 'crates/hir_expand')
-rw-r--r-- | crates/hir_expand/src/name.rs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/crates/hir_expand/src/name.rs b/crates/hir_expand/src/name.rs index b07fbf8b3..abc6753bf 100644 --- a/crates/hir_expand/src/name.rs +++ b/crates/hir_expand/src/name.rs | |||
@@ -176,6 +176,10 @@ pub mod known { | |||
176 | result, | 176 | result, |
177 | boxed, | 177 | boxed, |
178 | option, | 178 | option, |
179 | prelude, | ||
180 | rust_2015, | ||
181 | rust_2018, | ||
182 | rust_2021, | ||
179 | // Components of known path (type name) | 183 | // Components of known path (type name) |
180 | Iterator, | 184 | Iterator, |
181 | IntoIterator, | 185 | IntoIterator, |