Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 21 insertions, 0 deletions

diff --git a/tests/ui/inner-static-type-parameter.stderr b/tests/ui/inner-static-type-parameter.stderr
new file mode 100644
index 000000000..e4e449e41
--- /dev/null
+++ b/tests/ui/inner-static-type-parameter.stderr
@@ -0,0 +1,21 @@
+error[E0401]: can't use generic parameters from outer function
+  --> $DIR/inner-static-type-parameter.rs:6:19
+   |
+LL | fn foo<T>() {
+   |        - type parameter from outer function
+LL |     static a: Bar<T> = Bar::What;
+   |                   ^ use of generic parameter from outer function
+
+error[E0392]: parameter `T` is never used
+  --> $DIR/inner-static-type-parameter.rs:3:10
+   |
+LL | enum Bar<T> { What }
+   |          ^ unused parameter
+   |
+   = help: consider removing `T`, referring to it in a field, or using a marker such as `PhantomData`
+   = help: if you intended `T` to be a const parameter, use `const T: usize` instead
+
+error: aborting due to 2 previous errors
+
+Some errors have detailed explanations: E0392, E0401.
+For more information about an error, try `rustc --explain E0392`.