about summary refs log tree commit diff
diff options
context:
space:
mode:
authorvarkor <github@varkor.com>2018-12-05 23:21:56 +0100
committervarkor <github@varkor.com>2018-12-05 23:21:56 +0100
commited64b1927b4e929e905f778870a9f53d75216b34 (patch)
tree1ff95952dd3f60409839058c2a9251f761cc9878
parent4406391cdce37dfd8142cc49e3760c606da8913c (diff)
downloadrust-ed64b1927b4e929e905f778870a9f53d75216b34.tar.gz
rust-ed64b1927b4e929e905f778870a9f53d75216b34.zip
Fix precise_pointer_size_matching tests on all platforms
-rw-r--r--src/test/ui/precise_pointer_size_matching.rs7
-rw-r--r--src/test/ui/precise_pointer_size_matching.stderr12
2 files changed, 13 insertions, 6 deletions
diff --git a/src/test/ui/precise_pointer_size_matching.rs b/src/test/ui/precise_pointer_size_matching.rs
index 31b202fd6aa..759b63b188b 100644
--- a/src/test/ui/precise_pointer_size_matching.rs
+++ b/src/test/ui/precise_pointer_size_matching.rs
@@ -1,3 +1,10 @@
+// normalize-stderr-32bit: "-2147483648isize" -> "$$ISIZE_MIN"
+// normalize-stderr-64bit: "-9223372036854775808isize" -> "$$ISIZE_MIN"
+// normalize-stderr-32bit: "2147483647isize" -> "$$ISIZE_MAX"
+// normalize-stderr-64bit: "9223372036854775807isize" -> "$$ISIZE_MAX"
+// normalize-stderr-32bit: "4294967295usize" -> "$$USIZE_MAX"
+// normalize-stderr-64bit: "18446744073709551615usize" -> "$$USIZE_MAX"
+
 #![feature(precise_pointer_size_matching)]
 #![feature(exclusive_range_pattern)]
 
diff --git a/src/test/ui/precise_pointer_size_matching.stderr b/src/test/ui/precise_pointer_size_matching.stderr
index 8e13be0ae0c..4acbec6c7ff 100644
--- a/src/test/ui/precise_pointer_size_matching.stderr
+++ b/src/test/ui/precise_pointer_size_matching.stderr
@@ -1,14 +1,14 @@
-error[E0004]: non-exhaustive patterns: `-9223372036854775808isize..=-6isize` and `21isize..=9223372036854775807isize` not covered
-  --> $DIR/precise_pointer_size_matching.rs:17:11
+error[E0004]: non-exhaustive patterns: `$ISIZE_MIN..=-6isize` and `21isize..=$ISIZE_MAX` not covered
+  --> $DIR/precise_pointer_size_matching.rs:24:11
    |
 LL |     match 0isize { //~ ERROR non-exhaustive patterns
-   |           ^^^^^^ patterns `-9223372036854775808isize..=-6isize` and `21isize..=9223372036854775807isize` not covered
+   |           ^^^^^^ patterns `$ISIZE_MIN..=-6isize` and `21isize..=$ISIZE_MAX` not covered
 
-error[E0004]: non-exhaustive patterns: `0usize` and `21usize..=18446744073709551615usize` not covered
-  --> $DIR/precise_pointer_size_matching.rs:22:11
+error[E0004]: non-exhaustive patterns: `0usize` and `21usize..=$USIZE_MAX` not covered
+  --> $DIR/precise_pointer_size_matching.rs:29:11
    |
 LL |     match 0usize { //~ ERROR non-exhaustive patterns
-   |           ^^^^^^ patterns `0usize` and `21usize..=18446744073709551615usize` not covered
+   |           ^^^^^^ patterns `0usize` and `21usize..=$USIZE_MAX` not covered
 
 error: aborting due to 2 previous errors