rollup merge of #22497: nikomatsakis/suffixes

Conflicts:
	src/librustc_trans/trans/tvec.rs

5 files changed, 5 insertions, 5 deletions

diff --git a/src/test/parse-fail/attr-before-let.rs b/src/test/parse-fail/attr-before-let.rs
index acc9aa8a9a1..b4a90e35c40 100644
--- a/src/test/parse-fail/attr-before-let.rs
+++ b/src/test/parse-fail/attr-before-let.rs
@@ -10,5 +10,5 @@
 
 fn main() {
     #[attr] //~ ERROR expected item
-    let _i = 0;
+    let __isize = 0;
 }
diff --git a/src/test/parse-fail/issue-1802-2.rs b/src/test/parse-fail/issue-1802-2.rs
index c7aacdfc68a..f6da2fc82c3 100644
--- a/src/test/parse-fail/issue-1802-2.rs
+++ b/src/test/parse-fail/issue-1802-2.rs
@@ -10,5 +10,5 @@
 
 // error-pattern:no valid digits found for number
 fn main() {
-    log(error, 0bu);
+    log(error, 0b_usize);
 }
diff --git a/src/test/parse-fail/issue-5544-a.rs b/src/test/parse-fail/issue-5544-a.rs
index 42a18ba5fb7..95a4f36d171 100644
--- a/src/test/parse-fail/issue-5544-a.rs
+++ b/src/test/parse-fail/issue-5544-a.rs
@@ -9,6 +9,6 @@
 // except according to those terms.
 
 fn main() {
-    let _i = 18446744073709551616; // 2^64
+    let __isize = 18446744073709551616; // 2^64
     //~^ ERROR int literal is too large
 }
diff --git a/src/test/parse-fail/issue-5544-b.rs b/src/test/parse-fail/issue-5544-b.rs
index 1f166ec0d1c..afff5984b46 100644
--- a/src/test/parse-fail/issue-5544-b.rs
+++ b/src/test/parse-fail/issue-5544-b.rs
@@ -9,6 +9,6 @@
 // except according to those terms.
 
 fn main() {
-    let _i = 0xff_ffff_ffff_ffff_ffff_is;
+    let __isize = 0xff_ffff_ffff_ffff_ffff__isize;
     //~^ ERROR int literal is too large
 }
diff --git a/src/test/parse-fail/issue-8537.rs b/src/test/parse-fail/issue-8537.rs
index dba9e751f71..52cf420a9ff 100644
--- a/src/test/parse-fail/issue-8537.rs
+++ b/src/test/parse-fail/issue-8537.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 pub extern
-  "invalid-abi" //~ ERROR illegal ABI
+  "invalid-ab_isize" //~ ERROR illegal ABI
 fn foo() {}
 
 fn main() {}