Auto merge of #119134 - petrochenkov:feedvis2, r=compiler-errors

resolve: Feed visibilities for unresolved trait impl items

Fixes https://github.com/rust-lang/rust/issues/119073
This commit is contained in:
bors 2023-12-20 11:13:22 +00:00
commit f9d52dc594
3 changed files with 45 additions and 2 deletions

View File

@ -3078,17 +3078,25 @@ fn check_trait_item<F>(
binding = self.r.resolution(module, key).try_borrow().ok().and_then(|r| r.binding); binding = self.r.resolution(module, key).try_borrow().ok().and_then(|r| r.binding);
debug!(?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 { let Some(binding) = binding else {
// We could not find the method: report an error. // We could not find the method: report an error.
let candidate = self.find_similarly_named_assoc_item(ident.name, kind); let candidate = self.find_similarly_named_assoc_item(ident.name, kind);
let path = &self.current_trait_ref.as_ref().unwrap().1.path; let path = &self.current_trait_ref.as_ref().unwrap().1.path;
let path_names = path_names_to_string(path); let path_names = path_names_to_string(path);
self.report_error(span, err(ident, path_names, candidate)); self.report_error(span, err(ident, path_names, candidate));
feed_visibility(self, module.def_id());
return; return;
}; };
let res = binding.res(); let res = binding.res();
let Res::Def(def_kind, id_in_trait) = res else { bug!() }; 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) { match seen_trait_items.entry(id_in_trait) {
Entry::Occupied(entry) => { Entry::Occupied(entry) => {
@ -3112,8 +3120,6 @@ fn check_trait_item<F>(
| (DefKind::AssocFn, AssocItemKind::Fn(..)) | (DefKind::AssocFn, AssocItemKind::Fn(..))
| (DefKind::AssocConst, AssocItemKind::Const(..)) => { | (DefKind::AssocConst, AssocItemKind::Const(..)) => {
self.r.record_partial_res(id, PartialRes::new(res)); 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; return;
} }
_ => {} _ => {}

View File

@ -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() {}

View File

@ -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`.