Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(resolve): clean up the early error return caused by non-call #111428

Merged
merged 1 commit into from
May 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions compiler/rustc_resolve/src/late.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3528,10 +3528,6 @@ impl<'a: 'ast, 'b, 'ast, 'tcx> LateResolutionVisitor<'a, 'b, 'ast, 'tcx> {
//
// Similar thing, for types, happens in `report_errors` above.
let report_errors_for_call = |this: &mut Self, parent_err: Spanned<ResolutionError<'a>>| {
if !source.is_call() {
return Some(parent_err);
}

// Before we start looking for candidates, we have to get our hands
// on the type user is trying to perform invocation on; basically:
// we're transforming `HashMap::new` into just `HashMap`.
Expand Down
5 changes: 4 additions & 1 deletion tests/ui/generic-associated-types/equality-bound.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,10 @@ error[E0433]: failed to resolve: use of undeclared type `I`
--> $DIR/equality-bound.rs:9:41
|
LL | fn sum3<J: Iterator>(i: J) -> i32 where I::Item = i32 {
| ^ use of undeclared type `I`
| ^
| |
| use of undeclared type `I`
| help: a type parameter with a similar name exists: `J`

error: aborting due to 4 previous errors

Expand Down
15 changes: 9 additions & 6 deletions tests/ui/macros/builtin-prelude-no-accidents.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,21 @@ error[E0433]: failed to resolve: use of undeclared crate or module `env`
LL | env::current_dir;
| ^^^ use of undeclared crate or module `env`

error[E0433]: failed to resolve: use of undeclared crate or module `vec`
--> $DIR/builtin-prelude-no-accidents.rs:7:14
|
LL | type B = vec::Vec<u8>;
| ^^^
| |
| use of undeclared crate or module `vec`
| help: a struct with a similar name exists (notice the capitalization): `Vec`

error[E0433]: failed to resolve: use of undeclared crate or module `panic`
--> $DIR/builtin-prelude-no-accidents.rs:6:14
|
LL | type A = panic::PanicInfo;
| ^^^^^ use of undeclared crate or module `panic`

error[E0433]: failed to resolve: use of undeclared crate or module `vec`
--> $DIR/builtin-prelude-no-accidents.rs:7:14
|
LL | type B = vec::Vec<u8>;
| ^^^ use of undeclared crate or module `vec`

error: aborting due to 3 previous errors

For more information about this error, try `rustc --explain E0433`.
12 changes: 6 additions & 6 deletions tests/ui/parser/dyn-trait-compatibility.stderr
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
error[E0433]: failed to resolve: use of undeclared crate or module `dyn`
--> $DIR/dyn-trait-compatibility.rs:3:11
|
LL | type A1 = dyn::dyn;
| ^^^ use of undeclared crate or module `dyn`

error[E0412]: cannot find type `dyn` in this scope
--> $DIR/dyn-trait-compatibility.rs:1:11
|
Expand Down Expand Up @@ -46,6 +40,12 @@ error[E0412]: cannot find type `dyn` in this scope
LL | type A3 = dyn<<dyn as dyn>::dyn>;
| ^^^ not found in this scope

error[E0433]: failed to resolve: use of undeclared crate or module `dyn`
--> $DIR/dyn-trait-compatibility.rs:3:11
|
LL | type A1 = dyn::dyn;
| ^^^ use of undeclared crate or module `dyn`

error: aborting due to 8 previous errors

Some errors have detailed explanations: E0405, E0412, E0433.
Expand Down
15 changes: 9 additions & 6 deletions tests/ui/pattern/pattern-error-continue.stderr
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
error[E0433]: failed to resolve: use of undeclared type `E`
--> $DIR/pattern-error-continue.rs:33:9
|
LL | E::V => {}
| ^ use of undeclared type `E`

error[E0532]: expected tuple struct or tuple variant, found unit variant `A::D`
--> $DIR/pattern-error-continue.rs:18:9
|
Expand Down Expand Up @@ -56,6 +50,15 @@ note: function defined here
LL | fn f(_c: char) {}
| ^ --------

error[E0433]: failed to resolve: use of undeclared type `E`
--> $DIR/pattern-error-continue.rs:33:9
|
LL | E::V => {}
| ^
| |
| use of undeclared type `E`
| help: an enum with a similar name exists: `A`

error: aborting due to 5 previous errors

Some errors have detailed explanations: E0023, E0308, E0433, E0532.
Expand Down
3 changes: 3 additions & 0 deletions tests/ui/resolve/issue-109250.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
fn main() { //~ HELP consider importing
HashMap::new; //~ ERROR failed to resolve: use of undeclared type `HashMap`
}
14 changes: 14 additions & 0 deletions tests/ui/resolve/issue-109250.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
error[E0433]: failed to resolve: use of undeclared type `HashMap`
--> $DIR/issue-109250.rs:2:5
|
LL | HashMap::new;
| ^^^^^^^ use of undeclared type `HashMap`
|
help: consider importing this struct
|
LL + use std::collections::HashMap;
|

error: aborting due to previous error

For more information about this error, try `rustc --explain E0433`.
14 changes: 14 additions & 0 deletions tests/ui/resolve/resolve-variant-assoc-item.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,26 @@ error[E0433]: failed to resolve: `V` is a variant, not a module
|
LL | E::V::associated_item;
| ^ `V` is a variant, not a module
|
help: there is an enum variant `E::V`; try using the variant's enum
|
LL | E;
| ~

error[E0433]: failed to resolve: `V` is a variant, not a module
--> $DIR/resolve-variant-assoc-item.rs:6:5
|
LL | V::associated_item;
| ^ `V` is a variant, not a module
|
help: there is an enum variant `E::V`; try using the variant's enum
|
LL | E;
| ~
help: an enum with a similar name exists
|
LL | E::associated_item;
| ~

error: aborting due to 2 previous errors

Expand Down
12 changes: 6 additions & 6 deletions tests/ui/type/type-path-err-node-types.stderr
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
error[E0433]: failed to resolve: use of undeclared type `NonExistent`
--> $DIR/type-path-err-node-types.rs:15:5
|
LL | NonExistent::Assoc::<u8>;
| ^^^^^^^^^^^ use of undeclared type `NonExistent`

error[E0412]: cannot find type `Nonexistent` in this scope
--> $DIR/type-path-err-node-types.rs:7:12
|
Expand All @@ -22,6 +16,12 @@ error[E0425]: cannot find value `nonexistent` in this scope
LL | nonexistent.nonexistent::<u8>();
| ^^^^^^^^^^^ not found in this scope

error[E0433]: failed to resolve: use of undeclared type `NonExistent`
--> $DIR/type-path-err-node-types.rs:15:5
|
LL | NonExistent::Assoc::<u8>;
| ^^^^^^^^^^^ use of undeclared type `NonExistent`

error[E0282]: type annotations needed
--> $DIR/type-path-err-node-types.rs:23:14
|
Expand Down