languages/rust
languages/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust synced 2024-09-15 22:50:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #98509 - rust-lang:notriddle/precise-pin-diag, r=compiler-errors

Browse source 
diagnostics: consider parameter count when suggesting smart pointers

Fixes #96834
This commit is contained in:
Yuki Okushi 2022-06-26 13:15:02 +09:00 committed by GitHub
parent d774bc39e0 0ea59f3bd6
commit c3b2291dc3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
compiler/rustc_typeck/src/check/method/suggest.rs
View file

@ -994,6 +994,7 @@ trait bound{s}",
span,
rcvr_ty,
item_name,
args.map(|args| args.len()),
source,
out_of_scope_traits,
&unsatisfied_predicates,
@ -1732,6 +1733,7 @@ fn suggest_traits_to_import(
span: Span,
rcvr_ty: Ty<'tcx>,
item_name: Ident,
inputs_len: Option<usize>,
source: SelfSource<'tcx>,
valid_out_of_scope_traits: Vec<DefId>,
unsatisfied_predicates: &[(
@ -1808,7 +1810,8 @@ fn suggest_traits_to_import(
// Explicitly ignore the `Pin::as_ref()` method as `Pin` does not
// implement the `AsRef` trait.
let skip = skippable.contains(&did)
|| (("Pin::new" == *pre) && (sym::as_ref == item_name.name));
|| (("Pin::new" == *pre) && (sym::as_ref == item_name.name))
|| inputs_len.map_or(false, |inputs_len| pick.item.kind == ty::AssocKind::Fn && self.tcx.fn_sig(pick.item.def_id).skip_binder().inputs().len() != inputs_len);
// 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`

15
src/test/ui/suggestions/dont-suggest-pin-array-dot-set.rs Normal file
View file

@ -0,0 +1,15 @@
// https://github.com/rust-lang/rust/issues/96834
//
// This test case verifies that rustc does not make an unhelpful suggestion:
//
// help: consider wrapping the receiver expression with the appropriate type
// |
// 14 | Pin::new(&mut a).set(0, 3);
// | +++++++++++++ +
//
// We can tell that it isn't helpful, because `Pin::set` takes two parameters (including
// the receiver), but the function call on line 14 supplies three.
fn main() {
let mut a = [0u8; 1];
a.set(0, 3); //~ERROR
}

9
src/test/ui/suggestions/dont-suggest-pin-array-dot-set.stderr Normal file
View file

@ -0,0 +1,9 @@
error[E0599]: no method named `set` found for array `[u8; 1]` in the current scope
--> $DIR/dont-suggest-pin-array-dot-set.rs:14:7
|
LL | a.set(0, 3);
| ^^^ help: there is an associated function with a similar name: `get`
error: aborting due to previous error
For more information about this error, try `rustc --explain E0599`.