Skip to content

Commit 400c2bc

Browse files
committed
Auto merge of #56264 - petrochenkov:typonly, r=nikomatsakis
resolve: Extern prelude is for type namespace only Fixes #56263 (stable-to-beta regression)
2 parents aeff91d + cd2e98d commit 400c2bc

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

src/librustc_resolve/resolve_imports.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,9 @@ impl<'a, 'crateloader> Resolver<'a, 'crateloader> {
173173
}
174174
ModuleOrUniformRoot::ExternPrelude => {
175175
assert!(!restricted_shadowing);
176-
return if let Some(binding) = self.extern_prelude_get(ident, !record_used) {
176+
return if ns != TypeNS {
177+
Err((Determined, Weak::No))
178+
} else if let Some(binding) = self.extern_prelude_get(ident, !record_used) {
177179
Ok(binding)
178180
} else if !self.graph_root.unresolved_invocations.borrow().is_empty() {
179181
// Macro-expanded `extern crate` items can add names to extern prelude.

src/test/ui/imports/issue-56263.rs

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
// compile-pass
2+
// edition:2018
3+
4+
use ::std;
5+
6+
fn main() {
7+
let std = 10;
8+
}

0 commit comments

Comments
 (0)