bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #103096 - petrochenkov:indresdoc, r=cjgillot

Browse source 
resolve: Shadow erroneous glob imports with erroneous single imports

If such shadowing doesn't happen we end up in a weird state that may cause ICEs.
(In non-erroneous cases single imports always shadow glob imports too.)

Fixes https://github.com/rust-lang/rust/issues/100047
Fixes https://github.com/rust-lang/rust/issues/100241
This commit is contained in:
bors 2022-10-17 02:06:25 +00:00
commit 1536ab1b38
2 changed files with 13 additions and 1 deletions
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 @@ impl<'a> Resolver<'a> {
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;