Flip the order of binder instantiation for better diagnostics

compiler-errors · compiler-errors · commit 473c88dfb69f · 2023-06-30T02:17:07.000Z
diff --git a/compiler/rustc_hir_analysis/src/check/compare_impl_item.rs b/compiler/rustc_hir_analysis/src/check/compare_impl_item.rs
@@ -651,11 +651,7 @@ pub(super) fn collect_return_position_impl_trait_in_trait_tys<'tcx>(
     let impl_sig = ocx.normalize(
         &norm_cause,
         param_env,
-        infcx.instantiate_binder_with_fresh_vars(
-            return_span,
-            infer::HigherRankedType,
-            tcx.fn_sig(impl_m.def_id).subst_identity(),
-        ),
+        tcx.liberate_late_bound_regions(impl_m.def_id, tcx.fn_sig(impl_m.def_id).subst_identity()),
     );
     impl_sig.error_reported()?;
     let impl_return_ty = impl_sig.output();
@@ -665,9 +661,10 @@ pub(super) fn collect_return_position_impl_trait_in_trait_tys<'tcx>(
     // them with inference variables.
     // We will use these inference variables to collect the hidden types of RPITITs.
     let mut collector = ImplTraitInTraitCollector::new(&ocx, return_span, param_env, impl_m_def_id);
-    let unnormalized_trait_sig = tcx
-        .liberate_late_bound_regions(
-            impl_m.def_id,
+    let unnormalized_trait_sig = infcx
+        .instantiate_binder_with_fresh_vars(
+            return_span,
+            infer::HigherRankedType,
             tcx.fn_sig(trait_m.def_id).subst(tcx, trait_to_placeholder_substs),
         )
         .fold_with(&mut collector);
@@ -760,8 +757,8 @@ pub(super) fn collect_return_position_impl_trait_in_trait_tys<'tcx>(
 
     let mut collected_tys = FxHashMap::default();
     for (def_id, (ty, substs)) in collected_types {
-        match infcx.fully_resolve(ty) {
-            Ok(ty) => {
+        match infcx.fully_resolve((ty, substs)) {
+            Ok((ty, substs)) => {
                 // `ty` contains free regions that we created earlier while liberating the
                 // trait fn signature. However, projection normalization expects `ty` to
                 // contains `def_id`'s early-bound regions.
diff --git a/tests/ui/impl-trait/in-trait/method-signature-matches.lt.stderr b/tests/ui/impl-trait/in-trait/method-signature-matches.lt.stderr
@@ -5,16 +5,16 @@ LL |     fn early<'late, T>(_: &'late ()) {}
    |                     -     ^^^^^^^^^
    |                     |     |
    |                     |     expected type parameter `T`, found `()`
-   |                     |     help: change the parameter type to match the trait: `&'early T`
+   |                     |     help: change the parameter type to match the trait: `&T`
    |                     this type parameter
    |
 note: type in trait
   --> $DIR/method-signature-matches.rs:53:28
    |
 LL |     fn early<'early, T>(x: &'early T) -> impl Sized;
    |                            ^^^^^^^^^
-   = note: expected signature `fn(&'early T)`
-              found signature `fn(&())`
+   = note: expected signature `fn(&T)`
+              found signature `fn(&'late ())`
 
 error: aborting due to previous error
 
diff --git a/tests/ui/impl-trait/in-trait/signature-mismatch.current.stderr b/tests/ui/impl-trait/in-trait/signature-mismatch.current.stderr
@@ -1,18 +1,15 @@
 error: return type captures more lifetimes than trait definition
   --> $DIR/signature-mismatch.rs:17:47
    |
-LL |     fn async_fn(&self, buff: &[u8]) -> impl Future<Output = Vec<u8>>;
-   |                              - this lifetime was captured
-...
 LL |     fn async_fn<'a>(&self, buff: &'a [u8]) -> impl Future<Output = Vec<u8>> + 'a {
-   |                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |                 -- this lifetime was captured ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 note: hidden type must only reference lifetimes captured by this impl trait
   --> $DIR/signature-mismatch.rs:11:40
    |
 LL |     fn async_fn(&self, buff: &[u8]) -> impl Future<Output = Vec<u8>>;
    |                                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   = note: hidden type inferred to be `impl Future<Output = Vec<u8>> + '_`
+   = note: hidden type inferred to be `impl Future<Output = Vec<u8>> + 'a`
 
 error: aborting due to previous error
 
diff --git a/tests/ui/impl-trait/in-trait/signature-mismatch.next.stderr b/tests/ui/impl-trait/in-trait/signature-mismatch.next.stderr
@@ -1,18 +1,15 @@
 error: return type captures more lifetimes than trait definition
   --> $DIR/signature-mismatch.rs:17:47
    |
-LL |     fn async_fn(&self, buff: &[u8]) -> impl Future<Output = Vec<u8>>;
-   |                              - this lifetime was captured
-...
 LL |     fn async_fn<'a>(&self, buff: &'a [u8]) -> impl Future<Output = Vec<u8>> + 'a {
-   |                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |                 -- this lifetime was captured ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 note: hidden type must only reference lifetimes captured by this impl trait
   --> $DIR/signature-mismatch.rs:11:40
    |
 LL |     fn async_fn(&self, buff: &[u8]) -> impl Future<Output = Vec<u8>>;
    |                                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   = note: hidden type inferred to be `impl Future<Output = Vec<u8>> + '_`
+   = note: hidden type inferred to be `impl Future<Output = Vec<u8>> + 'a`
 
 error: aborting due to previous error
 

Original file line number	Diff line number	Diff line change
`@@ -1,18 +1,15 @@`
`1`	`1`	`error: return type captures more lifetimes than trait definition`
`2`	`2`	`--> $DIR/signature-mismatch.rs:17:47`
`3`	`3`	`\|`
`4`		`-LL \| fn async_fn(&self, buff: &[u8]) -> impl Future<Output = Vec<u8>>;`
`5`		`- \| - this lifetime was captured`
`6`		`-...`
`7`	`4`	`LL \| fn async_fn<'a>(&self, buff: &'a [u8]) -> impl Future<Output = Vec<u8>> + 'a {`
`8`		`- \| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
	`5`	`+ \| -- this lifetime was captured ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`9`	`6`	`\|`
`10`	`7`	`note: hidden type must only reference lifetimes captured by this impl trait`
`11`	`8`	`--> $DIR/signature-mismatch.rs:11:40`
`12`	`9`	`\|`
`13`	`10`	`LL \| fn async_fn(&self, buff: &[u8]) -> impl Future<Output = Vec<u8>>;`
`14`	`11`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`15`		- = note: hidden type inferred to be `impl Future<Output = Vec<u8>> + '_`
	`12`	+ = note: hidden type inferred to be `impl Future<Output = Vec<u8>> + 'a`
`16`	`13`
`17`	`14`	`error: aborting due to previous error`
`18`	`15`