Skip to content

Commit

Permalink
Tweak suggestion output
Browse files Browse the repository at this point in the history
  • Loading branch information
estebank committed Apr 24, 2021
1 parent 64ee9cc commit fb1fb7d
Show file tree
Hide file tree
Showing 9 changed files with 67 additions and 19 deletions.
35 changes: 28 additions & 7 deletions compiler/rustc_typeck/src/check/method/suggest.rs
Original file line number Diff line number Diff line change
Expand Up @@ -988,6 +988,12 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
let mut alt_rcvr_sugg = false;
if let SelfSource::MethodCall(rcvr) = source {
debug!(?span, ?item_name, ?rcvr_ty, ?rcvr);
let skippable = [
self.tcx.lang_items().clone_trait(),
self.tcx.lang_items().deref_trait(),
self.tcx.lang_items().deref_mut_trait(),
self.tcx.lang_items().drop_trait(),
];
// Try alternative arbitrary self types that could fulfill this call.
// FIXME: probe for all types that *could* be arbitrary self-types, not
// just this list.
Expand All @@ -996,6 +1002,27 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
(self.tcx.mk_mut_ref(&ty::ReErased, rcvr_ty), "&mut "),
(self.tcx.mk_imm_ref(&ty::ReErased, rcvr_ty), "&"),
] {
if let Ok(pick) = self.lookup_probe(
span,
item_name,
rcvr_ty,
rcvr,
crate::check::method::probe::ProbeScope::AllTraits,
) {
// If the method is defined for the receiver we have, it likely wasn't `use`d.
// We point at the method, but we just skip the rest of the check for arbitrary
// self types and rely on the suggestion to `use` the trait from
// `suggest_valid_traits`.
let did = Some(pick.item.container.id());
let skip = skippable.contains(&did);
if pick.autoderefs == 0 && !skip {
err.span_label(
pick.item.ident.span,
&format!("the method is available for `{}` here", rcvr_ty),
);
}
break;
}
for (rcvr_ty, pre) in &[
(self.tcx.mk_lang_item(rcvr_ty, LangItem::OwnedBox), "Box::new"),
(self.tcx.mk_lang_item(rcvr_ty, LangItem::Pin), "Pin::new"),
Expand All @@ -1015,13 +1042,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
// We don't want to suggest a container type when the missing
// method is `.clone()` or `.deref()` otherwise we'd suggest
// `Arc::new(foo).clone()`, which is far from what the user wants.
let skip = [
self.tcx.lang_items().clone_trait(),
self.tcx.lang_items().deref_trait(),
self.tcx.lang_items().deref_mut_trait(),
self.tcx.lang_items().drop_trait(),
]
.contains(&did);
let skip = skippable.contains(&did);
// Make sure the method is defined for the *actual* receiver: we don't
// want to treat `Box<Self>` as a receiver if it only works because of
// an autoderef to `&self`
Expand Down
3 changes: 3 additions & 0 deletions src/test/ui/hygiene/trait_items.stderr
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
error[E0599]: no method named `f` found for unit type `()` in the current scope
--> $DIR/trait_items.rs:17:24
|
LL | fn f(&self) {}
| - the method is available for `()` here
...
LL | fn f() { ::baz::m!(); }
| ------------ in this macro invocation
...
Expand Down
8 changes: 8 additions & 0 deletions src/test/ui/impl-trait/no-method-suggested-traits.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ LL | use no_method_suggested_traits::Reexported;
error[E0599]: no method named `method` found for type `char` in the current scope
--> $DIR/no-method-suggested-traits.rs:30:9
|
LL | fn method(&self) {}
| ------ the method is available for `char` here
...
LL | 'a'.method();
| ^^^^^^ method not found in `char`
|
Expand All @@ -63,6 +66,11 @@ error[E0599]: no method named `method` found for type `i32` in the current scope
|
LL | 1i32.method();
| ^^^^^^ method not found in `i32`
|
::: $DIR/auxiliary/no_method_suggested_traits.rs:8:12
|
LL | fn method(&self) {}
| ------ the method is available for `i32` here
|
= help: items from traits can only be used if the trait is in scope
help: the following trait is implemented but not in scope; perhaps add a `use` for it:
Expand Down
5 changes: 5 additions & 0 deletions src/test/ui/issues/issue-43189.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ error[E0599]: no method named `a` found for unit type `()` in the current scope
|
LL | ().a();
| ^ method not found in `()`
|
::: $DIR/auxiliary/xcrate-issue-43189-a.rs:5:8
|
LL | fn a(&self) {}
| - the method is available for `()` here
|
= help: items from traits can only be used if the trait is in scope
help: the following trait is implemented but not in scope; perhaps add a `use` for it:
Expand Down
10 changes: 10 additions & 0 deletions src/test/ui/issues/issue-56175.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ error[E0599]: no method named `trait_method` found for struct `FooStruct` in the
|
LL | reexported_trait::FooStruct.trait_method();
| ^^^^^^^^^^^^ method not found in `FooStruct`
|
::: $DIR/auxiliary/reexported-trait.rs:3:12
|
LL | fn trait_method(&self) {
| ------------ the method is available for `FooStruct` here
|
= help: items from traits can only be used if the trait is in scope
help: the following trait is implemented but not in scope; perhaps add a `use` for it:
Expand All @@ -15,6 +20,11 @@ error[E0599]: no method named `trait_method_b` found for struct `FooStruct` in t
|
LL | reexported_trait::FooStruct.trait_method_b();
| ^^^^^^^^^^^^^^ method not found in `FooStruct`
|
::: $DIR/auxiliary/reexported-trait.rs:7:12
|
LL | fn trait_method_b(&self) {
| -------------- the method is available for `FooStruct` here
|
= help: items from traits can only be used if the trait is in scope
help: the following trait is implemented but not in scope; perhaps add a `use` for it:
Expand Down
6 changes: 6 additions & 0 deletions src/test/ui/rust-2018/trait-import-suggestions.stderr
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
error[E0599]: no method named `foobar` found for type `u32` in the current scope
--> $DIR/trait-import-suggestions.rs:22:11
|
LL | fn foobar(&self) { }
| ------ the method is available for `u32` here
...
LL | x.foobar();
| ^^^^^^ method not found in `u32`
|
Expand All @@ -11,6 +14,9 @@ LL | x.foobar();
error[E0599]: no method named `bar` found for type `u32` in the current scope
--> $DIR/trait-import-suggestions.rs:28:7
|
LL | fn bar(&self) { }
| --- the method is available for `u32` here
...
LL | x.bar();
| ^^^ method not found in `u32`
|
Expand Down
3 changes: 3 additions & 0 deletions src/test/ui/shadowed/shadowed-trait-methods.stderr
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
error[E0599]: no method named `f` found for unit type `()` in the current scope
--> $DIR/shadowed-trait-methods.rs:13:8
|
LL | pub trait T { fn f(&self) {} }
| - the method is available for `()` here
...
LL | ().f()
| ^ method not found in `()`
|
Expand Down
13 changes: 1 addition & 12 deletions src/test/ui/suggestions/import-trait-for-method-call.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,9 @@ LL | h.finish()
::: $SRC_DIR/core/src/hash/mod.rs:LL:COL
|
LL | fn finish(&self) -> u64;
| ------
| |
| the method is available for `Box<DefaultHasher>` here
| the method is available for `Box<&mut DefaultHasher>` here
| ------ the method is available for `DefaultHasher` here
|
= help: items from traits can only be used if the trait is in scope
help: consider wrapping the receiver expression with the appropriate type
|
LL | Box::new(h).finish()
| ^^^^^^^^^ ^
help: consider wrapping the receiver expression with the appropriate type
|
LL | Box::new(&mut h).finish()
| ^^^^^^^^^^^^^ ^
help: the following trait is implemented but not in scope; perhaps add a `use` for it:
|
LL | use std::hash::Hasher;
Expand Down
3 changes: 3 additions & 0 deletions src/test/ui/traits/item-privacy.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ error[E0599]: no method named `b` found for struct `S` in the current scope
LL | struct S;
| --------- method `b` not found for this
...
LL | fn b(&self) { }
| - the method is available for `S` here
...
LL | S.b();
| ^ method not found in `S`
|
Expand Down

0 comments on commit fb1fb7d

Please sign in to comment.