Skip to content

resolve: Feed visibilities for unresolved trait impl items #119134

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

Merged
merged 1 commit into from
Dec 20, 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
10 changes: 8 additions & 2 deletions compiler/rustc_resolve/src/late.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3078,17 +3078,25 @@ impl<'a: 'ast, 'b, 'ast, 'tcx> LateResolutionVisitor<'a, 'b, 'ast, 'tcx> {
binding = self.r.resolution(module, key).try_borrow().ok().and_then(|r| r.binding);
debug!(?binding);
}

let feed_visibility = |this: &mut Self, def_id| {
let vis = this.r.tcx.visibility(def_id).expect_local();
this.r.feed_visibility(this.r.local_def_id(id), vis);
};

let Some(binding) = binding else {
// We could not find the method: report an error.
let candidate = self.find_similarly_named_assoc_item(ident.name, kind);
let path = &self.current_trait_ref.as_ref().unwrap().1.path;
let path_names = path_names_to_string(path);
self.report_error(span, err(ident, path_names, candidate));
feed_visibility(self, module.def_id());
return;
};

let res = binding.res();
let Res::Def(def_kind, id_in_trait) = res else { bug!() };
feed_visibility(self, id_in_trait);

match seen_trait_items.entry(id_in_trait) {
Entry::Occupied(entry) => {
Expand All @@ -3112,8 +3120,6 @@ impl<'a: 'ast, 'b, 'ast, 'tcx> LateResolutionVisitor<'a, 'b, 'ast, 'tcx> {
| (DefKind::AssocFn, AssocItemKind::Fn(..))
| (DefKind::AssocConst, AssocItemKind::Const(..)) => {
self.r.record_partial_res(id, PartialRes::new(res));
let vis = self.r.tcx.visibility(id_in_trait).expect_local();
self.r.feed_visibility(self.r.local_def_id(id), vis);
return;
}
_ => {}
Expand Down
15 changes: 15 additions & 0 deletions tests/ui/privacy/unresolved-trait-impl-item.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
// edition:2018

trait MyTrait {
async fn resolved(&self);
const RESOLVED_WRONG: u8 = 0;
}

impl MyTrait for i32 {
async fn resolved(&self) {}

async fn unresolved(&self) {} //~ ERROR method `unresolved` is not a member of trait `MyTrait`
async fn RESOLVED_WRONG() {} //~ ERROR doesn't match its trait `MyTrait`
}

fn main() {}
22 changes: 22 additions & 0 deletions tests/ui/privacy/unresolved-trait-impl-item.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
error[E0407]: method `unresolved` is not a member of trait `MyTrait`
--> $DIR/unresolved-trait-impl-item.rs:11:5
|
LL | async fn unresolved(&self) {}
| ^^^^^^^^^----------^^^^^^^^^^
| | |
| | help: there is an associated function with a similar name: `resolved`
| not a member of trait `MyTrait`

error[E0324]: item `RESOLVED_WRONG` is an associated method, which doesn't match its trait `MyTrait`
--> $DIR/unresolved-trait-impl-item.rs:12:5
|
LL | const RESOLVED_WRONG: u8 = 0;
| ----------------------------- item in trait
...
LL | async fn RESOLVED_WRONG() {}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ does not match trait

error: aborting due to 2 previous errors

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