forgot a return in drop tracking handle_uninhabited_return

compiler-errors · compiler-errors · commit 2f5334dff2cf · 2022-12-21T05:03:11.000Z
diff --git a/compiler/rustc_hir_typeck/src/generator_interior/drop_ranges/cfg_build.rs b/compiler/rustc_hir_typeck/src/generator_interior/drop_ranges/cfg_build.rs
@@ -233,6 +233,7 @@ impl<'a, 'tcx> DropRangeVisitor<'a, 'tcx> {
             self.tcx()
                 .sess
                 .delay_span_bug(expr.span, format!("could not resolve infer vars in `{ty}`"));
+            return;
         }
         let ty = self.tcx().erase_regions(ty);
         let m = self.tcx().parent_module(expr.hir_id).to_def_id();
diff --git a/src/test/ui/generator/unresolved-ct-var.drop_tracking.stderr b/src/test/ui/generator/unresolved-ct-var.drop_tracking.stderr
@@ -1,5 +1,5 @@
 error[E0277]: `[(); _]` is not a future
-  --> $DIR/unresolved-ct-var.rs:6:44
+  --> $DIR/unresolved-ct-var.rs:8:44
    |
 LL |         let s = std::array::from_fn(|_| ()).await;
    |                 ---------------------------^^^^^^
@@ -13,61 +13,61 @@ LL |         let s = std::array::from_fn(|_| ()).await;
    = note: required for `[(); _]` to implement `IntoFuture`
 
 error[E0698]: type inside `async` block must be known in this context
-  --> $DIR/unresolved-ct-var.rs:6:17
+  --> $DIR/unresolved-ct-var.rs:8:17
    |
 LL |         let s = std::array::from_fn(|_| ()).await;
    |                 ^^^^^^^^^^^^^^^^^^^ cannot infer the value of const parameter `N` declared on the function `from_fn`
    |
 note: the type is part of the `async` block because of this `await`
-  --> $DIR/unresolved-ct-var.rs:6:44
+  --> $DIR/unresolved-ct-var.rs:8:44
    |
 LL |         let s = std::array::from_fn(|_| ()).await;
    |                                            ^^^^^^
 
 error[E0698]: type inside `async` block must be known in this context
-  --> $DIR/unresolved-ct-var.rs:6:17
+  --> $DIR/unresolved-ct-var.rs:8:17
    |
 LL |         let s = std::array::from_fn(|_| ()).await;
    |                 ^^^^^^^^^^^^^^^^^^^ cannot infer the value of const parameter `N` declared on the function `from_fn`
    |
 note: the type is part of the `async` block because of this `await`
-  --> $DIR/unresolved-ct-var.rs:6:44
+  --> $DIR/unresolved-ct-var.rs:8:44
    |
 LL |         let s = std::array::from_fn(|_| ()).await;
    |                                            ^^^^^^
 
 error[E0698]: type inside `async` block must be known in this context
-  --> $DIR/unresolved-ct-var.rs:6:17
+  --> $DIR/unresolved-ct-var.rs:8:17
    |
 LL |         let s = std::array::from_fn(|_| ()).await;
    |                 ^^^^^^^^^^^^^^^^^^^ cannot infer the value of const parameter `N` declared on the function `from_fn`
    |
 note: the type is part of the `async` block because of this `await`
-  --> $DIR/unresolved-ct-var.rs:6:44
+  --> $DIR/unresolved-ct-var.rs:8:44
    |
 LL |         let s = std::array::from_fn(|_| ()).await;
    |                                            ^^^^^^
 
 error[E0698]: type inside `async` block must be known in this context
-  --> $DIR/unresolved-ct-var.rs:6:17
+  --> $DIR/unresolved-ct-var.rs:8:17
    |
 LL |         let s = std::array::from_fn(|_| ()).await;
    |                 ^^^^^^^^^^^^^^^^^^^ cannot infer the value of const parameter `N` declared on the function `from_fn`
    |
 note: the type is part of the `async` block because of this `await`
-  --> $DIR/unresolved-ct-var.rs:6:44
+  --> $DIR/unresolved-ct-var.rs:8:44
    |
 LL |         let s = std::array::from_fn(|_| ()).await;
    |                                            ^^^^^^
 
 error[E0698]: type inside `async` block must be known in this context
-  --> $DIR/unresolved-ct-var.rs:6:17
+  --> $DIR/unresolved-ct-var.rs:8:17
    |
 LL |         let s = std::array::from_fn(|_| ()).await;
    |                 ^^^^^^^^^^^^^^^^^^^ cannot infer the value of const parameter `N` declared on the function `from_fn`
    |
 note: the type is part of the `async` block because of this `await`
-  --> $DIR/unresolved-ct-var.rs:6:44
+  --> $DIR/unresolved-ct-var.rs:8:44
    |
 LL |         let s = std::array::from_fn(|_| ()).await;
    |                                            ^^^^^^
diff --git a/src/test/ui/generator/unresolved-ct-var.rs b/src/test/ui/generator/unresolved-ct-var.rs
@@ -1,5 +1,7 @@
 // incremental
 // edition:2021
+// revisions: drop_tracking stock
+//[drop_tracking] compile-flags: -Zdrop-tracking
 
 fn main() {
     let _ = async {
diff --git a/src/test/ui/generator/unresolved-ct-var.stock.stderr b/src/test/ui/generator/unresolved-ct-var.stock.stderr
@@ -0,0 +1,78 @@
+error[E0277]: `[(); _]` is not a future
+  --> $DIR/unresolved-ct-var.rs:8:44
+   |
+LL |         let s = std::array::from_fn(|_| ()).await;
+   |                 ---------------------------^^^^^^
+   |                 |                          |
+   |                 |                          `[(); _]` is not a future
+   |                 |                          help: remove the `.await`
+   |                 this call returns `[(); _]`
+   |
+   = help: the trait `Future` is not implemented for `[(); _]`
+   = note: [(); _] must be a future or must implement `IntoFuture` to be awaited
+   = note: required for `[(); _]` to implement `IntoFuture`
+
+error[E0698]: type inside `async` block must be known in this context
+  --> $DIR/unresolved-ct-var.rs:8:17
+   |
+LL |         let s = std::array::from_fn(|_| ()).await;
+   |                 ^^^^^^^^^^^^^^^^^^^ cannot infer the value of const parameter `N` declared on the function `from_fn`
+   |
+note: the type is part of the `async` block because of this `await`
+  --> $DIR/unresolved-ct-var.rs:8:44
+   |
+LL |         let s = std::array::from_fn(|_| ()).await;
+   |                                            ^^^^^^
+
+error[E0698]: type inside `async` block must be known in this context
+  --> $DIR/unresolved-ct-var.rs:8:17
+   |
+LL |         let s = std::array::from_fn(|_| ()).await;
+   |                 ^^^^^^^^^^^^^^^^^^^ cannot infer the value of const parameter `N` declared on the function `from_fn`
+   |
+note: the type is part of the `async` block because of this `await`
+  --> $DIR/unresolved-ct-var.rs:8:44
+   |
+LL |         let s = std::array::from_fn(|_| ()).await;
+   |                                            ^^^^^^
+
+error[E0698]: type inside `async` block must be known in this context
+  --> $DIR/unresolved-ct-var.rs:8:17
+   |
+LL |         let s = std::array::from_fn(|_| ()).await;
+   |                 ^^^^^^^^^^^^^^^^^^^ cannot infer the value of const parameter `N` declared on the function `from_fn`
+   |
+note: the type is part of the `async` block because of this `await`
+  --> $DIR/unresolved-ct-var.rs:8:44
+   |
+LL |         let s = std::array::from_fn(|_| ()).await;
+   |                                            ^^^^^^
+
+error[E0698]: type inside `async` block must be known in this context
+  --> $DIR/unresolved-ct-var.rs:8:17
+   |
+LL |         let s = std::array::from_fn(|_| ()).await;
+   |                 ^^^^^^^^^^^^^^^^^^^ cannot infer the value of const parameter `N` declared on the function `from_fn`
+   |
+note: the type is part of the `async` block because of this `await`
+  --> $DIR/unresolved-ct-var.rs:8:44
+   |
+LL |         let s = std::array::from_fn(|_| ()).await;
+   |                                            ^^^^^^
+
+error[E0698]: type inside `async` block must be known in this context
+  --> $DIR/unresolved-ct-var.rs:8:17
+   |
+LL |         let s = std::array::from_fn(|_| ()).await;
+   |                 ^^^^^^^^^^^^^^^^^^^ cannot infer the value of const parameter `N` declared on the function `from_fn`
+   |
+note: the type is part of the `async` block because of this `await`
+  --> $DIR/unresolved-ct-var.rs:8:44
+   |
+LL |         let s = std::array::from_fn(|_| ()).await;
+   |                                            ^^^^^^
+
+error: aborting due to 6 previous errors
+
+Some errors have detailed explanations: E0277, E0698.
+For more information about an error, try `rustc --explain E0277`.

Original file line number	Diff line number	Diff line change
`@@ -233,6 +233,7 @@ impl<'a, 'tcx> DropRangeVisitor<'a, 'tcx> {`
`233`	`233`	`self.tcx()`
`234`	`234`	`.sess`
`235`	`235`	.delay_span_bug(expr.span, format!("could not resolve infer vars in `{ty}`"));
	`236`	`+ return;`
`236`	`237`	`}`
`237`	`238`	`let ty = self.tcx().erase_regions(ty);`
`238`	`239`	`let m = self.tcx().parent_module(expr.hir_id).to_def_id();`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	error[E0277]: `[(); _]` is not a future
`2`		`- --> $DIR/unresolved-ct-var.rs:6:44`
	`2`	`+ --> $DIR/unresolved-ct-var.rs:8:44`
`3`	`3`	`\|`
`4`	`4`	`LL \| let s = std::array::from_fn(\|_\| ()).await;`
`5`	`5`	`\| ---------------------------^^^^^^`
`@@ -13,61 +13,61 @@ LL \| let s = std::array::from_fn(\|_\| ()).await;`
`13`	`13`	= note: required for `[(); _]` to implement `IntoFuture`
`14`	`14`
`15`	`15`	error[E0698]: type inside `async` block must be known in this context
`16`		`- --> $DIR/unresolved-ct-var.rs:6:17`
	`16`	`+ --> $DIR/unresolved-ct-var.rs:8:17`
`17`	`17`	`\|`
`18`	`18`	`LL \| let s = std::array::from_fn(\|_\| ()).await;`
`19`	`19`	\| ^^^^^^^^^^^^^^^^^^^ cannot infer the value of const parameter `N` declared on the function `from_fn`
`20`	`20`	`\|`
`21`	`21`	note: the type is part of the `async` block because of this `await`
`22`		`- --> $DIR/unresolved-ct-var.rs:6:44`
	`22`	`+ --> $DIR/unresolved-ct-var.rs:8:44`
`23`	`23`	`\|`
`24`	`24`	`LL \| let s = std::array::from_fn(\|_\| ()).await;`
`25`	`25`	`\| ^^^^^^`
`26`	`26`
`27`	`27`	error[E0698]: type inside `async` block must be known in this context
`28`		`- --> $DIR/unresolved-ct-var.rs:6:17`
	`28`	`+ --> $DIR/unresolved-ct-var.rs:8:17`
`29`	`29`	`\|`
`30`	`30`	`LL \| let s = std::array::from_fn(\|_\| ()).await;`
`31`	`31`	\| ^^^^^^^^^^^^^^^^^^^ cannot infer the value of const parameter `N` declared on the function `from_fn`
`32`	`32`	`\|`
`33`	`33`	note: the type is part of the `async` block because of this `await`
`34`		`- --> $DIR/unresolved-ct-var.rs:6:44`
	`34`	`+ --> $DIR/unresolved-ct-var.rs:8:44`
`35`	`35`	`\|`
`36`	`36`	`LL \| let s = std::array::from_fn(\|_\| ()).await;`
`37`	`37`	`\| ^^^^^^`
`38`	`38`
`39`	`39`	error[E0698]: type inside `async` block must be known in this context
`40`		`- --> $DIR/unresolved-ct-var.rs:6:17`
	`40`	`+ --> $DIR/unresolved-ct-var.rs:8:17`
`41`	`41`	`\|`
`42`	`42`	`LL \| let s = std::array::from_fn(\|_\| ()).await;`
`43`	`43`	\| ^^^^^^^^^^^^^^^^^^^ cannot infer the value of const parameter `N` declared on the function `from_fn`
`44`	`44`	`\|`
`45`	`45`	note: the type is part of the `async` block because of this `await`
`46`		`- --> $DIR/unresolved-ct-var.rs:6:44`
	`46`	`+ --> $DIR/unresolved-ct-var.rs:8:44`
`47`	`47`	`\|`
`48`	`48`	`LL \| let s = std::array::from_fn(\|_\| ()).await;`
`49`	`49`	`\| ^^^^^^`
`50`	`50`
`51`	`51`	error[E0698]: type inside `async` block must be known in this context
`52`		`- --> $DIR/unresolved-ct-var.rs:6:17`
	`52`	`+ --> $DIR/unresolved-ct-var.rs:8:17`
`53`	`53`	`\|`
`54`	`54`	`LL \| let s = std::array::from_fn(\|_\| ()).await;`
`55`	`55`	\| ^^^^^^^^^^^^^^^^^^^ cannot infer the value of const parameter `N` declared on the function `from_fn`
`56`	`56`	`\|`
`57`	`57`	note: the type is part of the `async` block because of this `await`
`58`		`- --> $DIR/unresolved-ct-var.rs:6:44`
	`58`	`+ --> $DIR/unresolved-ct-var.rs:8:44`
`59`	`59`	`\|`
`60`	`60`	`LL \| let s = std::array::from_fn(\|_\| ()).await;`
`61`	`61`	`\| ^^^^^^`
`62`	`62`
`63`	`63`	error[E0698]: type inside `async` block must be known in this context
`64`		`- --> $DIR/unresolved-ct-var.rs:6:17`
	`64`	`+ --> $DIR/unresolved-ct-var.rs:8:17`
`65`	`65`	`\|`
`66`	`66`	`LL \| let s = std::array::from_fn(\|_\| ()).await;`
`67`	`67`	\| ^^^^^^^^^^^^^^^^^^^ cannot infer the value of const parameter `N` declared on the function `from_fn`
`68`	`68`	`\|`
`69`	`69`	note: the type is part of the `async` block because of this `await`
`70`		`- --> $DIR/unresolved-ct-var.rs:6:44`
	`70`	`+ --> $DIR/unresolved-ct-var.rs:8:44`
`71`	`71`	`\|`
`72`	`72`	`LL \| let s = std::array::from_fn(\|_\| ()).await;`
`73`	`73`	`\| ^^^^^^`