Skip to content

Commit 3e4516c

Browse files
rust-timerrust-timer
authored
Unrolled build for rust-lang#125381
Rollup merge of rust-lang#125381 - estebank:issue-96799, r=petrochenkov Silence some resolve errors when there have been glob import errors When encountering `use foo::*;` where `foo` fails to be found, and we later encounter resolution errors, we silence those later errors. A single case of the above, for an *existing* import on a big codebase would otherwise have a huge number of knock-down spurious errors. Ideally, instead of a global flag to silence all subsequent resolve errors, we'd want to introduce an unnameable binding in the appropriate rib as a sentinel when there's a failed glob import, so when we encounter a resolve error we can search for that sentinel and if found, and only then, silence that error. The current approach is just a quick proof of concept to iterate over. Partially address rust-lang#96799.
2 parents da159eb + 37c54db commit 3e4516c

11 files changed

+131
-19
lines changed

‎compiler/rustc_resolve/src/imports.rs

+15-7
Original file line numberDiff line numberDiff line change
@@ -537,6 +537,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
537537
let determined_imports = mem::take(&mut self.determined_imports);
538538
let indeterminate_imports = mem::take(&mut self.indeterminate_imports);
539539

540+
let mut glob_error = false;
540541
for (is_indeterminate, import) in determined_imports
541542
.iter()
542543
.map(|i| (false, i))
@@ -548,6 +549,8 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
548549
self.import_dummy_binding(*import, is_indeterminate);
549550

550551
if let Some(err) = unresolved_import_error {
552+
glob_error |= import.is_glob();
553+
551554
if let ImportKind::Single { source, ref source_bindings, .. } = import.kind {
552555
if source.name == kw::SelfLower {
553556
// Silence `unresolved import` error if E0429 is already emitted
@@ -563,7 +566,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
563566
{
564567
// In the case of a new import line, throw a diagnostic message
565568
// for the previous line.
566-
self.throw_unresolved_import_error(errors);
569+
self.throw_unresolved_import_error(errors, glob_error);
567570
errors = vec![];
568571
}
569572
if seen_spans.insert(err.span) {
@@ -574,7 +577,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
574577
}
575578

576579
if !errors.is_empty() {
577-
self.throw_unresolved_import_error(errors);
580+
self.throw_unresolved_import_error(errors, glob_error);
578581
return;
579582
}
580583

@@ -600,9 +603,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
600603
}
601604
}
602605

603-
if !errors.is_empty() {
604-
self.throw_unresolved_import_error(errors);
605-
}
606+
self.throw_unresolved_import_error(errors, glob_error);
606607
}
607608

608609
pub(crate) fn check_hidden_glob_reexports(
@@ -672,7 +673,11 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
672673
}
673674
}
674675

675-
fn throw_unresolved_import_error(&mut self, errors: Vec<(Import<'_>, UnresolvedImportError)>) {
676+
fn throw_unresolved_import_error(
677+
&mut self,
678+
errors: Vec<(Import<'_>, UnresolvedImportError)>,
679+
glob_error: bool,
680+
) {
676681
if errors.is_empty() {
677682
return;
678683
}
@@ -751,7 +756,10 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
751756
}
752757
}
753758

754-
diag.emit();
759+
let guar = diag.emit();
760+
if glob_error {
761+
self.glob_error = Some(guar);
762+
}
755763
}
756764

757765
/// Attempts to resolve the given import, returning:

‎compiler/rustc_resolve/src/late.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -4033,9 +4033,12 @@ impl<'a: 'ast, 'b, 'ast, 'tcx> LateResolutionVisitor<'a, 'b, 'ast, 'tcx> {
40334033
}
40344034

40354035
#[inline]
4036-
/// If we're actually rustdoc then avoid giving a name resolution error for `cfg()` items.
4036+
/// If we're actually rustdoc then avoid giving a name resolution error for `cfg()` items or
4037+
// an invalid `use foo::*;` was found, which can cause unbounded ammounts of "item not found"
4038+
// errors. We silence them all.
40374039
fn should_report_errs(&self) -> bool {
40384040
!(self.r.tcx.sess.opts.actually_rustdoc && self.in_func_body)
4041+
&& !self.r.glob_error.is_some()
40394042
}
40404043

40414044
// Resolve in alternative namespaces if resolution in the primary namespace fails.

‎compiler/rustc_resolve/src/lib.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ use rustc_data_structures::fx::{FxHashMap, FxHashSet, FxIndexMap, FxIndexSet};
3232
use rustc_data_structures::intern::Interned;
3333
use rustc_data_structures::steal::Steal;
3434
use rustc_data_structures::sync::{FreezeReadGuard, Lrc};
35-
use rustc_errors::{Applicability, Diag, ErrCode};
35+
use rustc_errors::{Applicability, Diag, ErrCode, ErrorGuaranteed};
3636
use rustc_expand::base::{DeriveResolution, SyntaxExtension, SyntaxExtensionKind};
3737
use rustc_feature::BUILTIN_ATTRIBUTES;
3838
use rustc_hir::def::Namespace::{self, *};
@@ -1048,6 +1048,7 @@ pub struct Resolver<'a, 'tcx> {
10481048

10491049
/// Maps glob imports to the names of items actually imported.
10501050
glob_map: FxHashMap<LocalDefId, FxHashSet<Symbol>>,
1051+
glob_error: Option<ErrorGuaranteed>,
10511052
visibilities_for_hashing: Vec<(LocalDefId, ty::Visibility)>,
10521053
used_imports: FxHashSet<NodeId>,
10531054
maybe_unused_trait_imports: FxIndexSet<LocalDefId>,
@@ -1417,6 +1418,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
14171418
ast_transform_scopes: FxHashMap::default(),
14181419

14191420
glob_map: Default::default(),
1421+
glob_error: None,
14201422
visibilities_for_hashing: Default::default(),
14211423
used_imports: FxHashSet::default(),
14221424
maybe_unused_trait_imports: Default::default(),

‎tests/ui/imports/import-from-missing-star-2.rs

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
mod foo {
2+
use spam::*; //~ ERROR unresolved import `spam` [E0432]
3+
}
4+
5+
fn main() {
6+
// Expect this to pass because the compiler knows there's a failed `*` import in `foo` that
7+
// might have caused it.
8+
foo::bar();
9+
// FIXME: these two should *fail* because they can't be fixed by fixing the glob import in `foo`
10+
ham(); // should error but doesn't
11+
eggs(); // should error but doesn't
12+
}

‎tests/ui/imports/import-from-missing-star-2.stderr

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
error[E0432]: unresolved import `spam`
2+
--> $DIR/import-from-missing-star-2.rs:2:9
3+
|
4+
LL | use spam::*;
5+
| ^^^^ maybe a missing crate `spam`?
6+
|
7+
= help: consider adding `extern crate spam` to use the `spam` crate
8+
9+
error: aborting due to 1 previous error
10+
11+
For more information about this error, try `rustc --explain E0432`.

‎tests/ui/imports/import-from-missing-star-3.rs

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
mod foo {
2+
use spam::*; //~ ERROR unresolved import `spam` [E0432]
3+
4+
fn x() {
5+
// Expect these to pass because the compiler knows there's a failed `*` import that might
6+
// fix it.
7+
eggs();
8+
foo::bar();
9+
}
10+
}
11+
12+
mod bar {
13+
fn z() {}
14+
fn x() {
15+
// Expect these to pass because the compiler knows there's a failed `*` import that might
16+
// fix it.
17+
foo::bar();
18+
z();
19+
// FIXME: should error but doesn't because as soon as there's a single glob import error, we
20+
// silence all resolve errors.
21+
eggs();
22+
}
23+
}
24+
25+
mod baz {
26+
fn x() {
27+
use spam::*; //~ ERROR unresolved import `spam` [E0432]
28+
fn qux() {}
29+
qux();
30+
// Expect this to pass because the compiler knows there's a local failed `*` import that
31+
// might have caused it.
32+
eggs();
33+
// Expect this to pass because the compiler knows there's a failed `*` import in `foo` that
34+
// might have caused it.
35+
foo::bar();
36+
}
37+
}
38+
39+
fn main() {
40+
// FIXME: should error but doesn't because as soon as there's a single glob import error, we
41+
// silence all resolve errors.
42+
ham();
43+
}

‎tests/ui/imports/import-from-missing-star-3.stderr

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
error[E0432]: unresolved import `spam`
2+
--> $DIR/import-from-missing-star-3.rs:2:9
3+
|
4+
LL | use spam::*;
5+
| ^^^^ maybe a missing crate `spam`?
6+
|
7+
= help: consider adding `extern crate spam` to use the `spam` crate
8+
9+
error[E0432]: unresolved import `spam`
10+
--> $DIR/import-from-missing-star-3.rs:27:13
11+
|
12+
LL | use spam::*;
13+
| ^^^^ maybe a missing crate `spam`?
14+
|
15+
= help: consider adding `extern crate spam` to use the `spam` crate
16+
17+
error: aborting due to 2 previous errors
18+
19+
For more information about this error, try `rustc --explain E0432`.

‎tests/ui/imports/import-from-missing-star.rs

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
use spam::*; //~ ERROR unresolved import `spam` [E0432]
2+
3+
fn main() {
4+
// Expect these to pass because the compiler knows there's a failed `*` import that might have
5+
// caused it.
6+
ham();
7+
eggs();
8+
// Even this case, as we might have expected `spam::foo` to exist.
9+
foo::bar();
10+
}

‎tests/ui/imports/import-from-missing-star.stderr

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
error[E0432]: unresolved import `spam`
2+
--> $DIR/import-from-missing-star.rs:1:5
3+
|
4+
LL | use spam::*;
5+
| ^^^^ maybe a missing crate `spam`?
6+
|
7+
= help: consider adding `extern crate spam` to use the `spam` crate
8+
9+
error: aborting due to 1 previous error
10+
11+
For more information about this error, try `rustc --explain E0432`.

‎tests/ui/imports/issue-31212.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ mod foo {
66
}
77

88
fn main() {
9-
foo::f(); //~ ERROR cannot find function `f` in module `foo`
9+
foo::f(); // cannot find function `f` in module `foo`, but silenced
1010
}

‎tests/ui/imports/issue-31212.stderr

+2-9
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,6 @@ error[E0432]: unresolved import `self::*`
44
LL | pub use self::*;
55
| ^^^^^^^ cannot glob-import a module into itself
66

7-
error[E0425]: cannot find function `f` in module `foo`
8-
--> $DIR/issue-31212.rs:9:10
9-
|
10-
LL | foo::f();
11-
| ^ not found in `foo`
12-
13-
error: aborting due to 2 previous errors
7+
error: aborting due to 1 previous error
148

15-
Some errors have detailed explanations: E0425, E0432.
16-
For more information about an error, try `rustc --explain E0425`.
9+
For more information about this error, try `rustc --explain E0432`.

0 commit comments

Comments
 (0)