rollup merge of #20754: nikomatsakis/int-feature

Conflicts:
	src/test/compile-fail/borrowck-move-out-of-overloaded-auto-deref.rs
	src/test/compile-fail/issue-2590.rs
	src/test/compile-fail/lint-stability.rs
	src/test/compile-fail/slice-mut-2.rs
	src/test/compile-fail/std-uncopyable-atomics.rs

1 files changed, 3 insertions, 3 deletions

diff --git a/src/test/compile-fail/pattern-error-continue.rs b/src/test/compile-fail/pattern-error-continue.rs
index 8b65af00fb1..c288429dcda 100644
--- a/src/test/compile-fail/pattern-error-continue.rs
+++ b/src/test/compile-fail/pattern-error-continue.rs
@@ -11,13 +11,13 @@
 // Test that certain pattern-match type errors are non-fatal
 
 enum A {
-    B(int, int),
-    C(int, int, int),
+    B(isize, isize),
+    C(isize, isize, isize),
     D
 }
 
 struct S {
-    a: int
+    a: isize
 }
 
 fn f(_c: char) {}