Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 24 insertions, 0 deletions

diff --git a/tests/ui/resolve/bad-env-capture2.stderr b/tests/ui/resolve/bad-env-capture2.stderr
new file mode 100644
index 000000000..811c259de
--- /dev/null
+++ b/tests/ui/resolve/bad-env-capture2.stderr
@@ -0,0 +1,24 @@
+error[E0434]: can't capture dynamic environment in a fn item
+  --> $DIR/bad-env-capture2.rs:3:27
+   |
+LL |     fn bar() { log(debug, x); }
+   |                           ^
+   |
+   = help: use the `|| { ... }` closure form instead
+
+error[E0425]: cannot find value `debug` in this scope
+  --> $DIR/bad-env-capture2.rs:3:20
+   |
+LL |     fn bar() { log(debug, x); }
+   |                    ^^^^^ not found in this scope
+
+error[E0425]: cannot find function `log` in this scope
+  --> $DIR/bad-env-capture2.rs:3:16
+   |
+LL |     fn bar() { log(debug, x); }
+   |                ^^^ not found in this scope
+
+error: aborting due to 3 previous errors
+
+Some errors have detailed explanations: E0425, E0434.
+For more information about an error, try `rustc --explain E0425`.