diff options
| -rw-r--r-- | src/librustc_typeck/check/expr.rs | 4 | ||||
| -rw-r--r-- | src/librustc_typeck/check/method/mod.rs | 18 | ||||
| -rw-r--r-- | src/test/ui/suggestions/method-missing-parentheses.rs | 5 | ||||
| -rw-r--r-- | src/test/ui/suggestions/method-missing-parentheses.stderr | 17 |
4 files changed, 37 insertions, 7 deletions
diff --git a/src/librustc_typeck/check/expr.rs b/src/librustc_typeck/check/expr.rs index 9ce89bd6363..90b7b300da9 100644 --- a/src/librustc_typeck/check/expr.rs +++ b/src/librustc_typeck/check/expr.rs @@ -1586,7 +1586,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> { &format!("a method `{}` also exists, call it with parentheses", field), field, expr_t, - expr.hir_id, + expr, ); } err.emit(); @@ -1609,7 +1609,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> { "use parentheses to call the method", field, expr_t, - expr.hir_id, + expr, ); } else { err.help("methods are immutable and cannot be assigned to"); diff --git a/src/librustc_typeck/check/method/mod.rs b/src/librustc_typeck/check/method/mod.rs index e90c2ef5e43..a75154b160a 100644 --- a/src/librustc_typeck/check/method/mod.rs +++ b/src/librustc_typeck/check/method/mod.rs @@ -135,7 +135,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> { msg: &str, method_name: ast::Ident, self_ty: Ty<'tcx>, - call_expr_id: hir::HirId, + call_expr: &hir::Expr<'_>, ) { let has_params = self .probe_for_name( @@ -144,7 +144,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> { method_name, IsSuggestion(false), self_ty, - call_expr_id, + call_expr.hir_id, ProbeScope::TraitsInScope, ) .and_then(|pick| { @@ -152,13 +152,21 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> { Ok(sig.inputs().skip_binder().len() > 1) }); + // Account for `foo.bar<T>`; + let sugg_span = method_name.span.with_hi(call_expr.span.hi()); + let snippet = self + .tcx + .sess + .source_map() + .span_to_snippet(sugg_span) + .unwrap_or_else(|_| method_name.to_string()); let (suggestion, applicability) = if has_params.unwrap_or_default() { - (format!("{}(...)", method_name), Applicability::HasPlaceholders) + (format!("{}(...)", snippet), Applicability::HasPlaceholders) } else { - (format!("{}()", method_name), Applicability::MaybeIncorrect) + (format!("{}()", snippet), Applicability::MaybeIncorrect) }; - err.span_suggestion(method_name.span, msg, suggestion, applicability); + err.span_suggestion(sugg_span, msg, suggestion, applicability); } /// Performs method lookup. If lookup is successful, it will return the callee diff --git a/src/test/ui/suggestions/method-missing-parentheses.rs b/src/test/ui/suggestions/method-missing-parentheses.rs new file mode 100644 index 00000000000..e1a85271ad0 --- /dev/null +++ b/src/test/ui/suggestions/method-missing-parentheses.rs @@ -0,0 +1,5 @@ +fn main() { + let _ = vec![].into_iter().collect::<usize>; + //~^ ERROR attempted to take value of method `collect` on type `std::vec::IntoIter<_>` + //~| ERROR field expressions may not have generic arguments +} diff --git a/src/test/ui/suggestions/method-missing-parentheses.stderr b/src/test/ui/suggestions/method-missing-parentheses.stderr new file mode 100644 index 00000000000..8569eb6f4ad --- /dev/null +++ b/src/test/ui/suggestions/method-missing-parentheses.stderr @@ -0,0 +1,17 @@ +error: field expressions may not have generic arguments + --> $DIR/method-missing-parentheses.rs:2:41 + | +LL | let _ = vec![].into_iter().collect::<usize>; + | ^^^^^^^ + +error[E0615]: attempted to take value of method `collect` on type `std::vec::IntoIter<_>` + --> $DIR/method-missing-parentheses.rs:2:32 + | +LL | let _ = vec![].into_iter().collect::<usize>; + | ^^^^^^^--------- + | | + | help: use parentheses to call the method: `collect::<usize>()` + +error: aborting due to 2 previous errors + +For more information about this error, try `rustc --explain E0615`. |