Skip to content

Commit

Permalink
Rollup merge of rust-lang#102956 - TaKO8Ki:fix-102946, r=fee1-dead
Browse files Browse the repository at this point in the history
Use `full_res` instead of `expect_full_res`

Fixes rust-lang#102946
Fixes rust-lang#102978
  • Loading branch information
Dylan-DPC committed Oct 13, 2022
2 parents 42991e5 + b11dddd commit 48f950c
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 1 deletion.
2 changes: 1 addition & 1 deletion compiler/rustc_resolve/src/late.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1969,7 +1969,7 @@ impl<'a: 'ast, 'b, 'ast> LateResolutionVisitor<'a, 'b, 'ast> {
None
}
})
.map(|res| res.expect_full_res())
.and_then(|res| res.full_res())
.filter(|res| {
// Permit the types that unambiguously always
// result in the same type constructor being used
Expand Down
7 changes: 7 additions & 0 deletions src/test/ui/resolve/issue-102946.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
impl Error for str::Utf8Error {
//~^ ERROR cannot find trait `Error` in this scope
//~| ERROR ambiguous associated type
fn description(&self) {}
}

fn main() {}
26 changes: 26 additions & 0 deletions src/test/ui/resolve/issue-102946.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
error[E0405]: cannot find trait `Error` in this scope
--> $DIR/issue-102946.rs:1:6
|
LL | impl Error for str::Utf8Error {
| ^^^^^ not found in this scope
|
help: consider importing this trait
|
LL | use std::error::Error;
|

error[E0223]: ambiguous associated type
--> $DIR/issue-102946.rs:1:16
|
LL | impl Error for str::Utf8Error {
| ^^^^^^^^^^^^^^
|
help: you are looking for the module in `std`, not the primitive type
|
LL | impl Error for std::str::Utf8Error {
| +++++

error: aborting due to 2 previous errors

Some errors have detailed explanations: E0223, E0405.
For more information about an error, try `rustc --explain E0223`.

0 comments on commit 48f950c

Please sign in to comment.