Skip to content

Commit 1529137

Browse files
hkmatsumotohkmatsumoto
committed
Support method calls
1 parent 75ed56f commit 1529137

File tree

4 files changed

+87
-23
lines changed

4 files changed

+87
-23
lines changed

‎compiler/rustc_typeck/src/structured_errors/wrong_number_of_generic_args.rs‎

Lines changed: 42 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -683,6 +683,14 @@ impl<'a, 'tcx> WrongNumberOfGenericArgs<'a, 'tcx> {
683683
let num_trait_generics_except_self =
684684
trait_generics.count() - if trait_generics.has_self { 1 } else { 0 };
685685

686+
let msg = format!(
687+
"consider moving {these} generic argument{s} to the `{name}` trait, which takes up to {num} argument{s}",
688+
these = pluralize!("this", num_assoc_fn_excess_args),
689+
s = pluralize!(num_assoc_fn_excess_args),
690+
name = self.tcx.item_name(trait_),
691+
num = num_trait_generics_except_self,
692+
);
693+
686694
if let Some(hir_id) = self.path_segment.hir_id
687695
&& let Some(parent_node) = self.tcx.hir().find_parent_node(hir_id)
688696
&& let Some(parent_node) = self.tcx.hir().find(parent_node)
@@ -691,14 +699,22 @@ impl<'a, 'tcx> WrongNumberOfGenericArgs<'a, 'tcx> {
691699
hir::ExprKind::Path(ref qpath) => {
692700
self.suggest_moving_args_from_assoc_fn_to_trait_for_qualified_path(
693701
err,
694-
trait_,
695702
qpath,
703+
msg,
704+
num_assoc_fn_excess_args,
705+
num_trait_generics_except_self
706+
)
707+
},
708+
hir::ExprKind::MethodCall(..) => {
709+
self.suggest_moving_args_from_assoc_fn_to_trait_for_method_call(
710+
err,
711+
trait_,
712+
expr,
713+
msg,
696714
num_assoc_fn_excess_args,
697715
num_trait_generics_except_self
698716
)
699717
},
700-
// FIXME(hkmatsumoto): Emit similar suggestion for "x.<assoc fn>()"
701-
hir::ExprKind::MethodCall(..) => return,
702718
_ => return,
703719
}
704720
}
@@ -707,8 +723,8 @@ impl<'a, 'tcx> WrongNumberOfGenericArgs<'a, 'tcx> {
707723
fn suggest_moving_args_from_assoc_fn_to_trait_for_qualified_path(
708724
&self,
709725
err: &mut Diagnostic,
710-
trait_: DefId,
711726
qpath: &'tcx hir::QPath<'tcx>,
727+
msg: String,
712728
num_assoc_fn_excess_args: usize,
713729
num_trait_generics_except_self: usize,
714730
) {
@@ -719,13 +735,6 @@ impl<'a, 'tcx> WrongNumberOfGenericArgs<'a, 'tcx> {
719735
if num_assoc_fn_excess_args == num_trait_generics_except_self - num_generic_args_supplied_to_trait {
720736
if let Some(span) = self.gen_args.span_ext()
721737
&& let Ok(snippet) = self.tcx.sess.source_map().span_to_snippet(span) {
722-
let msg = format!(
723-
"consider moving {these} generic argument{s} to the `{name}` trait, which takes up to {num} argument{s}",
724-
these = pluralize!("this", num_assoc_fn_excess_args),
725-
s = pluralize!(num_assoc_fn_excess_args),
726-
name = self.tcx.item_name(trait_),
727-
num = num_trait_generics_except_self,
728-
);
729738
let sugg = vec![
730739
(self.path_segment.ident.span, format!("{}::{}", snippet, self.path_segment.ident)),
731740
(span.with_lo(self.path_segment.ident.span.hi()), "".to_owned())
@@ -741,6 +750,28 @@ impl<'a, 'tcx> WrongNumberOfGenericArgs<'a, 'tcx> {
741750
}
742751
}
743752

753+
fn suggest_moving_args_from_assoc_fn_to_trait_for_method_call(
754+
&self,
755+
err: &mut Diagnostic,
756+
trait_: DefId,
757+
expr: &'tcx hir::Expr<'tcx>,
758+
msg: String,
759+
num_assoc_fn_excess_args: usize,
760+
num_trait_generics_except_self: usize,
761+
) {
762+
if let hir::ExprKind::MethodCall(_, args, _) = expr.kind {
763+
assert_eq!(args.len(), 1);
764+
if num_assoc_fn_excess_args == num_trait_generics_except_self {
765+
if let Some(gen_args) = self.gen_args.span_ext()
766+
&& let Ok(gen_args) = self.tcx.sess.source_map().span_to_snippet(gen_args)
767+
&& let Ok(args) = self.tcx.sess.source_map().span_to_snippet(args[0].span) {
768+
let sugg = format!("{}::{}::{}({})", self.tcx.item_name(trait_), gen_args, self.tcx.item_name(self.def_id), args);
769+
err.span_suggestion(expr.span, msg, sugg, Applicability::MaybeIncorrect);
770+
}
771+
}
772+
}
773+
}
774+
744775
/// Suggests to remove redundant argument(s):
745776
///
746777
/// ```text

‎src/test/ui/const-generics/invalid-const-arg-for-type-param.stderr‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,22 @@ error[E0107]: this associated function takes 0 generic arguments but 1 generic a
22
--> $DIR/invalid-const-arg-for-type-param.rs:6:23
33
|
44
LL | let _: u32 = 5i32.try_into::<32>().unwrap();
5-
| ^^^^^^^^------ help: remove these generics
6-
| |
7-
| expected 0 generic arguments
5+
| ^^^^^^^^ expected 0 generic arguments
86
|
97
note: associated function defined here, with 0 generic parameters
108
--> $SRC_DIR/core/src/convert/mod.rs:LL:COL
119
|
1210
LL | fn try_into(self) -> Result<T, Self::Error>;
1311
| ^^^^^^^^
12+
help: consider moving this generic argument to the `TryInto` trait, which takes up to 1 argument
13+
|
14+
LL | let _: u32 = TryInto::<32>::try_into(5i32).unwrap();
15+
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
16+
help: remove these generics
17+
|
18+
LL - let _: u32 = 5i32.try_into::<32>().unwrap();
19+
LL + let _: u32 = 5i32.try_into().unwrap();
20+
|
1421

1522
error[E0599]: no method named `f` found for struct `S` in the current scope
1623
--> $DIR/invalid-const-arg-for-type-param.rs:9:7

‎src/test/ui/suggestions/issue-89064.rs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,9 @@ fn main() {
2727
let _ = A::<S>::foo::<S>();
2828
//~^ ERROR
2929
//~| HELP remove these generics
30+
31+
let _ = 42.into::<Option<_>>();
32+
//~^ ERROR
33+
//~| HELP remove these generics
34+
//~| HELP consider moving this generic argument
3035
}

‎src/test/ui/suggestions/issue-89064.stderr‎

Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ note: associated function defined here, with 0 generic parameters
99
|
1010
LL | fn foo() {}
1111
| ^^^
12-
help: remove these generics
12+
help: consider moving this generic argument to the `A` trait, which takes up to 1 argument
1313
|
1414
LL - let _ = A::foo::<S>();
15-
LL + let _ = A::foo();
15+
LL + let _ = A::<S>::foo();
1616
|
17-
help: consider moving this generic argument to the `A` trait, which takes up to 1 argument
17+
help: remove these generics
1818
|
1919
LL - let _ = A::foo::<S>();
20-
LL + let _ = A::<S>::foo();
20+
LL + let _ = A::foo();
2121
|
2222

2323
error[E0107]: this associated function takes 0 generic arguments but 2 generic arguments were supplied
@@ -31,15 +31,15 @@ note: associated function defined here, with 0 generic parameters
3131
|
3232
LL | fn bar() {}
3333
| ^^^
34-
help: remove these generics
34+
help: consider moving these generic arguments to the `B` trait, which takes up to 2 arguments
3535
|
3636
LL - let _ = B::bar::<S, S>();
37-
LL + let _ = B::bar();
37+
LL + let _ = B::<S, S>::bar();
3838
|
39-
help: consider moving these generic arguments to the `B` trait, which takes up to 2 arguments
39+
help: remove these generics
4040
|
4141
LL - let _ = B::bar::<S, S>();
42-
LL + let _ = B::<S, S>::bar();
42+
LL + let _ = B::bar();
4343
|
4444

4545
error[E0107]: this associated function takes 0 generic arguments but 1 generic argument was supplied
@@ -56,6 +56,27 @@ note: associated function defined here, with 0 generic parameters
5656
LL | fn foo() {}
5757
| ^^^
5858

59-
error: aborting due to 3 previous errors
59+
error[E0107]: this associated function takes 0 generic arguments but 1 generic argument was supplied
60+
--> $DIR/issue-89064.rs:31:16
61+
|
62+
LL | let _ = 42.into::<Option<_>>();
63+
| ^^^^ expected 0 generic arguments
64+
|
65+
note: associated function defined here, with 0 generic parameters
66+
--> $SRC_DIR/core/src/convert/mod.rs:LL:COL
67+
|
68+
LL | fn into(self) -> T;
69+
| ^^^^
70+
help: consider moving this generic argument to the `Into` trait, which takes up to 1 argument
71+
|
72+
LL | let _ = Into::<Option<_>>::into(42);
73+
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~
74+
help: remove these generics
75+
|
76+
LL - let _ = 42.into::<Option<_>>();
77+
LL + let _ = 42.into();
78+
|
79+
80+
error: aborting due to 4 previous errors
6081

6182
For more information about this error, try `rustc --explain E0107`.

0 commit comments

Comments
 (0)