From 51ba7b4e43179f1262c7684ad3c0a04ddb703e9d Mon Sep 17 00:00:00 2001 From: Michael Goulet Date: Thu, 22 Dec 2022 17:51:45 +0000 Subject: [PATCH] Use separate files instead of revisions --- .../unresolved-ct-var-drop-tracking.rs | 15 +++++++++++++ ...=> unresolved-ct-var-drop-tracking.stderr} | 22 +++++++++---------- src/test/ui/generator/unresolved-ct-var.rs | 2 -- ...acking.stderr => unresolved-ct-var.stderr} | 22 +++++++++---------- 4 files changed, 37 insertions(+), 24 deletions(-) create mode 100644 src/test/ui/generator/unresolved-ct-var-drop-tracking.rs rename src/test/ui/generator/{unresolved-ct-var.stock.stderr => unresolved-ct-var-drop-tracking.stderr} (84%) rename src/test/ui/generator/{unresolved-ct-var.drop_tracking.stderr => unresolved-ct-var.stderr} (88%) diff --git a/src/test/ui/generator/unresolved-ct-var-drop-tracking.rs b/src/test/ui/generator/unresolved-ct-var-drop-tracking.rs new file mode 100644 index 00000000000..a6589348d30 --- /dev/null +++ b/src/test/ui/generator/unresolved-ct-var-drop-tracking.rs @@ -0,0 +1,15 @@ +// incremental +// edition:2021 +// compile-flags: -Zdrop-tracking + +fn main() { + let _ = async { + let s = std::array::from_fn(|_| ()).await; + //~^ ERROR `[(); _]` is not a future + //~| ERROR type inside `async` block must be known in this context + //~| ERROR type inside `async` block must be known in this context + //~| ERROR type inside `async` block must be known in this context + //~| ERROR type inside `async` block must be known in this context + //~| ERROR type inside `async` block must be known in this context + }; +} diff --git a/src/test/ui/generator/unresolved-ct-var.stock.stderr b/src/test/ui/generator/unresolved-ct-var-drop-tracking.stderr similarity index 84% rename from src/test/ui/generator/unresolved-ct-var.stock.stderr rename to src/test/ui/generator/unresolved-ct-var-drop-tracking.stderr index a328c43765d..9e1fed54c54 100644 --- a/src/test/ui/generator/unresolved-ct-var.stock.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:8:44 + --> $DIR/unresolved-ct-var-drop-tracking.rs:7: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:8:17 + --> $DIR/unresolved-ct-var-drop-tracking.rs:7: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 + --> $DIR/unresolved-ct-var-drop-tracking.rs:7: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 + --> $DIR/unresolved-ct-var-drop-tracking.rs:7: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 + --> $DIR/unresolved-ct-var-drop-tracking.rs:7: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 + --> $DIR/unresolved-ct-var-drop-tracking.rs:7: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 + --> $DIR/unresolved-ct-var-drop-tracking.rs:7: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 + --> $DIR/unresolved-ct-var-drop-tracking.rs:7: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 + --> $DIR/unresolved-ct-var-drop-tracking.rs:7: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 + --> $DIR/unresolved-ct-var-drop-tracking.rs:7: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 + --> $DIR/unresolved-ct-var-drop-tracking.rs:7: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 index 6720f465887..0a1570fc239 100644 --- a/src/test/ui/generator/unresolved-ct-var.rs +++ b/src/test/ui/generator/unresolved-ct-var.rs @@ -1,7 +1,5 @@ // 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.drop_tracking.stderr b/src/test/ui/generator/unresolved-ct-var.stderr similarity index 88% rename from src/test/ui/generator/unresolved-ct-var.drop_tracking.stderr rename to src/test/ui/generator/unresolved-ct-var.stderr index a328c43765d..fdf00dfad7a 100644 --- a/src/test/ui/generator/unresolved-ct-var.drop_tracking.stderr +++ b/src/test/ui/generator/unresolved-ct-var.stderr @@ -1,5 +1,5 @@ error[E0277]: `[(); _]` is not a future - --> $DIR/unresolved-ct-var.rs:8:44 + --> $DIR/unresolved-ct-var.rs:6: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:8:17 + --> $DIR/unresolved-ct-var.rs:6: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 + --> $DIR/unresolved-ct-var.rs:6: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 + --> $DIR/unresolved-ct-var.rs:6: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 + --> $DIR/unresolved-ct-var.rs:6: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 + --> $DIR/unresolved-ct-var.rs:6: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 + --> $DIR/unresolved-ct-var.rs:6: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 + --> $DIR/unresolved-ct-var.rs:6: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 + --> $DIR/unresolved-ct-var.rs:6: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 + --> $DIR/unresolved-ct-var.rs:6: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 + --> $DIR/unresolved-ct-var.rs:6:44 | LL | let s = std::array::from_fn(|_| ()).await; | ^^^^^^