mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolve: Shadow erroneous glob imports with erroneous single imports

Browse Source
This commit is contained in:
Vadim Petrochenkov 2022-10-15 22:37:31 +04:00
parent b8c35ca26b
commit f767f2297d
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/rustc_resolve/src/imports.rs
View File

@ -252,7 +252,7 @@ pub(crate) fn try_define(
self.set_binding_parent_module(binding, module); self.set_binding_parent_module(binding, module);
self.update_resolution(module, key, |this, resolution| { self.update_resolution(module, key, |this, resolution| {
if let Some(old_binding) = resolution.binding { if let Some(old_binding) = resolution.binding {
if res == Res::Err { if res == Res::Err && old_binding.res() != Res::Err {
// Do not override real bindings with `Res::Err`s from error recovery. // Do not override real bindings with `Res::Err`s from error recovery.
return Ok(()); return Ok(());
} }

12
src/test/rustdoc/issue-100241.rs Normal file
View File

@ -0,0 +1,12 @@
//! See [`S`].
// Check that this isn't an ICE
// should-fail
mod foo {
pub use inner::S;
//~^ ERROR unresolved imports `inner`, `foo::S`
}
use foo::*;
use foo::S;