From b4a43f3864e394959a7d3c3efae6da85bdc59c71 Mon Sep 17 00:00:00 2001
From: Tobias Bucher <tobiasbucher5991@gmail.com>
Date: Sat, 31 Jan 2015 17:23:42 +0100
Subject: Kill more `isize`s

---
 src/libsyntax/parse/mod.rs         |  2 +-
 src/libsyntax/print/pp.rs          |  2 +-
 src/libsyntax/util/small_vector.rs | 22 +++++++++++-----------
 3 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'src/libsyntax')

diff --git a/src/libsyntax/parse/mod.rs b/src/libsyntax/parse/mod.rs
index e7be876edbb..8ac5b6e5274 100644
--- a/src/libsyntax/parse/mod.rs
+++ b/src/libsyntax/parse/mod.rs
@@ -573,7 +573,7 @@ pub fn byte_lit(lit: &str) -> (u8, usize) {
     if lit.len() == 1 {
         (lit.as_bytes()[0], 1)
     } else {
-        assert!(lit.as_bytes()[0] == b'\\', err(0is));
+        assert!(lit.as_bytes()[0] == b'\\', err(0));
         let b = match lit.as_bytes()[1] {
             b'"' => b'"',
             b'n' => b'\n',
diff --git a/src/libsyntax/print/pp.rs b/src/libsyntax/print/pp.rs
index 7fb2f9a80cc..70d6a5f695a 100644
--- a/src/libsyntax/print/pp.rs
+++ b/src/libsyntax/print/pp.rs
@@ -167,7 +167,7 @@ pub fn mk_printer(out: Box<old_io::Writer+'static>, linewidth: usize) -> Printer
     let n: usize = 3 * linewidth;
     debug!("mk_printer {}", linewidth);
     let token: Vec<Token> = repeat(Token::Eof).take(n).collect();
-    let size: Vec<isize> = repeat(0is).take(n).collect();
+    let size: Vec<isize> = repeat(0).take(n).collect();
     let scan_stack: Vec<usize> = repeat(0us).take(n).collect();
     Printer {
         out: out,
diff --git a/src/libsyntax/util/small_vector.rs b/src/libsyntax/util/small_vector.rs
index 21a7d680847..12f871b2782 100644
--- a/src/libsyntax/util/small_vector.rs
+++ b/src/libsyntax/util/small_vector.rs
@@ -195,14 +195,14 @@ mod test {
         let v: SmallVector<isize> = SmallVector::zero();
         assert_eq!(0, v.len());
 
-        assert_eq!(1, SmallVector::one(1is).len());
-        assert_eq!(5, SmallVector::many(vec!(1is, 2, 3, 4, 5)).len());
+        assert_eq!(1, SmallVector::one(1).len());
+        assert_eq!(5, SmallVector::many(vec![1, 2, 3, 4, 5]).len());
     }
 
     #[test]
     fn test_push_get() {
         let mut v = SmallVector::zero();
-        v.push(1is);
+        v.push(1);
         assert_eq!(1, v.len());
         assert_eq!(&1, v.get(0));
         v.push(2);
@@ -215,7 +215,7 @@ mod test {
 
     #[test]
     fn test_from_iter() {
-        let v: SmallVector<isize> = (vec![1is, 2, 3]).into_iter().collect();
+        let v: SmallVector<isize> = (vec![1, 2, 3]).into_iter().collect();
         assert_eq!(3, v.len());
         assert_eq!(&1, v.get(0));
         assert_eq!(&2, v.get(1));
@@ -228,11 +228,11 @@ mod test {
         let v: Vec<isize> = v.into_iter().collect();
         assert_eq!(Vec::new(), v);
 
-        let v = SmallVector::one(1is);
-        assert_eq!(vec!(1is), v.into_iter().collect::<Vec<_>>());
+        let v = SmallVector::one(1);
+        assert_eq!(vec![1], v.into_iter().collect::<Vec<_>>());
 
-        let v = SmallVector::many(vec!(1is, 2is, 3is));
-        assert_eq!(vec!(1is, 2is, 3is), v.into_iter().collect::<Vec<_>>());
+        let v = SmallVector::many(vec![1, 2, 3]);
+        assert_eq!(vec!(1, 2, 3), v.into_iter().collect::<Vec<_>>());
     }
 
     #[test]
@@ -244,12 +244,12 @@ mod test {
     #[test]
     #[should_fail]
     fn test_expect_one_many() {
-        SmallVector::many(vec!(1is, 2)).expect_one("");
+        SmallVector::many(vec!(1, 2)).expect_one("");
     }
 
     #[test]
     fn test_expect_one_one() {
-        assert_eq!(1is, SmallVector::one(1is).expect_one(""));
-        assert_eq!(1is, SmallVector::many(vec!(1is)).expect_one(""));
+        assert_eq!(1, SmallVector::one(1).expect_one(""));
+        assert_eq!(1, SmallVector::many(vec!(1)).expect_one(""));
     }
 }
-- 
cgit 1.4.1-3-g733a5