Don't try to prove opaque type bounds twice on the same types

Author: oli-obk

compiler/rustc_infer/src/infer/opaque_types.rs

@@ -508,7 +508,7 @@ impl<'tcx> InferCtxt<'tcx> {
     ) -> InferResult<'tcx, ()> {
         let mut obligations = Vec::new();
 
-        self.insert_hidden_type(
+        let already_had_hidden_ty = self.insert_hidden_type(
             opaque_type_key,
             &cause,
             param_env,
@@ -517,14 +517,21 @@ impl<'tcx> InferCtxt<'tcx> {
             &mut obligations,
         )?;
 
-        self.add_item_bounds_for_hidden_type(
-            opaque_type_key.def_id.to_def_id(),
-            opaque_type_key.args,
-            cause,
-            param_env,
-            hidden_ty,
-            &mut obligations,
-        );
+        // If we already had a hidden type, that hidden type will
+        // have already gone through `add_item_bounds_for_hidden_type`.
+        // Since all the bounds must already hold for the previous hidden type
+        // and the new hidden type must be equal to the previous hidden type,
+        // we can conclude that the bounds must already hold.
+        if !already_had_hidden_ty {
+            self.add_item_bounds_for_hidden_type(
+                opaque_type_key.def_id.to_def_id(),
+                opaque_type_key.args,
+                cause,
+                param_env,
+                hidden_ty,
+                &mut obligations,
+            );
+        }
 
         Ok(InferOk { value: (), obligations })
     }
@@ -544,7 +551,7 @@ impl<'tcx> InferCtxt<'tcx> {
         hidden_ty: Ty<'tcx>,
         a_is_expected: bool,
         obligations: &mut Vec<PredicateObligation<'tcx>>,
-    ) -> Result<(), TypeError<'tcx>> {
+    ) -> Result<bool, TypeError<'tcx>> {
         // Ideally, we'd get the span where *this specific `ty` came
         // from*, but right now we just use the span from the overall
         // value being folded. In simple cases like `-> impl Foo`,
@@ -560,7 +567,8 @@ impl<'tcx> InferCtxt<'tcx> {
                 cause.clone(),
                 param_env,
                 ty::PredicateKind::Ambiguous,
-            ))
+            ));
+            Ok(false)
         } else {
             let prev = self
                 .inner
@@ -573,10 +581,11 @@ impl<'tcx> InferCtxt<'tcx> {
                         .eq_exp(DefineOpaqueTypes::Yes, a_is_expected, prev, hidden_ty)?
                         .obligations,
                 );
+                Ok(true)
+            } else {
+                Ok(false)
             }
-        };
-
-        Ok(())
+        }
     }
 
     pub fn add_item_bounds_for_hidden_type(

src/tools/clippy/tests/ui/new_ret_no_self_overflow.stderr

@@ -1,9 +1,20 @@
-error[E0275]: overflow evaluating the requirement `<i32 as std::ops::Add>::Output == issue10041::X`
-  --> $DIR/new_ret_no_self_overflow.rs:20:25
+error: methods called `new` usually return `Self`
+  --> $DIR/new_ret_no_self_overflow.rs:9:9
    |
-LL |         pub fn new() -> X {
-   |                         ^
+LL | /         pub fn new() -> impl PartialOrd {
+LL | |             0i32
+LL | |         }
+   | |_________^
+   |
+   = note: `-D clippy::new-ret-no-self` implied by `-D warnings`
+
+error: methods called `new` usually return `Self`
+  --> $DIR/new_ret_no_self_overflow.rs:20:9
+   |
+LL | /         pub fn new() -> X {
+LL | |             0i32
+LL | |         }
+   | |_________^
 
-error: aborting due to previous error
+error: aborting due to 2 previous errors
 
-For more information about this error, try `rustc --explain E0275`.

tests/ui/async-await/suggest-missing-await.stderr

@@ -24,6 +24,8 @@ LL |     take_u32(x.await)
 error[E0308]: mismatched types
   --> $DIR/suggest-missing-await.rs:22:5
    |
+LL | async fn suggest_await_in_async_fn_return() {
+   |                                             - expected `()` because of return type
 LL |     dummy()
    |     ^^^^^^^ expected `()`, found future
    |

tests/ui/parser/expr-as-stmt.stderr

@@ -81,9 +81,16 @@ error[E0308]: mismatched types
   --> $DIR/expr-as-stmt.rs:64:7
    |
 LL |     { foo() } || { true }
-   |       ^^^^^- help: consider using a semicolon here: `;`
-   |       |
-   |       expected `()`, found `i32`
+   |       ^^^^^ expected `()`, found `i32`
+   |
+help: consider using a semicolon here
+   |
+LL |     { foo(); } || { true }
+   |            +
+help: you might have meant to return this value
+   |
+LL |     { return foo(); } || { true }
+   |       ++++++      +
 
 error[E0308]: mismatched types
   --> $DIR/expr-as-stmt.rs:8:6

tests/ui/type-alias-impl-trait/issue-63279.rs

@@ -7,7 +7,6 @@ fn c() -> Closure {
     || -> Closure { || () }
     //~^ ERROR: mismatched types
     //~| ERROR: mismatched types
-    //~| ERROR: expected a `FnOnce<()>` closure, found `()`
 }
 
 fn main() {}

tests/ui/type-alias-impl-trait/issue-63279.stderr

@@ -7,15 +7,6 @@ LL | fn c() -> Closure {
    = help: the trait `FnOnce<()>` is not implemented for `()`
    = note: wrap the `()` in a closure with no arguments: `|| { /* code */ }`
 
-error[E0277]: expected a `FnOnce<()>` closure, found `()`
-  --> $DIR/issue-63279.rs:7:11
-   |
-LL |     || -> Closure { || () }
-   |           ^^^^^^^ expected an `FnOnce<()>` closure, found `()`
-   |
-   = help: the trait `FnOnce<()>` is not implemented for `()`
-   = note: wrap the `()` in a closure with no arguments: `|| { /* code */ }`
-
 error[E0308]: mismatched types
   --> $DIR/issue-63279.rs:7:21
    |
@@ -32,6 +23,9 @@ LL |     || -> Closure { (|| ())() }
 error[E0308]: mismatched types
   --> $DIR/issue-63279.rs:7:5
    |
+LL | fn c() -> Closure {
+   |           ------- expected `()` because of return type
+LL |
 LL |     || -> Closure { || () }
    |     ^^^^^^^^^^^^^^^^^^^^^^^ expected `()`, found closure
    |
@@ -42,7 +36,7 @@ help: use parentheses to call this closure
 LL |     (|| -> Closure { || () })()
    |     +                       +++
 
-error: aborting due to 4 previous errors
+error: aborting due to 3 previous errors
 
 Some errors have detailed explanations: E0277, E0308.
 For more information about an error, try `rustc --explain E0277`.

tests/ui/type-alias-impl-trait/self-referential-in-fn-trait.rs

@@ -1,9 +1,9 @@
 #![feature(type_alias_impl_trait)]
 
 type Foo<'a> = impl Fn() -> Foo<'a>;
+//~^ ERROR: unconstrained opaque type
 
 fn crash<'a>(_: &'a (), x: Foo<'a>) -> Foo<'a> {
-    //~^ ERROR: overflow evaluating the requirement `<Foo<'a> as FnOnce<()>>::Output == Foo<'a>
     x
 }
 

tests/ui/type-alias-impl-trait/self-referential-in-fn-trait.stderr

@@ -1,9 +1,10 @@
-error[E0275]: overflow evaluating the requirement `<Foo<'a> as FnOnce<()>>::Output == Foo<'a>`
-  --> $DIR/self-referential-in-fn-trait.rs:5:40
+error: unconstrained opaque type
+  --> $DIR/self-referential-in-fn-trait.rs:3:16
    |
-LL | fn crash<'a>(_: &'a (), x: Foo<'a>) -> Foo<'a> {
-   |                                        ^^^^^^^
+LL | type Foo<'a> = impl Fn() -> Foo<'a>;
+   |                ^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: `Foo` must be used in combination with a concrete type within the same module
 
 error: aborting due to previous error
 
-For more information about this error, try `rustc --explain E0275`.

tests/ui/typeck/issue-90027-async-fn-return-suggestion.stderr

@@ -10,13 +10,18 @@ error[E0308]: mismatched types
   --> $DIR/issue-90027-async-fn-return-suggestion.rs:9:5
    |
 LL | async fn world() -> () {
-   |                     -- expected `()` because of return type
+   |                     --
+   |                     |
+   |                     expected `()` because of return type
+   |                     expected `()` because of return type
 LL |     0
    |     ^ expected `()`, found integer
 
 error[E0308]: mismatched types
   --> $DIR/issue-90027-async-fn-return-suggestion.rs:14:5
    |
+LL | async fn suggest_await_in_async_fn_return() {
+   |                                             - expected `()` because of return type
 LL |     hello()
    |     ^^^^^^^ expected `()`, found future
    |