nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-12-14 09:36:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #9102

Browse Source 
9102: minor: Fall back to legacy prelude r=jonas-schievink a=jonas-schievink

should fix https://github.com/rust-analyzer/rust-analyzer/issues/9101

bors r+

Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
This commit is contained in:
bors[bot] 2021-06-01 17:03:54 +00:00 committed by GitHub
commit dbdfeeeff9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
crates/hir_def/src/nameres/collector.rs
View File

@ -486,22 +486,35 @@ impl DefCollector<'_> {
} else {
PathKind::Abs
};
let path =
ModPath::from_segments(path_kind, [krate, name![prelude], edition].iter().cloned());
let path = ModPath::from_segments(
path_kind.clone(),
[krate.clone(), name![prelude], edition].iter().cloned(),
);
// Fall back to the older `std::prelude::v1` for compatibility with Rust <1.52.0
// FIXME remove this fallback
let fallback_path =
ModPath::from_segments(path_kind, [krate, name![prelude], name![v1]].iter().cloned());
let (per_ns, _) =
self.def_map.resolve_path(self.db, self.def_map.root, &path, BuiltinShadowMode::Other);
for path in &[path, fallback_path] {
let (per_ns, _) = self.def_map.resolve_path(
self.db,
self.def_map.root,
&path,
BuiltinShadowMode::Other,
);
match &per_ns.types {
Some((ModuleDefId::ModuleId(m), _)) => {
self.def_map.prelude = Some(*m);
}
_ => {
log::error!(
"could not resolve prelude path `{}` to module (resolved to {:?})",
path,
per_ns.types
);
match &per_ns.types {
Some((ModuleDefId::ModuleId(m), _)) => {
self.def_map.prelude = Some(*m);
return;
}
_ => {
log::debug!(
"could not resolve prelude path `{}` to module (resolved to {:?})",
path,
per_ns.types
);
}
}
}
}

1
crates/hir_expand/src/name.rs
View File

@ -180,6 +180,7 @@ pub mod known {
rust_2015,
rust_2018,
rust_2021,
v1,
// Components of known path (type name)
Iterator,
IntoIterator,