about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMaybe Waffle <waffle.lapkin@gmail.com>2023-05-29 15:05:24 +0000
committerMaybe Waffle <waffle.lapkin@gmail.com>2023-06-08 12:33:17 +0000
commit70f28a91108644a9db8b35ab594a6f978d736c6d (patch)
treef135a1d6205cba766a969cf8f6c99de150c3e836
parenta0df04c0f2b9c0415c53e3cee8c4f9fa394a37b2 (diff)
downloadrust-70f28a91108644a9db8b35ab594a6f978d736c6d.tar.gz
rust-70f28a91108644a9db8b35ab594a6f978d736c6d.zip
Move tests from `ui/discrim` dir
Diffstat
-rw-r--r--tests/ui/enum-discriminant/discriminant-ill-typed.rs (renamed from tests/ui/discrim/discrim-ill-typed.rs)0


-rw-r--r--tests/ui/enum-discriminant/discriminant-ill-typed.stderr (renamed from tests/ui/discrim/discrim-ill-typed.stderr)16


-rw-r--r--tests/ui/enum-discriminant/discriminant-overflow-2.rs (renamed from tests/ui/discrim/discrim-overflow-2.rs)0


-rw-r--r--tests/ui/enum-discriminant/discriminant-overflow-2.stderr (renamed from tests/ui/discrim/discrim-overflow.stderr)16


-rw-r--r--tests/ui/enum-discriminant/discriminant-overflow.rs (renamed from tests/ui/discrim/discrim-overflow.rs)0


-rw-r--r--tests/ui/enum-discriminant/discriminant-overflow.stderr (renamed from tests/ui/discrim/discrim-overflow-2.stderr)16


6 files changed, 24 insertions, 24 deletions
diff --git a/tests/ui/discrim/discrim-ill-typed.rs b/tests/ui/enum-discriminant/discriminant-ill-typed.rs
index 3cf0ea0e6b9..3cf0ea0e6b9 100644
--- a/tests/ui/discrim/discrim-ill-typed.rs
+++ b/tests/ui/enum-discriminant/discriminant-ill-typed.rs
diff --git a/tests/ui/discrim/discrim-ill-typed.stderr b/tests/ui/enum-discriminant/discriminant-ill-typed.stderr
index 27f516341ee..2757145285c 100644
--- a/tests/ui/discrim/discrim-ill-typed.stderr
+++ b/tests/ui/enum-discriminant/discriminant-ill-typed.stderr
@@ -1,5 +1,5 @@
 error[E0308]: mismatched types
-  --> $DIR/discrim-ill-typed.rs:15:16
+  --> $DIR/discriminant-ill-typed.rs:15:16
    |
 LL |         OhNo = 0_u8,
    |                ^^^^ expected `i8`, found `u8`
@@ -10,7 +10,7 @@ LL |         OhNo = 0_i8,
    |                  ~~
 
 error[E0308]: mismatched types
-  --> $DIR/discrim-ill-typed.rs:28:16
+  --> $DIR/discriminant-ill-typed.rs:28:16
    |
 LL |         OhNo = 0_i8,
    |                ^^^^ expected `u8`, found `i8`
@@ -21,7 +21,7 @@ LL |         OhNo = 0_u8,
    |                  ~~
 
 error[E0308]: mismatched types
-  --> $DIR/discrim-ill-typed.rs:41:16
+  --> $DIR/discriminant-ill-typed.rs:41:16
    |
 LL |         OhNo = 0_u16,
    |                ^^^^^ expected `i16`, found `u16`
@@ -32,7 +32,7 @@ LL |         OhNo = 0_i16,
    |                  ~~~
 
 error[E0308]: mismatched types
-  --> $DIR/discrim-ill-typed.rs:54:16
+  --> $DIR/discriminant-ill-typed.rs:54:16
    |
 LL |         OhNo = 0_i16,
    |                ^^^^^ expected `u16`, found `i16`
@@ -43,7 +43,7 @@ LL |         OhNo = 0_u16,
    |                  ~~~
 
 error[E0308]: mismatched types
-  --> $DIR/discrim-ill-typed.rs:67:16
+  --> $DIR/discriminant-ill-typed.rs:67:16
    |
 LL |         OhNo = 0_u32,
    |                ^^^^^ expected `i32`, found `u32`
@@ -54,7 +54,7 @@ LL |         OhNo = 0_i32,
    |                  ~~~
 
 error[E0308]: mismatched types
-  --> $DIR/discrim-ill-typed.rs:80:16
+  --> $DIR/discriminant-ill-typed.rs:80:16
    |
 LL |         OhNo = 0_i32,
    |                ^^^^^ expected `u32`, found `i32`
@@ -65,7 +65,7 @@ LL |         OhNo = 0_u32,
    |                  ~~~
 
 error[E0308]: mismatched types
-  --> $DIR/discrim-ill-typed.rs:93:16
+  --> $DIR/discriminant-ill-typed.rs:93:16
    |
 LL |         OhNo = 0_u64,
    |                ^^^^^ expected `i64`, found `u64`
@@ -76,7 +76,7 @@ LL |         OhNo = 0_i64,
    |                  ~~~
 
 error[E0308]: mismatched types
-  --> $DIR/discrim-ill-typed.rs:106:16
+  --> $DIR/discriminant-ill-typed.rs:106:16
    |
 LL |         OhNo = 0_i64,
    |                ^^^^^ expected `u64`, found `i64`
diff --git a/tests/ui/discrim/discrim-overflow-2.rs b/tests/ui/enum-discriminant/discriminant-overflow-2.rs
index ca24317c54d..ca24317c54d 100644
--- a/tests/ui/discrim/discrim-overflow-2.rs
+++ b/tests/ui/enum-discriminant/discriminant-overflow-2.rs
diff --git a/tests/ui/discrim/discrim-overflow.stderr b/tests/ui/enum-discriminant/discriminant-overflow-2.stderr
index 1b331bb1b8d..5f7387c5908 100644
--- a/tests/ui/discrim/discrim-overflow.stderr
+++ b/tests/ui/enum-discriminant/discriminant-overflow-2.stderr
@@ -1,5 +1,5 @@
 error[E0370]: enum discriminant overflowed
-  --> $DIR/discrim-overflow.rs:11:9
+  --> $DIR/discriminant-overflow-2.rs:13:9
    |
 LL |         OhNo,
    |         ^^^^ overflowed on value after 127
@@ -7,7 +7,7 @@ LL |         OhNo,
    = note: explicitly set `OhNo = -128` if that is desired outcome
 
 error[E0370]: enum discriminant overflowed
-  --> $DIR/discrim-overflow.rs:22:9
+  --> $DIR/discriminant-overflow-2.rs:22:9
    |
 LL |         OhNo,
    |         ^^^^ overflowed on value after 255
@@ -15,7 +15,7 @@ LL |         OhNo,
    = note: explicitly set `OhNo = 0` if that is desired outcome
 
 error[E0370]: enum discriminant overflowed
-  --> $DIR/discrim-overflow.rs:33:9
+  --> $DIR/discriminant-overflow-2.rs:31:9
    |
 LL |         OhNo,
    |         ^^^^ overflowed on value after 32767
@@ -23,7 +23,7 @@ LL |         OhNo,
    = note: explicitly set `OhNo = -32768` if that is desired outcome
 
 error[E0370]: enum discriminant overflowed
-  --> $DIR/discrim-overflow.rs:44:9
+  --> $DIR/discriminant-overflow-2.rs:40:9
    |
 LL |         OhNo,
    |         ^^^^ overflowed on value after 65535
@@ -31,7 +31,7 @@ LL |         OhNo,
    = note: explicitly set `OhNo = 0` if that is desired outcome
 
 error[E0370]: enum discriminant overflowed
-  --> $DIR/discrim-overflow.rs:56:9
+  --> $DIR/discriminant-overflow-2.rs:49:9
    |
 LL |         OhNo,
    |         ^^^^ overflowed on value after 2147483647
@@ -39,7 +39,7 @@ LL |         OhNo,
    = note: explicitly set `OhNo = -2147483648` if that is desired outcome
 
 error[E0370]: enum discriminant overflowed
-  --> $DIR/discrim-overflow.rs:68:9
+  --> $DIR/discriminant-overflow-2.rs:58:9
    |
 LL |         OhNo,
    |         ^^^^ overflowed on value after 4294967295
@@ -47,7 +47,7 @@ LL |         OhNo,
    = note: explicitly set `OhNo = 0` if that is desired outcome
 
 error[E0370]: enum discriminant overflowed
-  --> $DIR/discrim-overflow.rs:80:9
+  --> $DIR/discriminant-overflow-2.rs:67:9
    |
 LL |         OhNo,
    |         ^^^^ overflowed on value after 9223372036854775807
@@ -55,7 +55,7 @@ LL |         OhNo,
    = note: explicitly set `OhNo = -9223372036854775808` if that is desired outcome
 
 error[E0370]: enum discriminant overflowed
-  --> $DIR/discrim-overflow.rs:92:9
+  --> $DIR/discriminant-overflow-2.rs:76:9
    |
 LL |         OhNo,
    |         ^^^^ overflowed on value after 18446744073709551615
diff --git a/tests/ui/discrim/discrim-overflow.rs b/tests/ui/enum-discriminant/discriminant-overflow.rs
index 774ced93c17..774ced93c17 100644
--- a/tests/ui/discrim/discrim-overflow.rs
+++ b/tests/ui/enum-discriminant/discriminant-overflow.rs
diff --git a/tests/ui/discrim/discrim-overflow-2.stderr b/tests/ui/enum-discriminant/discriminant-overflow.stderr
index 3ca84c66753..2ecc1839f57 100644
--- a/tests/ui/discrim/discrim-overflow-2.stderr
+++ b/tests/ui/enum-discriminant/discriminant-overflow.stderr
@@ -1,5 +1,5 @@
 error[E0370]: enum discriminant overflowed
-  --> $DIR/discrim-overflow-2.rs:13:9
+  --> $DIR/discriminant-overflow.rs:11:9
    |
 LL |         OhNo,
    |         ^^^^ overflowed on value after 127
@@ -7,7 +7,7 @@ LL |         OhNo,
    = note: explicitly set `OhNo = -128` if that is desired outcome
 
 error[E0370]: enum discriminant overflowed
-  --> $DIR/discrim-overflow-2.rs:22:9
+  --> $DIR/discriminant-overflow.rs:22:9
    |
 LL |         OhNo,
    |         ^^^^ overflowed on value after 255
@@ -15,7 +15,7 @@ LL |         OhNo,
    = note: explicitly set `OhNo = 0` if that is desired outcome
 
 error[E0370]: enum discriminant overflowed
-  --> $DIR/discrim-overflow-2.rs:31:9
+  --> $DIR/discriminant-overflow.rs:33:9
    |
 LL |         OhNo,
    |         ^^^^ overflowed on value after 32767
@@ -23,7 +23,7 @@ LL |         OhNo,
    = note: explicitly set `OhNo = -32768` if that is desired outcome
 
 error[E0370]: enum discriminant overflowed
-  --> $DIR/discrim-overflow-2.rs:40:9
+  --> $DIR/discriminant-overflow.rs:44:9
    |
 LL |         OhNo,
    |         ^^^^ overflowed on value after 65535
@@ -31,7 +31,7 @@ LL |         OhNo,
    = note: explicitly set `OhNo = 0` if that is desired outcome
 
 error[E0370]: enum discriminant overflowed
-  --> $DIR/discrim-overflow-2.rs:49:9
+  --> $DIR/discriminant-overflow.rs:56:9
    |
 LL |         OhNo,
    |         ^^^^ overflowed on value after 2147483647
@@ -39,7 +39,7 @@ LL |         OhNo,
    = note: explicitly set `OhNo = -2147483648` if that is desired outcome
 
 error[E0370]: enum discriminant overflowed
-  --> $DIR/discrim-overflow-2.rs:58:9
+  --> $DIR/discriminant-overflow.rs:68:9
    |
 LL |         OhNo,
    |         ^^^^ overflowed on value after 4294967295
@@ -47,7 +47,7 @@ LL |         OhNo,
    = note: explicitly set `OhNo = 0` if that is desired outcome
 
 error[E0370]: enum discriminant overflowed
-  --> $DIR/discrim-overflow-2.rs:67:9
+  --> $DIR/discriminant-overflow.rs:80:9
    |
 LL |         OhNo,
    |         ^^^^ overflowed on value after 9223372036854775807
@@ -55,7 +55,7 @@ LL |         OhNo,
    = note: explicitly set `OhNo = -9223372036854775808` if that is desired outcome
 
 error[E0370]: enum discriminant overflowed
-  --> $DIR/discrim-overflow-2.rs:76:9
+  --> $DIR/discriminant-overflow.rs:92:9
    |
 LL |         OhNo,
    |         ^^^^ overflowed on value after 18446744073709551615

 

generated by cgit-pink 1.4.1-3-g733a5 (git 2.37.1) at 2025-10-26 15:33:42 +0000