Leave error reporting of method calls on inference variables to method call checks

oli-obk · oli-obk · commit 0440387fbe28 · 2024-12-03T10:32:48.000Z
diff --git a/compiler/rustc_hir_typeck/src/expr.rs b/compiler/rustc_hir_typeck/src/expr.rs
@@ -1567,7 +1567,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
     ) -> Ty<'tcx> {
         let rcvr_t = self.check_expr(rcvr);
         // no need to check for bot/err -- callee does that
-        let rcvr_t = self.structurally_resolve_type(rcvr.span, rcvr_t);
+        let rcvr_t = self.try_structurally_resolve_type(rcvr.span, rcvr_t);
 
         let method = match self.lookup_method(rcvr_t, segment, segment.ident.span, expr, rcvr, args)
         {
diff --git a/tests/ui/closures/deduce-signature/obligation-with-leaking-placeholders.next.stderr b/tests/ui/closures/deduce-signature/obligation-with-leaking-placeholders.next.stderr
@@ -5,7 +5,7 @@ LL |     needs_foo(|x| {
    |                ^
 ...
 LL |         x.to_string();
-   |         - type must be known at this point
+   |           --------- type must be known at this point
    |
 help: consider giving this closure parameter an explicit type
    |
diff --git a/tests/ui/impl-trait/call_method_ambiguous.next.stderr b/tests/ui/impl-trait/call_method_ambiguous.next.stderr
@@ -5,7 +5,7 @@ LL |         let mut iter = foo(n - 1, m);
    |             ^^^^^^^^
 LL |
 LL |         assert_eq!(iter.get(), 1);
-   |                    ---- type must be known at this point
+   |                         --- type must be known at this point
    |
 help: consider giving `iter` an explicit type
    |
diff --git a/tests/ui/impl-trait/call_method_on_inherent_impl.next.stderr b/tests/ui/impl-trait/call_method_on_inherent_impl.next.stderr
@@ -5,7 +5,7 @@ LL |         let x = my_foo();
    |             ^
 LL |
 LL |         x.my_debug();
-   |         - type must be known at this point
+   |           -------- type must be known at this point
    |
 help: consider giving `x` an explicit type
    |
diff --git a/tests/ui/impl-trait/call_method_on_inherent_impl_ref.next.stderr b/tests/ui/impl-trait/call_method_on_inherent_impl_ref.next.stderr
@@ -5,7 +5,7 @@ LL |         let x = my_foo();
    |             ^
 LL |
 LL |         x.my_debug();
-   |         - type must be known at this point
+   |           -------- type must be known at this point
    |
 help: consider giving `x` an explicit type
    |
diff --git a/tests/ui/impl-trait/hidden-type-is-opaque-2.default.stderr b/tests/ui/impl-trait/hidden-type-is-opaque-2.default.stderr
@@ -5,7 +5,7 @@ LL |     Thunk::new(|mut cont| {
    |                 ^^^^^^^^
 LL |
 LL |         cont.reify_as();
-   |         ---- type must be known at this point
+   |              -------- type must be known at this point
    |
 help: consider giving this closure parameter an explicit type
    |
@@ -19,7 +19,7 @@ LL |     Thunk::new(|mut cont| {
    |                 ^^^^^^^^
 LL |
 LL |         cont.reify_as();
-   |         ---- type must be known at this point
+   |              -------- type must be known at this point
    |
 help: consider giving this closure parameter an explicit type
    |
diff --git a/tests/ui/impl-trait/hidden-type-is-opaque-2.next.stderr b/tests/ui/impl-trait/hidden-type-is-opaque-2.next.stderr
@@ -5,7 +5,7 @@ LL |     Thunk::new(|mut cont| {
    |                 ^^^^^^^^
 LL |
 LL |         cont.reify_as();
-   |         ---- type must be known at this point
+   |              -------- type must be known at this point
    |
 help: consider giving this closure parameter an explicit type
    |
@@ -19,7 +19,7 @@ LL |     Thunk::new(|mut cont| {
    |                 ^^^^^^^^
 LL |
 LL |         cont.reify_as();
-   |         ---- type must be known at this point
+   |              -------- type must be known at this point
    |
 help: consider giving this closure parameter an explicit type
    |
diff --git a/tests/ui/impl-trait/method-resolution4.next.stderr b/tests/ui/impl-trait/method-resolution4.next.stderr
@@ -1,8 +1,8 @@
 error[E0282]: type annotations needed
-  --> $DIR/method-resolution4.rs:13:9
+  --> $DIR/method-resolution4.rs:13:20
    |
 LL |         foo(false).next().unwrap();
-   |         ^^^^^^^^^^ cannot infer type
+   |                    ^^^^ cannot infer type
 
 error: aborting due to 1 previous error
 
diff --git a/tests/ui/impl-trait/recursive-bound-eval.next.stderr b/tests/ui/impl-trait/recursive-bound-eval.next.stderr
@@ -1,8 +1,8 @@
 error[E0282]: type annotations needed
-  --> $DIR/recursive-bound-eval.rs:18:13
+  --> $DIR/recursive-bound-eval.rs:18:28
    |
 LL |     move || recursive_fn().parse()
-   |             ^^^^^^^^^^^^^^ cannot infer type
+   |                            ^^^^^ cannot infer type
 
 error: aborting due to 1 previous error
 
diff --git a/tests/ui/inference/need_type_info/incompat-call-after-qualified-path-0.stderr b/tests/ui/inference/need_type_info/incompat-call-after-qualified-path-0.stderr
@@ -2,7 +2,7 @@ error[E0282]: type annotations needed
   --> $DIR/incompat-call-after-qualified-path-0.rs:21:6
    |
 LL |   f(|a, b| a.cmp(b));
-   |      ^     - type must be known at this point
+   |      ^       --- type must be known at this point
    |
 help: consider giving this closure parameter an explicit type
    |
diff --git a/tests/ui/inference/need_type_info/incompat-call-after-qualified-path-1.stderr b/tests/ui/inference/need_type_info/incompat-call-after-qualified-path-1.stderr
@@ -2,7 +2,7 @@ error[E0282]: type annotations needed
   --> $DIR/incompat-call-after-qualified-path-1.rs:25:6
    |
 LL |   f(|a, b| a.cmp(b));
-   |      ^     - type must be known at this point
+   |      ^       --- type must be known at this point
    |
 help: consider giving this closure parameter an explicit type
    |
diff --git a/tests/ui/issues/issue-2151.stderr b/tests/ui/issues/issue-2151.stderr
@@ -4,7 +4,7 @@ error[E0282]: type annotations needed
 LL |     let x = panic!();
    |         ^
 LL |     x.clone();
-   |     - type must be known at this point
+   |       ----- type must be known at this point
    |
 help: consider giving `x` an explicit type
    |
diff --git a/tests/ui/lazy-type-alias-impl-trait/branches3.stderr b/tests/ui/lazy-type-alias-impl-trait/branches3.stderr
@@ -2,7 +2,7 @@ error[E0282]: type annotations needed
   --> $DIR/branches3.rs:8:10
    |
 LL |         |s| s.len()
-   |          ^  - type must be known at this point
+   |          ^    --- type must be known at this point
    |
 help: consider giving this closure parameter an explicit type
    |
@@ -13,7 +13,7 @@ error[E0282]: type annotations needed
   --> $DIR/branches3.rs:15:10
    |
 LL |         |s| s.len()
-   |          ^  - type must be known at this point
+   |          ^    --- type must be known at this point
    |
 help: consider giving this closure parameter an explicit type
    |
@@ -24,7 +24,7 @@ error[E0282]: type annotations needed
   --> $DIR/branches3.rs:23:10
    |
 LL |         |s| s.len()
-   |          ^  - type must be known at this point
+   |          ^    --- type must be known at this point
    |
 help: consider giving this closure parameter an explicit type
    |
@@ -35,7 +35,7 @@ error[E0282]: type annotations needed
   --> $DIR/branches3.rs:30:10
    |
 LL |         |s| s.len()
-   |          ^  - type must be known at this point
+   |          ^    --- type must be known at this point
    |
 help: consider giving this closure parameter an explicit type
    |
diff --git a/tests/ui/span/issue-42234-unknown-receiver-type.full.stderr b/tests/ui/span/issue-42234-unknown-receiver-type.full.stderr
@@ -4,7 +4,7 @@ error[E0282]: type annotations needed
 LL |     let x: Option<_> = None;
    |                        ^^^^ cannot infer type of the type parameter `T` declared on the enum `Option`
 LL |     x.unwrap().method_that_could_exist_on_some_type();
-   |     ---------- type must be known at this point
+   |                ------------------------------------ type must be known at this point
    |
 help: consider specifying the generic argument
    |
@@ -16,6 +16,8 @@ error[E0282]: type annotations needed
    |
 LL |         .sum::<_>()
    |          ^^^ cannot infer type of the type parameter `S` declared on the method `sum`
+LL |         .to_string()
+   |          --------- type must be known at this point
    |
 
 error: aborting due to 2 previous errors
diff --git a/tests/ui/span/issue-42234-unknown-receiver-type.generic_arg.stderr b/tests/ui/span/issue-42234-unknown-receiver-type.generic_arg.stderr
@@ -4,7 +4,7 @@ error[E0282]: type annotations needed
 LL |     let x: Option<_> = None;
    |                        ^^^^ cannot infer type of the type parameter `T` declared on the enum `Option`
 LL |     x.unwrap().method_that_could_exist_on_some_type();
-   |     ---------- type must be known at this point
+   |                ------------------------------------ type must be known at this point
    |
 help: consider specifying the generic argument
    |
@@ -16,6 +16,8 @@ error[E0282]: type annotations needed
    |
 LL |         .sum::<_>()
    |          ^^^ cannot infer type of the type parameter `S` declared on the method `sum`
+LL |         .to_string()
+   |          --------- type must be known at this point
    |
 help: consider specifying the generic argument
    |
diff --git a/tests/ui/type-alias-impl-trait/closures_in_branches.stderr b/tests/ui/type-alias-impl-trait/closures_in_branches.stderr
@@ -2,7 +2,7 @@ error[E0282]: type annotations needed
   --> $DIR/closures_in_branches.rs:7:10
    |
 LL |         |x| x.len()
-   |          ^  - type must be known at this point
+   |          ^    --- type must be known at this point
    |
 help: consider giving this closure parameter an explicit type
    |
@@ -13,7 +13,7 @@ error[E0282]: type annotations needed
   --> $DIR/closures_in_branches.rs:21:10
    |
 LL |         |x| x.len()
-   |          ^  - type must be known at this point
+   |          ^    --- type must be known at this point
    |
 help: consider giving this closure parameter an explicit type
    |
diff --git a/tests/ui/type-alias-impl-trait/method_resolution_trait_method_from_opaque.next.stderr b/tests/ui/type-alias-impl-trait/method_resolution_trait_method_from_opaque.next.stderr
@@ -1,8 +1,8 @@
 error[E0282]: type annotations needed
-  --> $DIR/method_resolution_trait_method_from_opaque.rs:26:9
+  --> $DIR/method_resolution_trait_method_from_opaque.rs:26:18
    |
 LL |         self.bar.next().unwrap();
-   |         ^^^^^^^^ cannot infer type
+   |                  ^^^^ cannot infer type
 
 error: aborting due to 1 previous error
 
diff --git a/tests/ui/typeck/issue-13853.rs b/tests/ui/typeck/issue-13853.rs
@@ -25,7 +25,7 @@ impl Node for Stuff {
 
 fn iterate<N: Node, G: Graph<N>>(graph: &G) {
     for node in graph.iter() { //~ ERROR no method named `iter` found
-        node.zomg();
+        node.zomg(); //~ ERROR type annotations needed
     }
 }
 
diff --git a/tests/ui/typeck/issue-13853.stderr b/tests/ui/typeck/issue-13853.stderr
@@ -17,6 +17,12 @@ error[E0599]: no method named `iter` found for reference `&G` in the current sco
 LL |     for node in graph.iter() {
    |                       ^^^^ method not found in `&G`
 
+error[E0282]: type annotations needed
+  --> $DIR/issue-13853.rs:28:14
+   |
+LL |         node.zomg();
+   |              ^^^^ cannot infer type
+
 error[E0308]: mismatched types
   --> $DIR/issue-13853.rs:37:13
    |
@@ -37,7 +43,7 @@ help: consider borrowing here
 LL |     iterate(&graph);
    |             +
 
-error: aborting due to 3 previous errors
+error: aborting due to 4 previous errors
 
-Some errors have detailed explanations: E0308, E0599.
-For more information about an error, try `rustc --explain E0308`.
+Some errors have detailed explanations: E0282, E0308, E0599.
+For more information about an error, try `rustc --explain E0282`.

Original file line number	Diff line number	Diff line change
`@@ -1567,7 +1567,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {`
`1567`	`1567`	`) -> Ty<'tcx> {`
`1568`	`1568`	`let rcvr_t = self.check_expr(rcvr);`
`1569`	`1569`	`// no need to check for bot/err -- callee does that`
`1570`		`- let rcvr_t = self.structurally_resolve_type(rcvr.span, rcvr_t);`
	`1570`	`+ let rcvr_t = self.try_structurally_resolve_type(rcvr.span, rcvr_t);`
`1571`	`1571`
`1572`	`1572`	`let method = match self.lookup_method(rcvr_t, segment, segment.ident.span, expr, rcvr, args)`
`1573`	`1573`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ LL \| needs_foo(\|x\| {`
`5`	`5`	`\| ^`
`6`	`6`	`...`
`7`	`7`	`LL \| x.to_string();`
`8`		`- \| - type must be known at this point`
	`8`	`+ \| --------- type must be known at this point`
`9`	`9`	`\|`
`10`	`10`	`help: consider giving this closure parameter an explicit type`
`11`	`11`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ LL \| let mut iter = foo(n - 1, m);`
`5`	`5`	`\| ^^^^^^^^`
`6`	`6`	`LL \|`
`7`	`7`	`LL \| assert_eq!(iter.get(), 1);`
`8`		`- \| ---- type must be known at this point`
	`8`	`+ \| --- type must be known at this point`
`9`	`9`	`\|`
`10`	`10`	help: consider giving `iter` an explicit type
`11`	`11`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ LL \| let x = my_foo();`
`5`	`5`	`\| ^`
`6`	`6`	`LL \|`
`7`	`7`	`LL \| x.my_debug();`
`8`		`- \| - type must be known at this point`
	`8`	`+ \| -------- type must be known at this point`
`9`	`9`	`\|`
`10`	`10`	help: consider giving `x` an explicit type
`11`	`11`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ LL \| Thunk::new(\|mut cont\| {`
`5`	`5`	`\| ^^^^^^^^`
`6`	`6`	`LL \|`
`7`	`7`	`LL \| cont.reify_as();`
`8`		`- \| ---- type must be known at this point`
	`8`	`+ \| -------- type must be known at this point`
`9`	`9`	`\|`
`10`	`10`	`help: consider giving this closure parameter an explicit type`
`11`	`11`	`\|`
`@@ -19,7 +19,7 @@ LL \| Thunk::new(\|mut cont\| {`
`19`	`19`	`\| ^^^^^^^^`
`20`	`20`	`LL \|`
`21`	`21`	`LL \| cont.reify_as();`
`22`		`- \| ---- type must be known at this point`
	`22`	`+ \| -------- type must be known at this point`
`23`	`23`	`\|`
`24`	`24`	`help: consider giving this closure parameter an explicit type`
`25`	`25`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`error[E0282]: type annotations needed`
`2`		`- --> $DIR/method-resolution4.rs:13:9`
	`2`	`+ --> $DIR/method-resolution4.rs:13:20`
`3`	`3`	`\|`
`4`	`4`	`LL \| foo(false).next().unwrap();`
`5`		`- \| ^^^^^^^^^^ cannot infer type`
	`5`	`+ \| ^^^^ cannot infer type`
`6`	`6`
`7`	`7`	`error: aborting due to 1 previous error`
`8`	`8`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`error[E0282]: type annotations needed`
`2`		`- --> $DIR/recursive-bound-eval.rs:18:13`
	`2`	`+ --> $DIR/recursive-bound-eval.rs:18:28`
`3`	`3`	`\|`
`4`	`4`	`LL \| move \|\| recursive_fn().parse()`
`5`		`- \| ^^^^^^^^^^^^^^ cannot infer type`
	`5`	`+ \| ^^^^^ cannot infer type`
`6`	`6`
`7`	`7`	`error: aborting due to 1 previous error`
`8`	`8`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ error[E0282]: type annotations needed`
`2`	`2`	`--> $DIR/incompat-call-after-qualified-path-0.rs:21:6`
`3`	`3`	`\|`
`4`	`4`	`LL \| f(\|a, b\| a.cmp(b));`
`5`		`- \| ^ - type must be known at this point`
	`5`	`+ \| ^ --- type must be known at this point`
`6`	`6`	`\|`
`7`	`7`	`help: consider giving this closure parameter an explicit type`
`8`	`8`	`\|`