Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 14 insertions, 0 deletions

diff --git a/tests/ui/consts/const-eval/const-eval-span.rs b/tests/ui/consts/const-eval/const-eval-span.rs
new file mode 100644
index 000000000..82f101b47
--- /dev/null
+++ b/tests/ui/consts/const-eval/const-eval-span.rs
@@ -0,0 +1,14 @@
+// Check that error in constant evaluation of enum discriminant
+// provides the context for what caused the evaluation.
+
+struct S(i32);
+
+const CONSTANT: S = S(0);
+
+enum E {
+    V = CONSTANT,
+    //~^ ERROR mismatched types
+    //~| expected `isize`, found struct `S`
+}
+
+fn main() {}