diff options
| author | Tobias Bucher <tobiasbucher5991@gmail.com> | 2015-01-31 17:23:42 +0100 |
|---|---|---|
| committer | Tobias Bucher <tobiasbucher5991@gmail.com> | 2015-01-31 17:40:40 +0100 |
| commit | b4a43f3864e394959a7d3c3efae6da85bdc59c71 (patch) | |
| tree | 90ce64d37d1e616c4916281f5e1eb338d54ff7a0 | |
| parent | 105bfd30012a7d4278117e973b56c170a59fc20d (diff) | |
| download | rust-b4a43f3864e394959a7d3c3efae6da85bdc59c71.tar.gz rust-b4a43f3864e394959a7d3c3efae6da85bdc59c71.zip | |
Kill more `isize`s
197 files changed, 806 insertions, 807 deletions
diff --git a/src/doc/intro.md b/src/doc/intro.md index b92d38215c2..1e343b593df 100644 --- a/src/doc/intro.md +++ b/src/doc/intro.md @@ -424,7 +424,7 @@ Let's see an example. This Rust code will not compile: use std::thread::Thread; fn main() { - let mut numbers = vec![1is, 2, 3]; + let mut numbers = vec![1, 2, 3]; for i in 0..3 { Thread::spawn(move || { @@ -478,7 +478,7 @@ use std::thread::Thread; use std::sync::{Arc,Mutex}; fn main() { - let numbers = Arc::new(Mutex::new(vec![1is, 2, 3])); + let numbers = Arc::new(Mutex::new(vec![1, 2, 3])); for i in 0us..3 { let number = numbers.clone(); @@ -539,7 +539,7 @@ safety check that makes this an error about moved values: use std::thread::Thread; fn main() { - let vec = vec![1is, 2, 3]; + let vec = vec![1, 2, 3]; for i in 0us..3 { Thread::spawn(move || { diff --git a/src/libcollections/dlist.rs b/src/libcollections/dlist.rs index 911ed58b6ee..beb2973febc 100644 --- a/src/libcollections/dlist.rs +++ b/src/libcollections/dlist.rs @@ -333,7 +333,7 @@ impl<T> DList<T> { /// /// let mut dl = DList::new(); /// - /// dl.push_front(2is); + /// dl.push_front(2); /// assert_eq!(dl.len(), 1); /// /// dl.push_front(1); @@ -360,10 +360,10 @@ impl<T> DList<T> { /// /// let mut dl = DList::new(); /// - /// dl.push_front(2is); + /// dl.push_front(2); /// dl.push_front(1); /// assert_eq!(dl.len(), 2); - /// assert_eq!(dl.front(), Some(&1is)); + /// assert_eq!(dl.front(), Some(&1)); /// /// dl.clear(); /// assert_eq!(dl.len(), 0); @@ -388,7 +388,7 @@ impl<T> DList<T> { /// assert_eq!(dl.front(), None); /// /// dl.push_front(1); - /// assert_eq!(dl.front(), Some(&1is)); + /// assert_eq!(dl.front(), Some(&1)); /// /// ``` #[inline] @@ -409,13 +409,13 @@ impl<T> DList<T> { /// assert_eq!(dl.front(), None); /// /// dl.push_front(1); - /// assert_eq!(dl.front(), Some(&1is)); + /// assert_eq!(dl.front(), Some(&1)); /// /// match dl.front_mut() { /// None => {}, - /// Some(x) => *x = 5is, + /// Some(x) => *x = 5, /// } - /// assert_eq!(dl.front(), Some(&5is)); + /// assert_eq!(dl.front(), Some(&5)); /// /// ``` #[inline] @@ -436,7 +436,7 @@ impl<T> DList<T> { /// assert_eq!(dl.back(), None); /// /// dl.push_back(1); - /// assert_eq!(dl.back(), Some(&1is)); + /// assert_eq!(dl.back(), Some(&1)); /// /// ``` #[inline] @@ -457,13 +457,13 @@ impl<T> DList<T> { /// assert_eq!(dl.back(), None); /// /// dl.push_back(1); - /// assert_eq!(dl.back(), Some(&1is)); + /// assert_eq!(dl.back(), Some(&1)); /// /// match dl.back_mut() { /// None => {}, - /// Some(x) => *x = 5is, + /// Some(x) => *x = 5, /// } - /// assert_eq!(dl.back(), Some(&5is)); + /// assert_eq!(dl.back(), Some(&5)); /// /// ``` #[inline] @@ -483,8 +483,8 @@ impl<T> DList<T> { /// /// let mut dl = DList::new(); /// - /// dl.push_front(2is); - /// assert_eq!(dl.front().unwrap(), &2is); + /// dl.push_front(2); + /// assert_eq!(dl.front().unwrap(), &2); /// /// dl.push_front(1); /// assert_eq!(dl.front().unwrap(), &1); @@ -508,7 +508,7 @@ impl<T> DList<T> { /// let mut d = DList::new(); /// assert_eq!(d.pop_front(), None); /// - /// d.push_front(1is); + /// d.push_front(1); /// d.push_front(3); /// assert_eq!(d.pop_front(), Some(3)); /// assert_eq!(d.pop_front(), Some(1)); @@ -568,7 +568,7 @@ impl<T> DList<T> { /// /// let mut d = DList::new(); /// - /// d.push_front(1is); + /// d.push_front(1); /// d.push_front(2); /// d.push_front(3); /// diff --git a/src/libcoretest/hash/mod.rs b/src/libcoretest/hash/mod.rs index ae23024cf20..07f3ab4a5a7 100644 --- a/src/libcoretest/hash/mod.rs +++ b/src/libcoretest/hash/mod.rs @@ -50,13 +50,13 @@ fn test_writer_hasher() { assert_eq!(hash(&5u16), 5); assert_eq!(hash(&5u32), 5); assert_eq!(hash(&5u64), 5); - assert_eq!(hash(&5u), 5); + assert_eq!(hash(&5us), 5); assert_eq!(hash(&5i8), 5); assert_eq!(hash(&5i16), 5); assert_eq!(hash(&5i32), 5); assert_eq!(hash(&5i64), 5); - assert_eq!(hash(&5), 5); + assert_eq!(hash(&5is), 5); assert_eq!(hash(&false), 0); assert_eq!(hash(&true), 1); @@ -76,12 +76,12 @@ fn test_writer_hasher() { // FIXME (#18248) Add tests for hashing Rc<str> and Rc<[T]> unsafe { - let ptr: *const i32 = mem::transmute(5is); + let ptr: *const i32 = mem::transmute(5us); assert_eq!(hash(&ptr), 5); } unsafe { - let ptr: *mut i32 = mem::transmute(5is); + let ptr: *mut i32 = mem::transmute(5us); assert_eq!(hash(&ptr), 5); } } diff --git a/src/libcoretest/iter.rs b/src/libcoretest/iter.rs index 3102abb660f..c9cdf50fdbd 100644 --- a/src/libcoretest/iter.rs +++ b/src/libcoretest/iter.rs @@ -375,7 +375,7 @@ fn test_iterator_size_hint() { assert_eq!(c.clone().enumerate().size_hint(), (uint::MAX, None)); assert_eq!(c.clone().chain(vi.clone().map(|&i| i)).size_hint(), (uint::MAX, None)); assert_eq!(c.clone().zip(vi.clone()).size_hint(), (10, Some(10))); - assert_eq!(c.clone().scan(0i, |_,_| Some(0)).size_hint(), (0, None)); + assert_eq!(c.clone().scan(0, |_,_| Some(0)).size_hint(), (0, None)); assert_eq!(c.clone().filter(|_| false).size_hint(), (0, None)); assert_eq!(c.clone().map(|_| 0).size_hint(), (uint::MAX, None)); assert_eq!(c.filter_map(|_| Some(0)).size_hint(), (0, None)); @@ -389,7 +389,7 @@ fn test_iterator_size_hint() { assert_eq!(vi.clone().enumerate().size_hint(), (10, Some(10))); assert_eq!(vi.clone().chain(v2.iter()).size_hint(), (13, Some(13))); assert_eq!(vi.clone().zip(v2.iter()).size_hint(), (3, Some(3))); - assert_eq!(vi.clone().scan(0i, |_,_| Some(0)).size_hint(), (0, Some(10))); + assert_eq!(vi.clone().scan(0, |_,_| Some(0)).size_hint(), (0, Some(10))); assert_eq!(vi.clone().filter(|_| false).size_hint(), (0, Some(10))); assert_eq!(vi.clone().map(|&i| i+1).size_hint(), (10, Some(10))); assert_eq!(vi.filter_map(|_| Some(0)).size_hint(), (0, Some(10))); diff --git a/src/libcoretest/option.rs b/src/libcoretest/option.rs index b32ae68b5d3..860bd40e21e 100644 --- a/src/libcoretest/option.rs +++ b/src/libcoretest/option.rs @@ -223,7 +223,7 @@ fn test_ord() { /* FIXME(#20575) #[test] fn test_collect() { - let v: Option<Vec<int>> = (0..0).map(|_| Some(0i)).collect(); + let v: Option<Vec<int>> = (0..0).map(|_| Some(0)).collect(); assert!(v == Some(vec![])); let v: Option<Vec<int>> = (0..3).map(|x| Some(x)).collect(); diff --git a/src/libstd/collections/hash/set.rs b/src/libstd/collections/hash/set.rs index 3095c2c0e41..c6dcb0d230f 100644 --- a/src/libstd/collections/hash/set.rs +++ b/src/libstd/collections/hash/set.rs @@ -1198,7 +1198,7 @@ mod test_set { #[test] fn test_drain() { - let mut s: HashSet<int> = (1is..100).collect(); + let mut s: HashSet<i32> = (1..100).collect(); // try this a bunch of times to make sure we don't screw up internal state. for _ in 0..20 { @@ -1217,7 +1217,7 @@ mod test_set { for _ in s.iter() { panic!("s should be empty!"); } // reset to try again. - s.extend(1is..100); + s.extend(1..100); } } } diff --git a/src/libstd/old_io/fs.rs b/src/libstd/old_io/fs.rs index 1337675544d..0a9aeb849be 100644 --- a/src/libstd/old_io/fs.rs +++ b/src/libstd/old_io/fs.rs @@ -1101,7 +1101,7 @@ mod test { let dir = &tmpdir.join("di_readdir"); check!(mkdir(dir, old_io::USER_RWX)); let prefix = "foo"; - for n in 0is..3 { + for n in 0..3 { let f = dir.join(format!("{}.txt", n)); let mut w = check!(File::create(&f)); let msg_str = format!("{}{}", prefix, n); diff --git a/src/libstd/old_io/net/tcp.rs b/src/libstd/old_io/net/tcp.rs index 122ac4c3445..ebf7f6cc0f2 100644 --- a/src/libstd/old_io/net/tcp.rs +++ b/src/libstd/old_io/net/tcp.rs @@ -1160,7 +1160,7 @@ mod test { tx.send(TcpStream::connect(addr).unwrap()).unwrap(); }); let _l = rx.recv().unwrap(); - for i in 0is..1001 { + for i in 0i32..1001 { match a.accept() { Ok(..) => break, Err(ref e) if e.kind == TimedOut => {} @@ -1260,7 +1260,7 @@ mod test { assert_eq!(s.read(&mut [0]).err().unwrap().kind, TimedOut); s.set_timeout(Some(20)); - for i in 0is..1001 { + for i in 0i32..1001 { match s.write(&[0; 128 * 1024]) { Ok(()) | Err(IoError { kind: ShortWrite(..), .. }) => {}, Err(IoError { kind: TimedOut, .. }) => break, @@ -1318,7 +1318,7 @@ mod test { let mut s = a.accept().unwrap(); s.set_write_timeout(Some(20)); - for i in 0is..1001 { + for i in 0i32..1001 { match s.write(&[0; 128 * 1024]) { Ok(()) | Err(IoError { kind: ShortWrite(..), .. }) => {}, Err(IoError { kind: TimedOut, .. }) => break, 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("")); } } diff --git a/src/test/bench/shootout-meteor.rs b/src/test/bench/shootout-meteor.rs index 3c01697166e..d44948e4ed2 100644 --- a/src/test/bench/shootout-meteor.rs +++ b/src/test/bench/shootout-meteor.rs @@ -104,8 +104,8 @@ impl<'a, T> Iterator for ListIterator<'a, T> { // corresponding mirrored piece), with, as minimum coordinates, (0, // 0). If all is false, only generate half of the possibilities (used // to break the symmetry of the board). -fn transform(piece: Vec<(isize, isize)> , all: bool) -> Vec<Vec<(isize, isize)>> { - let mut res: Vec<Vec<(isize, isize)>> = +fn transform(piece: Vec<(i32, i32)> , all: bool) -> Vec<Vec<(i32, i32)>> { + let mut res: Vec<Vec<(i32, i32)>> = // rotations iterate(piece, |rot| rot.iter().map(|&(y, x)| (x + y, -y)).collect()) .take(if all {6} else {3}) @@ -133,7 +133,7 @@ fn transform(piece: Vec<(isize, isize)> , all: bool) -> Vec<Vec<(isize, isize)>> // Takes a piece with minimum coordinate (0, 0) (as generated by // transform). Returns the corresponding mask if p translated by (dy, // dx) is on the board. -fn mask(dy: isize, dx: isize, id: usize, p: &Vec<(isize, isize)>) -> Option<u64> { +fn mask(dy: i32, dx: i32, id: usize, p: &Vec<(i32, i32)>) -> Option<u64> { let mut m = 1 << (50 + id); for &(y, x) in p.iter() { let x = x + dx + (y + (dy % 2)) / 2; @@ -164,12 +164,12 @@ fn make_masks() -> Vec<Vec<Vec<u64> > > { // To break the central symmetry of the problem, every // transformation must be taken except for one piece (piece 3 // here). - let transforms: Vec<Vec<Vec<(isize, isize)>>> = + let transforms: Vec<Vec<Vec<(i32, i32)>>> = pieces.into_iter().enumerate() .map(|(id, p)| transform(p, id != 3)) .collect(); - (0is..50).map(|yx| { + (0i32..50).map(|yx| { transforms.iter().enumerate().map(|(id, t)| { t.iter().filter_map(|p| mask(yx / 5, yx % 5, id, p)).collect() }).collect() diff --git a/src/test/compile-fail/array-not-vector.rs b/src/test/compile-fail/array-not-vector.rs index 2415288a3eb..7111c00d124 100644 --- a/src/test/compile-fail/array-not-vector.rs +++ b/src/test/compile-fail/array-not-vector.rs @@ -9,18 +9,18 @@ // except according to those terms. fn main() { - let _x: isize = [1is, 2, 3]; + let _x: i32 = [1i32, 2, 3]; //~^ ERROR mismatched types - //~| expected `isize` - //~| found `[isize; 3]` - //~| expected isize + //~| expected `i32` + //~| found `[i32; 3]` + //~| expected i32 //~| found array of 3 elements - let x: &[isize] = &[1, 2, 3]; - let _y: &isize = x; + let x: &[i32] = &[1i32, 2, 3]; + let _y: &i32 = x; //~^ ERROR mismatched types - //~| expected `&isize` - //~| found `&[isize]` - //~| expected isize + //~| expected `&i32` + //~| found `&[i32]` + //~| expected i32 //~| found slice } diff --git a/src/test/compile-fail/array-old-syntax-1.rs b/src/test/compile-fail/array-old-syntax-1.rs index 3b4810a86ab..71c57fefc2e 100644 --- a/src/test/compile-fail/array-old-syntax-1.rs +++ b/src/test/compile-fail/array-old-syntax-1.rs @@ -11,5 +11,5 @@ // Test that the old fixed length array syntax is a parsing error. fn main() { - let _x: [isize, ..3] = [0is, 1, 2]; //~ ERROR + let _x: [isize, ..3] = [0, 1, 2]; //~ ERROR } diff --git a/src/test/compile-fail/array-old-syntax-2.rs b/src/test/compile-fail/array-old-syntax-2.rs index c1b88290bc3..99ff3ae29f1 100644 --- a/src/test/compile-fail/array-old-syntax-2.rs +++ b/src/test/compile-fail/array-old-syntax-2.rs @@ -11,5 +11,5 @@ // Test that the old repeating array syntax gives an error. fn main() { - let _ = [0is, ..3]; //~ ERROR + let _ = [0, ..3]; //~ ERROR } diff --git a/src/test/compile-fail/associated-types-eq-3.rs b/src/test/compile-fail/associated-types-eq-3.rs index fdfff559086..f01f2b111c5 100644 --- a/src/test/compile-fail/associated-types-eq-3.rs +++ b/src/test/compile-fail/associated-types-eq-3.rs @@ -45,7 +45,7 @@ pub fn baz(x: &Foo<A=Bar>) { pub fn main() { - let a = 42is; + let a = 42; foo1(a); //~^ ERROR type mismatch resolving //~| expected usize diff --git a/src/test/compile-fail/associated-types-incomplete-object.rs b/src/test/compile-fail/associated-types-incomplete-object.rs index 31492406fed..1c708da30a7 100644 --- a/src/test/compile-fail/associated-types-incomplete-object.rs +++ b/src/test/compile-fail/associated-types-incomplete-object.rs @@ -28,15 +28,15 @@ impl Foo for isize { } pub fn main() { - let a = &42is as &Foo<A=usize, B=char>; + let a = &42 as &Foo<A=usize, B=char>; - let b = &42is as &Foo<A=usize>; + let b = &42 as &Foo<A=usize>; //~^ ERROR the value of the associated type `B` (from the trait `Foo`) must be specified - let c = &42is as &Foo<B=char>; + let c = &42 as &Foo<B=char>; //~^ ERROR the value of the associated type `A` (from the trait `Foo`) must be specified - let d = &42is as &Foo; + let d = &42 as &Foo; //~^ ERROR the value of the associated type `A` (from the trait `Foo`) must be specified //~| ERROR the value of the associated type `B` (from the trait `Foo`) must be specified } diff --git a/src/test/compile-fail/associated-types-path-2.rs b/src/test/compile-fail/associated-types-path-2.rs index 55ba65d6102..51a37b517dd 100644 --- a/src/test/compile-fail/associated-types-path-2.rs +++ b/src/test/compile-fail/associated-types-path-2.rs @@ -14,8 +14,8 @@ pub trait Foo { type A; } -impl Foo for isize { - type A = usize; +impl Foo for i32 { + type A = u32; } pub fn f1<T: Foo>(a: T, x: T::A) {} @@ -24,33 +24,33 @@ pub fn f2<T: Foo>(a: T) -> T::A { } pub fn f1_int_int() { - f1(2is, 4is); + f1(2i32, 4i32); //~^ ERROR mismatched types - //~| expected usize - //~| found isize + //~| expected u32 + //~| found i32 } pub fn f1_int_uint() { - f1(2is, 4us); + f1(2i32, 4u32); } pub fn f1_uint_uint() { - f1(2us, 4us); + f1(2u32, 4u32); //~^ ERROR the trait `Foo` is not implemented //~| ERROR the trait `Foo` is not implemented } pub fn f1_uint_int() { - f1(2us, 4is); + f1(2u32, 4i32); //~^ ERROR the trait `Foo` is not implemented //~| ERROR the trait `Foo` is not implemented } pub fn f2_int() { - let _: isize = f2(2is); + let _: i32 = f2(2i32); //~^ ERROR mismatched types - //~| expected `isize` - //~| found `usize` + //~| expected `i32` + //~| found `u32` } pub fn main() { } diff --git a/src/test/compile-fail/bad-const-type.rs b/src/test/compile-fail/bad-const-type.rs index ed62506420a..7e3c356b870 100644 --- a/src/test/compile-fail/bad-const-type.rs +++ b/src/test/compile-fail/bad-const-type.rs @@ -8,10 +8,10 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -static i: String = 10is; +static i: String = 10i32; //~^ ERROR mismatched types //~| expected `collections::string::String` -//~| found `isize` +//~| found `i32` //~| expected struct `collections::string::String` -//~| found isize +//~| found i32 fn main() { println!("{}", i); } diff --git a/src/test/compile-fail/bang-tailexpr.rs b/src/test/compile-fail/bang-tailexpr.rs index d17fa68b47c..7d79ea03c02 100644 --- a/src/test/compile-fail/bang-tailexpr.rs +++ b/src/test/compile-fail/bang-tailexpr.rs @@ -9,6 +9,6 @@ // except according to those terms. fn f() -> ! { //~ ERROR computation may converge in a function marked as diverging - 3is + 3 } fn main() { } diff --git a/src/test/compile-fail/binop-logic-int.rs b/src/test/compile-fail/binop-logic-int.rs index 0067121e610..2217cf5e4da 100644 --- a/src/test/compile-fail/binop-logic-int.rs +++ b/src/test/compile-fail/binop-logic-int.rs @@ -8,6 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// error-pattern:`&&` cannot be applied to type `isize` +// error-pattern:`&&` cannot be applied to type `i32` -fn main() { let x = 1is && 2is; } +fn main() { let x = 1i32 && 2i32; } diff --git a/src/test/compile-fail/borrow-tuple-fields.rs b/src/test/compile-fail/borrow-tuple-fields.rs index e6fe60a9004..40e077bd1b5 100644 --- a/src/test/compile-fail/borrow-tuple-fields.rs +++ b/src/test/compile-fail/borrow-tuple-fields.rs @@ -16,28 +16,28 @@ struct Foo(Box<isize>, isize); struct Bar(isize, isize); fn main() { - let x = (box 1is, 2is); + let x = (box 1, 2); let r = &x.0; let y = x; //~ ERROR cannot move out of `x` because it is borrowed - let mut x = (1is, 2is); + let mut x = (1, 2); let a = &x.0; let b = &mut x.0; //~ ERROR cannot borrow `x.0` as mutable because it is also borrowed as - let mut x = (1is, 2is); + let mut x = (1, 2); let a = &mut x.0; let b = &mut x.0; //~ ERROR cannot borrow `x.0` as mutable more than once at a time - let x = Foo(box 1is, 2is); + let x = Foo(box 1, 2); let r = &x.0; let y = x; //~ ERROR cannot move out of `x` because it is borrowed - let mut x = Bar(1is, 2is); + let mut x = Bar(1, 2); let a = &x.0; let b = &mut x.0; //~ ERROR cannot borrow `x.0` as mutable because it is also borrowed as - let mut x = Bar(1is, 2is); + let mut x = Bar(1, 2); let a = &mut x.0; let b = &mut x.0; //~ ERROR cannot borrow `x.0` as mutable more than once at a time } diff --git a/src/test/compile-fail/borrowck-anon-fields-tuple.rs b/src/test/compile-fail/borrowck-anon-fields-tuple.rs index 88486756b66..ebaed01756f 100644 --- a/src/test/compile-fail/borrowck-anon-fields-tuple.rs +++ b/src/test/compile-fail/borrowck-anon-fields-tuple.rs @@ -12,7 +12,7 @@ // anonymous fields of a tuple vs the same anonymous field. fn distinct_variant() { - let mut y = (1is, 2is); + let mut y = (1, 2); let a = match y { (ref mut a, _) => a @@ -27,7 +27,7 @@ fn distinct_variant() { } fn same_variant() { - let mut y = (1is, 2is); + let mut y = (1, 2); let a = match y { (ref mut a, _) => a diff --git a/src/test/compile-fail/borrowck-array-double-move.rs b/src/test/compile-fail/borrowck-array-double-move.rs index ac9ddc2ce65..3fb42b38e84 100644 --- a/src/test/compile-fail/borrowck-array-double-move.rs +++ b/src/test/compile-fail/borrowck-array-double-move.rs @@ -12,9 +12,9 @@ #![feature(box_syntax)] fn f() { - let mut a = [box 0is, box 1is]; + let mut a = [box 0, box 1]; drop(a[0]); - a[1] = box 2is; + a[1] = box 2; drop(a[0]); //~ ERROR use of moved value: `a[..]` } diff --git a/src/test/compile-fail/borrowck-break-uninit-2.rs b/src/test/compile-fail/borrowck-break-uninit-2.rs index a52eaeeb9c3..82a6c92abaf 100644 --- a/src/test/compile-fail/borrowck-break-uninit-2.rs +++ b/src/test/compile-fail/borrowck-break-uninit-2.rs @@ -11,14 +11,14 @@ fn foo() -> isize { let x: isize; - while 1is != 2 { + while 1 != 2 { break; x = 0; } println!("{}", x); //~ ERROR use of possibly uninitialized variable: `x` - return 17is; + return 17; } fn main() { println!("{}", foo()); } diff --git a/src/test/compile-fail/borrowck-closures-mut-and-imm.rs b/src/test/compile-fail/borrowck-closures-mut-and-imm.rs index 29c7d6920bd..9d73ad319a6 100644 --- a/src/test/compile-fail/borrowck-closures-mut-and-imm.rs +++ b/src/test/compile-fail/borrowck-closures-mut-and-imm.rs @@ -22,37 +22,37 @@ fn set(x: &mut isize) { } fn a() { - let mut x = 3is; + let mut x = 3; let c1 = |&mut:| x = 4; let c2 = |&mut:| x * 5; //~ ERROR cannot borrow `x` } fn b() { - let mut x = 3is; + let mut x = 3; let c1 = |&mut:| set(&mut x); let c2 = |&mut:| get(&x); //~ ERROR cannot borrow `x` } fn c() { - let mut x = 3is; + let mut x = 3; let c1 = |&mut:| set(&mut x); let c2 = |&mut:| x * 5; //~ ERROR cannot borrow `x` } fn d() { - let mut x = 3is; + let mut x = 3; let c2 = |&mut:| x * 5; x = 5; //~ ERROR cannot assign } fn e() { - let mut x = 3is; + let mut x = 3; let c1 = |&mut:| get(&x); x = 5; //~ ERROR cannot assign } fn f() { - let mut x = box 3is; + let mut x = box 3; let c1 = |&mut:| get(&*x); *x = 5; //~ ERROR cannot assign } diff --git a/src/test/compile-fail/borrowck-closures-two-mut.rs b/src/test/compile-fail/borrowck-closures-two-mut.rs index 5cb49ab7711..48a9dccfef0 100644 --- a/src/test/compile-fail/borrowck-closures-two-mut.rs +++ b/src/test/compile-fail/borrowck-closures-two-mut.rs @@ -15,7 +15,7 @@ #![feature(box_syntax)] fn a() { - let mut x = 3is; + let mut x = 3; let c1 = |&mut:| x = 4; let c2 = |&mut:| x = 5; //~ ERROR cannot borrow `x` as mutable more than once } @@ -25,19 +25,19 @@ fn set(x: &mut isize) { } fn b() { - let mut x = 3is; + let mut x = 3; let c1 = |&mut:| set(&mut x); let c2 = |&mut:| set(&mut x); //~ ERROR cannot borrow `x` as mutable more than once } fn c() { - let mut x = 3is; + let mut x = 3; let c1 = |&mut:| x = 5; let c2 = |&mut:| set(&mut x); //~ ERROR cannot borrow `x` as mutable more than once } fn d() { - let mut x = 3is; + let mut x = 3; let c1 = |&mut:| x = 5; let c2 = |&mut:| { let _y = |&mut:| set(&mut x); }; // (nested closure) //~^ ERROR cannot borrow `x` as mutable more than once diff --git a/src/test/compile-fail/borrowck-for-loop-correct-cmt-for-pattern.rs b/src/test/compile-fail/borrowck-for-loop-correct-cmt-for-pattern.rs index 6884ac153a1..ad77953bdd8 100644 --- a/src/test/compile-fail/borrowck-for-loop-correct-cmt-for-pattern.rs +++ b/src/test/compile-fail/borrowck-for-loop-correct-cmt-for-pattern.rs @@ -17,7 +17,7 @@ struct Foo { } fn main() { - let mut y = 1is; + let mut y = 1; let x = Some(&mut y); for &a in x.iter() { //~ ERROR cannot move out } @@ -28,7 +28,7 @@ fn main() { for &a in f.a.iter() { //~ ERROR cannot move out } - let x = Some(box 1is); + let x = Some(box 1); for &a in x.iter() { //~ ERROR cannot move out } } diff --git a/src/test/compile-fail/borrowck-if-no-else.rs b/src/test/compile-fail/borrowck-if-no-else.rs index b98833776fb..74b542800b9 100644 --- a/src/test/compile-fail/borrowck-if-no-else.rs +++ b/src/test/compile-fail/borrowck-if-no-else.rs @@ -11,6 +11,6 @@ fn foo(x: isize) { println!("{}", x); } fn main() { - let x: isize; if 1is > 2 { x = 10; } + let x: isize; if 1 > 2 { x = 10; } foo(x); //~ ERROR use of possibly uninitialized variable: `x` } diff --git a/src/test/compile-fail/borrowck-if-with-else.rs b/src/test/compile-fail/borrowck-if-with-else.rs index c74edfd8d07..f3b02d12854 100644 --- a/src/test/compile-fail/borrowck-if-with-else.rs +++ b/src/test/compile-fail/borrowck-if-with-else.rs @@ -12,7 +12,7 @@ fn foo(x: isize) { println!("{}", x); } fn main() { let x: isize; - if 1is > 2 { + if 1 > 2 { println!("whoops"); } else { x = 10; diff --git a/src/test/compile-fail/borrowck-imm-ref-to-mut-rec-field-issue-3162-c.rs b/src/test/compile-fail/borrowck-imm-ref-to-mut-rec-field-issue-3162-c.rs index fabfce6ffb3..8af10231921 100644 --- a/src/test/compile-fail/borrowck-imm-ref-to-mut-rec-field-issue-3162-c.rs +++ b/src/test/compile-fail/borrowck-imm-ref-to-mut-rec-field-issue-3162-c.rs @@ -9,7 +9,7 @@ // except according to those terms. fn main() { - let mut _a = 3is; + let mut _a = 3; let _b = &mut _a; { let _c = &*_b; diff --git a/src/test/compile-fail/borrowck-issue-2657-1.rs b/src/test/compile-fail/borrowck-issue-2657-1.rs index dc1c73efc40..0c717d2ee5f 100644 --- a/src/test/compile-fail/borrowck-issue-2657-1.rs +++ b/src/test/compile-fail/borrowck-issue-2657-1.rs @@ -11,7 +11,7 @@ #![feature(box_syntax)] fn main() { - let x = Some(box 1is); + let x = Some(box 1); match x { Some(ref _y) => { let _a = x; //~ ERROR cannot move diff --git a/src/test/compile-fail/borrowck-issue-2657-2.rs b/src/test/compile-fail/borrowck-issue-2657-2.rs index 0b76044f8d6..b4e5ae1c25b 100644 --- a/src/test/compile-fail/borrowck-issue-2657-2.rs +++ b/src/test/compile-fail/borrowck-issue-2657-2.rs @@ -11,7 +11,7 @@ #![feature(box_syntax)] fn main() { - let x = Some(box 1is); + let x = Some(box 1); match x { Some(ref y) => { let _b = *y; //~ ERROR cannot move out diff --git a/src/test/compile-fail/borrowck-lend-flow-loop.rs b/src/test/compile-fail/borrowck-lend-flow-loop.rs index 545c7663085..5418a531fe6 100644 --- a/src/test/compile-fail/borrowck-lend-flow-loop.rs +++ b/src/test/compile-fail/borrowck-lend-flow-loop.rs @@ -41,7 +41,7 @@ fn block_overarching_alias_mut() { let mut v = box 3; let mut x = &mut v; - for _ in 0is..3 { + for _ in 0..3 { borrow(&*v); //~ ERROR cannot borrow } *x = box 5; diff --git a/src/test/compile-fail/borrowck-lend-flow-match.rs b/src/test/compile-fail/borrowck-lend-flow-match.rs index f501682847f..30ec993ed5e 100644 --- a/src/test/compile-fail/borrowck-lend-flow-match.rs +++ b/src/test/compile-fail/borrowck-lend-flow-match.rs @@ -19,10 +19,10 @@ fn separate_arms() { None => { // It is ok to reassign x here, because there is in // fact no outstanding loan of x! - x = Some(0is); + x = Some(0); } Some(ref _i) => { - x = Some(1is); //~ ERROR cannot assign + x = Some(1); //~ ERROR cannot assign } } x.clone(); // just to prevent liveness warnings diff --git a/src/test/compile-fail/borrowck-let-suggestion.rs b/src/test/compile-fail/borrowck-let-suggestion.rs index a08021919df..5729f8c5617 100644 --- a/src/test/compile-fail/borrowck-let-suggestion.rs +++ b/src/test/compile-fail/borrowck-let-suggestion.rs @@ -9,7 +9,7 @@ // except according to those terms. fn f() { - let x = [1is].iter(); //~ ERROR borrowed value does not live long enough + let x = [1].iter(); //~ ERROR borrowed value does not live long enough //~^ NOTE reference must be valid for the block suffix following statement //~^^ HELP consider using a `let` binding to increase its lifetime } diff --git a/src/test/compile-fail/borrowck-loan-blocks-move-cc.rs b/src/test/compile-fail/borrowck-loan-blocks-move-cc.rs index bff22257760..980c498e39b 100644 --- a/src/test/compile-fail/borrowck-loan-blocks-move-cc.rs +++ b/src/test/compile-fail/borrowck-loan-blocks-move-cc.rs @@ -17,7 +17,7 @@ fn borrow<F>(v: &isize, f: F) where F: FnOnce(&isize) { } fn box_imm() { - let v = box 3is; + let v = box 3; let _w = &v; Thread::spawn(move|| { println!("v={}", *v); @@ -26,7 +26,7 @@ fn box_imm() { } fn box_imm_explicit() { - let v = box 3is; + let v = box 3; let _w = &v; Thread::spawn(move|| { println!("v={}", *v); diff --git a/src/test/compile-fail/borrowck-match-binding-is-assignment.rs b/src/test/compile-fail/borrowck-match-binding-is-assignment.rs index 575d67c0b83..38593d31842 100644 --- a/src/test/compile-fail/borrowck-match-binding-is-assignment.rs +++ b/src/test/compile-fail/borrowck-match-binding-is-assignment.rs @@ -19,7 +19,7 @@ struct S { } pub fn main() { - match 1is { + match 1 { x => { x += 1; //~ ERROR re-assignment of immutable variable `x` } @@ -37,13 +37,13 @@ pub fn main() { } } - match (1is,) { + match (1,) { (x,) => { x += 1; //~ ERROR re-assignment of immutable variable `x` } } - match [1is,2,3] { + match [1,2,3] { [x,_,_] => { x += 1; //~ ERROR re-assignment of immutable variable `x` } diff --git a/src/test/compile-fail/borrowck-move-from-subpath-of-borrowed-path.rs b/src/test/compile-fail/borrowck-move-from-subpath-of-borrowed-path.rs index 0d1a51bbf35..3d8d599970f 100644 --- a/src/test/compile-fail/borrowck-move-from-subpath-of-borrowed-path.rs +++ b/src/test/compile-fail/borrowck-move-from-subpath-of-borrowed-path.rs @@ -14,7 +14,7 @@ #![feature(box_syntax)] fn main() { - let a = box box 2is; + let a = box box 2; let b = &a; let z = *a; //~ ERROR: cannot move out of `*a` because it is borrowed diff --git a/src/test/compile-fail/borrowck-move-out-of-overloaded-auto-deref.rs b/src/test/compile-fail/borrowck-move-out-of-overloaded-auto-deref.rs index 507f073adb2..27cef1f3c60 100644 --- a/src/test/compile-fail/borrowck-move-out-of-overloaded-auto-deref.rs +++ b/src/test/compile-fail/borrowck-move-out-of-overloaded-auto-deref.rs @@ -11,6 +11,6 @@ use std::rc::Rc; pub fn main() { - let _x = Rc::new(vec!(1is, 2)).into_iter(); + let _x = Rc::new(vec!(1, 2)).into_iter(); //~^ ERROR cannot move out of borrowed content } diff --git a/src/test/compile-fail/borrowck-multiple-captures.rs b/src/test/compile-fail/borrowck-multiple-captures.rs index 33ac5d7fceb..94e213ae1ae 100644 --- a/src/test/compile-fail/borrowck-multiple-captures.rs +++ b/src/test/compile-fail/borrowck-multiple-captures.rs @@ -15,9 +15,9 @@ use std::thread::Thread; fn borrow<T>(_: &T) { } fn different_vars_after_borrows() { - let x1 = box 1is; + let x1 = box 1; let p1 = &x1; - let x2 = box 2is; + let x2 = box 2; let p2 = &x2; Thread::spawn(move|| { drop(x1); //~ ERROR cannot move `x1` into closure because it is borrowed @@ -28,9 +28,9 @@ fn different_vars_after_borrows() { } fn different_vars_after_moves() { - let x1 = box 1is; + let x1 = box 1; drop(x1); - let x2 = box 2is; + let x2 = box 2; drop(x2); Thread::spawn(move|| { drop(x1); //~ ERROR capture of moved value: `x1` @@ -39,7 +39,7 @@ fn different_vars_after_moves() { } fn same_var_after_borrow() { - let x = box 1is; + let x = box 1; let p = &x; Thread::spawn(move|| { drop(x); //~ ERROR cannot move `x` into closure because it is borrowed @@ -49,7 +49,7 @@ fn same_var_after_borrow() { } fn same_var_after_move() { - let x = box 1is; + let x = box 1; drop(x); Thread::spawn(move|| { drop(x); //~ ERROR capture of moved value: `x` diff --git a/src/test/compile-fail/borrowck-overloaded-index-2.rs b/src/test/compile-fail/borrowck-overloaded-index-2.rs index da3da47fa90..e9d8544a06a 100644 --- a/src/test/compile-fail/borrowck-overloaded-index-2.rs +++ b/src/test/compile-fail/borrowck-overloaded-index-2.rs @@ -25,7 +25,7 @@ impl<T> Index<usize> for MyVec<T> { } fn main() { - let v = MyVec { data: vec!(box 1is, box 2, box 3) }; + let v = MyVec { data: vec!(box 1, box 2, box 3) }; let good = &v[0]; // Shouldn't fail here let bad = v[0]; //~^ ERROR cannot move out of indexed content diff --git a/src/test/compile-fail/borrowck-uniq-via-lend.rs b/src/test/compile-fail/borrowck-uniq-via-lend.rs index 7fadf6d4660..49a1b782a3d 100644 --- a/src/test/compile-fail/borrowck-uniq-via-lend.rs +++ b/src/test/compile-fail/borrowck-uniq-via-lend.rs @@ -13,7 +13,7 @@ fn borrow(_v: &isize) {} fn local() { - let mut v = box 3is; + let mut v = box 3; borrow(&*v); } @@ -32,27 +32,27 @@ fn local_recs() { } fn aliased_imm() { - let mut v = box 3is; + let mut v = box 3; let _w = &v; borrow(&*v); } fn aliased_mut() { - let mut v = box 3is; + let mut v = box 3; let _w = &mut v; borrow(&*v); //~ ERROR cannot borrow `*v` } fn aliased_other() { - let mut v = box 3is; - let mut w = box 4is; + let mut v = box 3; + let mut w = box 4; let _x = &mut w; borrow(&*v); } fn aliased_other_reassign() { - let mut v = box 3is; - let mut w = box 4is; + let mut v = box 3; + let mut w = box 4; let mut _x = &mut w; _x = &mut v; borrow(&*v); //~ ERROR cannot borrow `*v` diff --git a/src/test/compile-fail/borrowck-vec-pattern-move-tail.rs b/src/test/compile-fail/borrowck-vec-pattern-move-tail.rs index 8869e99efd5..5f58027af53 100644 --- a/src/test/compile-fail/borrowck-vec-pattern-move-tail.rs +++ b/src/test/compile-fail/borrowck-vec-pattern-move-tail.rs @@ -9,7 +9,7 @@ // except according to those terms. fn main() { - let mut a = [1is, 2, 3, 4]; + let mut a = [1, 2, 3, 4]; let t = match a { [1, 2, tail..] => tail, _ => unreachable!() diff --git a/src/test/compile-fail/borrowck-vec-pattern-nesting.rs b/src/test/compile-fail/borrowck-vec-pattern-nesting.rs index 49994ebdbba..e125d777371 100644 --- a/src/test/compile-fail/borrowck-vec-pattern-nesting.rs +++ b/src/test/compile-fail/borrowck-vec-pattern-nesting.rs @@ -12,7 +12,7 @@ #![feature(box_syntax)] fn a() { - let mut vec = [box 1is, box 2, box 3]; + let mut vec = [box 1, box 2, box 3]; match vec { [box ref _a, _, _] => { vec[0] = box 4; //~ ERROR cannot assign @@ -21,7 +21,7 @@ fn a() { } fn b() { - let mut vec = vec!(box 1is, box 2, box 3); + let mut vec = vec!(box 1, box 2, box 3); let vec: &mut [Box<isize>] = vec.as_mut_slice(); match vec { [_b..] => { @@ -31,7 +31,7 @@ fn b() { } fn c() { - let mut vec = vec!(box 1is, box 2, box 3); + let mut vec = vec!(box 1, box 2, box 3); let vec: &mut [Box<isize>] = vec.as_mut_slice(); match vec { [_a, //~ ERROR cannot move out @@ -49,7 +49,7 @@ fn c() { } fn d() { - let mut vec = vec!(box 1is, box 2, box 3); + let mut vec = vec!(box 1, box 2, box 3); let vec: &mut [Box<isize>] = vec.as_mut_slice(); match vec { [_a.., //~ ERROR cannot move out @@ -60,7 +60,7 @@ fn d() { } fn e() { - let mut vec = vec!(box 1is, box 2, box 3); + let mut vec = vec!(box 1, box 2, box 3); let vec: &mut [Box<isize>] = vec.as_mut_slice(); match vec { [_a, _b, _c] => {} //~ ERROR cannot move out diff --git a/src/test/compile-fail/borrowck-while-break.rs b/src/test/compile-fail/borrowck-while-break.rs index 4752120d691..8cdf1da5c93 100644 --- a/src/test/compile-fail/borrowck-while-break.rs +++ b/src/test/compile-fail/borrowck-while-break.rs @@ -11,7 +11,7 @@ fn test(cond: bool) { let v; while cond { - v = 3is; + v = 3; break; } println!("{}", v); //~ ERROR use of possibly uninitialized variable: `v` diff --git a/src/test/compile-fail/borrowck-while.rs b/src/test/compile-fail/borrowck-while.rs index f163cf602bf..e3566e9bb92 100644 --- a/src/test/compile-fail/borrowck-while.rs +++ b/src/test/compile-fail/borrowck-while.rs @@ -10,7 +10,7 @@ fn f() -> isize { let mut x: isize; - while 1is == 1 { x = 10; } + while 1 == 1 { x = 10; } return x; //~ ERROR use of possibly uninitialized variable: `x` } diff --git a/src/test/compile-fail/builtin-superkinds-self-type.rs b/src/test/compile-fail/builtin-superkinds-self-type.rs index 0ec4f3dce11..a6d55ad3991 100644 --- a/src/test/compile-fail/builtin-superkinds-self-type.rs +++ b/src/test/compile-fail/builtin-superkinds-self-type.rs @@ -22,6 +22,6 @@ impl <T: Sync> Foo for T { } fn main() { let (tx, rx) = channel(); - 1193182is.foo(tx); - assert!(rx.recv() == 1193182is); + 1193182.foo(tx); + assert!(rx.recv() == 1193182); } diff --git a/src/test/compile-fail/cannot-mutate-captured-non-mut-var.rs b/src/test/compile-fail/cannot-mutate-captured-non-mut-var.rs index b106169c6fc..2951c63828d 100644 --- a/src/test/compile-fail/cannot-mutate-captured-non-mut-var.rs +++ b/src/test/compile-fail/cannot-mutate-captured-non-mut-var.rs @@ -9,7 +9,7 @@ // except according to those terms. fn main() { - let x = 1is; + let x = 1; move|:| { x = 2; }; //~^ ERROR: cannot assign to immutable captured outer variable diff --git a/src/test/compile-fail/coercion-slice.rs b/src/test/compile-fail/coercion-slice.rs index d7a37d26991..aac180f9ad7 100644 --- a/src/test/compile-fail/coercion-slice.rs +++ b/src/test/compile-fail/coercion-slice.rs @@ -11,10 +11,10 @@ // Tests that we forbid coercion from `[T; n]` to `&[T]` fn main() { - let _: &[isize] = [0is]; + let _: &[i32] = [0i32]; //~^ ERROR mismatched types - //~| expected `&[isize]` - //~| found `[isize; 1]` + //~| expected `&[i32]` + //~| found `[i32; 1]` //~| expected &-ptr //~| found array of 1 elements } diff --git a/src/test/compile-fail/destructure-trait-ref.rs b/src/test/compile-fail/destructure-trait-ref.rs index 5cc0d6a143a..21098f9283e 100644 --- a/src/test/compile-fail/destructure-trait-ref.rs +++ b/src/test/compile-fail/destructure-trait-ref.rs @@ -27,29 +27,29 @@ fn main() { // if n > m, it's a type mismatch error. // n < m - let &x = &(&1is as &T); - let &x = &&(&1is as &T); - let &&x = &&(&1is as &T); + let &x = &(&1 as &T); + let &x = &&(&1 as &T); + let &&x = &&(&1 as &T); // n == m - let &x = &1is as &T; //~ ERROR type `&T` cannot be dereferenced - let &&x = &(&1is as &T); //~ ERROR type `&T` cannot be dereferenced - let box x = box 1is as Box<T>; //~ ERROR type `Box<T>` cannot be dereferenced + let &x = &1 as &T; //~ ERROR type `&T` cannot be dereferenced + let &&x = &(&1 as &T); //~ ERROR type `&T` cannot be dereferenced + let box x = box 1 as Box<T>; //~ ERROR type `Box<T>` cannot be dereferenced // n > m - let &&x = &1is as &T; + let &&x = &1 as &T; //~^ ERROR mismatched types //~| expected `T` //~| found `&_` //~| expected trait T //~| found &-ptr - let &&&x = &(&1is as &T); + let &&&x = &(&1 as &T); //~^ ERROR mismatched types //~| expected `T` //~| found `&_` //~| expected trait T //~| found &-ptr - let box box x = box 1is as Box<T>; + let box box x = box 1 as Box<T>; //~^ ERROR mismatched types //~| expected `T` //~| found `Box<_>` diff --git a/src/test/compile-fail/dst-bad-deep.rs b/src/test/compile-fail/dst-bad-deep.rs index 032835d9460..f90baafef3f 100644 --- a/src/test/compile-fail/dst-bad-deep.rs +++ b/src/test/compile-fail/dst-bad-deep.rs @@ -18,7 +18,7 @@ struct Fat<T: ?Sized> { } pub fn main() { - let f: Fat<[isize; 3]> = Fat { ptr: [5is, 6, 7] }; + let f: Fat<[isize; 3]> = Fat { ptr: [5, 6, 7] }; let g: &Fat<[isize]> = &f; let h: &Fat<Fat<[isize]>> = &Fat { ptr: *g }; //~^ ERROR the trait `core::marker::Sized` is not implemented diff --git a/src/test/compile-fail/feature-gate-advanced-slice-features.rs b/src/test/compile-fail/feature-gate-advanced-slice-features.rs index a37a8a326a6..d5841e1e77e 100644 --- a/src/test/compile-fail/feature-gate-advanced-slice-features.rs +++ b/src/test/compile-fail/feature-gate-advanced-slice-features.rs @@ -9,7 +9,7 @@ // except according to those terms. fn main() { - let x = [ 1is, 2, 3, 4, 5 ]; + let x = [ 1, 2, 3, 4, 5 ]; match x { [ xs.., 4, 5 ] => {} //~ ERROR multiple-element slice matches [ 1, xs.., 5 ] => {} //~ ERROR multiple-element slice matches diff --git a/src/test/compile-fail/fn-trait-formatting.rs b/src/test/compile-fail/fn-trait-formatting.rs index 460e05c8438..f8e7dc11828 100644 --- a/src/test/compile-fail/fn-trait-formatting.rs +++ b/src/test/compile-fail/fn-trait-formatting.rs @@ -34,7 +34,7 @@ fn main() { //~| expected () //~| found box - needs_fn(1is); + needs_fn(1); //~^ ERROR `core::ops::Fn<(isize,)>` //~| ERROR `core::ops::Fn<(isize,)>` } diff --git a/src/test/compile-fail/for-loop-refutable-pattern-error-message.rs b/src/test/compile-fail/for-loop-refutable-pattern-error-message.rs index fa55e7215c0..ab6dc2bab3e 100644 --- a/src/test/compile-fail/for-loop-refutable-pattern-error-message.rs +++ b/src/test/compile-fail/for-loop-refutable-pattern-error-message.rs @@ -10,6 +10,6 @@ fn main() { for - &1is //~ ERROR refutable pattern in `for` loop binding - in [1is].iter() {} + &1 //~ ERROR refutable pattern in `for` loop binding + in [1].iter() {} } diff --git a/src/test/compile-fail/hashmap-iter-value-lifetime.rs b/src/test/compile-fail/hashmap-iter-value-lifetime.rs index db1e1e8efe4..9cf145a1ff3 100644 --- a/src/test/compile-fail/hashmap-iter-value-lifetime.rs +++ b/src/test/compile-fail/hashmap-iter-value-lifetime.rs @@ -10,7 +10,7 @@ fn main() { let mut my_stuff = std::collections::HashMap::new(); - my_stuff.insert(0is, 42is); + my_stuff.insert(0, 42); let (_, thing) = my_stuff.iter().next().unwrap(); diff --git a/src/test/compile-fail/hashmap-lifetimes.rs b/src/test/compile-fail/hashmap-lifetimes.rs index 40673dd92b8..6858599f63a 100644 --- a/src/test/compile-fail/hashmap-lifetimes.rs +++ b/src/test/compile-fail/hashmap-lifetimes.rs @@ -10,7 +10,7 @@ fn main() { let mut my_stuff = std::collections::HashMap::new(); - my_stuff.insert(0is, 42is); + my_stuff.insert(0, 42); let mut it = my_stuff.iter(); my_stuff.insert(1, 43); //~ ERROR cannot borrow diff --git a/src/test/compile-fail/if-branch-types.rs b/src/test/compile-fail/if-branch-types.rs index 2209a02c639..b7a5b991c6d 100644 --- a/src/test/compile-fail/if-branch-types.rs +++ b/src/test/compile-fail/if-branch-types.rs @@ -9,10 +9,10 @@ // except according to those terms. fn main() { - let x = if true { 10is } else { 10us }; + let x = if true { 10i32 } else { 10u32 }; //~^ ERROR if and else have incompatible types - //~| expected `isize` - //~| found `usize` - //~| expected isize - //~| found usize + //~| expected `i32` + //~| found `u32` + //~| expected i32 + //~| found u32 } diff --git a/src/test/compile-fail/if-let.rs b/src/test/compile-fail/if-let.rs index d83779c4f0f..1e9144910b0 100644 --- a/src/test/compile-fail/if-let.rs +++ b/src/test/compile-fail/if-let.rs @@ -20,20 +20,20 @@ fn macros() { }} } - foo!(a, 1is, { //~ ERROR irrefutable if-let + foo!(a, 1, { //~ ERROR irrefutable if-let println!("irrefutable pattern"); }); - bar!(a, 1is, { //~ ERROR irrefutable if-let + bar!(a, 1, { //~ ERROR irrefutable if-let println!("irrefutable pattern"); }); } pub fn main() { - if let a = 1is { //~ ERROR irrefutable if-let + if let a = 1 { //~ ERROR irrefutable if-let println!("irrefutable pattern"); } - if let a = 1is { //~ ERROR irrefutable if-let + if let a = 1 { //~ ERROR irrefutable if-let println!("irrefutable pattern"); } else if true { println!("else-if in irrefutable if-let"); @@ -41,15 +41,15 @@ pub fn main() { println!("else in irrefutable if-let"); } - if let 1is = 2is { + if let 1 = 2 { println!("refutable pattern"); - } else if let a = 1is { //~ ERROR irrefutable if-let + } else if let a = 1 { //~ ERROR irrefutable if-let println!("irrefutable pattern"); } if true { println!("if"); - } else if let a = 1is { //~ ERROR irrefutable if-let + } else if let a = 1 { //~ ERROR irrefutable if-let println!("irrefutable pattern"); } } diff --git a/src/test/compile-fail/implicit-method-bind.rs b/src/test/compile-fail/implicit-method-bind.rs index d329f72f788..6a9c3048052 100644 --- a/src/test/compile-fail/implicit-method-bind.rs +++ b/src/test/compile-fail/implicit-method-bind.rs @@ -11,5 +11,5 @@ use std::num::SignedInt; fn main() { - let _f = 10is.abs; //~ ERROR attempted to take value of method + let _f = 10.abs; //~ ERROR attempted to take value of method } diff --git a/src/test/compile-fail/int-literal-too-large-span.rs b/src/test/compile-fail/int-literal-too-large-span.rs index 2aeaf6efaa4..8a496c934b9 100644 --- a/src/test/compile-fail/int-literal-too-large-span.rs +++ b/src/test/compile-fail/int-literal-too-large-span.rs @@ -11,7 +11,7 @@ // issue #17123 fn main() { - 100000000000000000000000000000000is //~ ERROR int literal is too large + 100000000000000000000000000000000 //~ ERROR int literal is too large ; // the span shouldn't point to this. } diff --git a/src/test/compile-fail/issue-10398.rs b/src/test/compile-fail/issue-10398.rs index c1102bc84ab..5ee693d97a8 100644 --- a/src/test/compile-fail/issue-10398.rs +++ b/src/test/compile-fail/issue-10398.rs @@ -11,7 +11,7 @@ #![feature(box_syntax)] fn main() { - let x = box 1is; + let x = box 1; let f = move|:| { let _a = x; drop(x); diff --git a/src/test/compile-fail/issue-11493.rs b/src/test/compile-fail/issue-11493.rs index 895eb4cf96f..333ff7118d4 100644 --- a/src/test/compile-fail/issue-11493.rs +++ b/src/test/compile-fail/issue-11493.rs @@ -11,6 +11,6 @@ // This file must never have a trailing newline fn main() { - let x = Some(3is); - let y = x.as_ref().unwrap_or(&5is); //~ ERROR: borrowed value does not live long enough + let x = Some(3); + let y = x.as_ref().unwrap_or(&5); //~ ERROR: borrowed value does not live long enough } diff --git a/src/test/compile-fail/issue-11714.rs b/src/test/compile-fail/issue-11714.rs index eef035d3d94..d307352517f 100644 --- a/src/test/compile-fail/issue-11714.rs +++ b/src/test/compile-fail/issue-11714.rs @@ -8,8 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -fn blah() -> isize { //~ ERROR not all control paths return a value - 1is +fn blah() -> i32 { //~ ERROR not all control paths return a value + 1i32 ; //~ HELP consider removing this semicolon: } diff --git a/src/test/compile-fail/issue-11873.rs b/src/test/compile-fail/issue-11873.rs index 67578de8922..f9a523641e4 100644 --- a/src/test/compile-fail/issue-11873.rs +++ b/src/test/compile-fail/issue-11873.rs @@ -9,8 +9,8 @@ // except according to those terms. fn main() { - let mut v = vec!(1is); - let mut f = |&mut:| v.push(2is); + let mut v = vec!(1); + let mut f = |&mut:| v.push(2); let _w = v; //~ ERROR: cannot move out of `v` f(); diff --git a/src/test/compile-fail/issue-11925.rs b/src/test/compile-fail/issue-11925.rs index e5f3b7d62d3..69f7b46009c 100644 --- a/src/test/compile-fail/issue-11925.rs +++ b/src/test/compile-fail/issue-11925.rs @@ -12,7 +12,7 @@ fn main() { let r = { - let x = box 42is; + let x = box 42; let f = move|:| &x; //~ ERROR: `x` does not live long enough f() }; diff --git a/src/test/compile-fail/issue-12041.rs b/src/test/compile-fail/issue-12041.rs index 02c19204f79..236142a6919 100644 --- a/src/test/compile-fail/issue-12041.rs +++ b/src/test/compile-fail/issue-12041.rs @@ -17,7 +17,7 @@ fn main() { loop { let tx = tx; //~^ ERROR: use of moved value: `tx` - tx.send(1is); + tx.send(1); } }); } diff --git a/src/test/compile-fail/issue-1362.rs b/src/test/compile-fail/issue-1362.rs index 28d16f9c0b7..d51db479599 100644 --- a/src/test/compile-fail/issue-1362.rs +++ b/src/test/compile-fail/issue-1362.rs @@ -11,7 +11,7 @@ // Regression test for issue #1362 - without that fix the span will be bogus // no-reformat fn main() { - let x: usize = 20is; //~ ERROR mismatched types + let x: u32 = 20i32; //~ ERROR mismatched types } // NOTE: Do not add any extra lines as the line number the error is // on is significant; an error later in the source file might not diff --git a/src/test/compile-fail/issue-1448-2.rs b/src/test/compile-fail/issue-1448-2.rs index 371adf931b0..ddfed3647c2 100644 --- a/src/test/compile-fail/issue-1448-2.rs +++ b/src/test/compile-fail/issue-1448-2.rs @@ -10,8 +10,8 @@ // Regression test for issue #1448 and #1386 -fn foo(a: usize) -> usize { a } +fn foo(a: u32) -> u32 { a } fn main() { - println!("{}", foo(10is)); //~ ERROR mismatched types + println!("{}", foo(10i32)); //~ ERROR mismatched types } diff --git a/src/test/compile-fail/issue-15094.rs b/src/test/compile-fail/issue-15094.rs index 977586483b0..8f79022405e 100644 --- a/src/test/compile-fail/issue-15094.rs +++ b/src/test/compile-fail/issue-15094.rs @@ -30,6 +30,6 @@ fn make_shower<T>(x: T) -> Debuger<T> { } pub fn main() { - let show3 = make_shower(3is); + let show3 = make_shower(3); show3(); } diff --git a/src/test/compile-fail/issue-15167.rs b/src/test/compile-fail/issue-15167.rs index c98c543462e..7da1b9efd39 100644 --- a/src/test/compile-fail/issue-15167.rs +++ b/src/test/compile-fail/issue-15167.rs @@ -18,7 +18,7 @@ macro_rules! f { () => (n) } fn main() -> (){ - for n in 0is..1 { + for n in 0..1 { println!("{}", f!()); //~ ERROR unresolved name `n` } } diff --git a/src/test/compile-fail/issue-15480.rs b/src/test/compile-fail/issue-15480.rs index 59d87b5277a..1e4476e563b 100644 --- a/src/test/compile-fail/issue-15480.rs +++ b/src/test/compile-fail/issue-15480.rs @@ -10,7 +10,7 @@ fn main() { let v = vec![ - &3is + &3 //~^ ERROR borrowed value does not live long enough ]; diff --git a/src/test/compile-fail/issue-17385.rs b/src/test/compile-fail/issue-17385.rs index 38278c524c8..eb293c79247 100644 --- a/src/test/compile-fail/issue-17385.rs +++ b/src/test/compile-fail/issue-17385.rs @@ -23,10 +23,10 @@ impl Drop for Enum { } fn main() { - let foo = X(1is); + let foo = X(1); drop(foo); match foo { //~ ERROR use of moved value - X(1is) => (), + X(1) => (), _ => unreachable!() } diff --git a/src/test/compile-fail/issue-17405.rs b/src/test/compile-fail/issue-17405.rs index 63120e85b09..de8a4f63476 100644 --- a/src/test/compile-fail/issue-17405.rs +++ b/src/test/compile-fail/issue-17405.rs @@ -13,7 +13,7 @@ enum Foo { } fn main() { - match Foo::Bar(1is) { + match Foo::Bar(1) { Foo { i } => () //~ ERROR `Foo` does not name a struct or a struct variant } } diff --git a/src/test/compile-fail/issue-17800.rs b/src/test/compile-fail/issue-17800.rs index 89611e4f3fe..5196b6ea877 100644 --- a/src/test/compile-fail/issue-17800.rs +++ b/src/test/compile-fail/issue-17800.rs @@ -14,8 +14,8 @@ enum MyOption<T> { } fn main() { - match MyOption::MySome(42is) { - MyOption::MySome { x: 42is } => (), + match MyOption::MySome(42) { + MyOption::MySome { x: 42 } => (), //~^ ERROR `MyOption::MySome` does not name a struct or a struct variant _ => (), } diff --git a/src/test/compile-fail/issue-17905.rs b/src/test/compile-fail/issue-17905.rs index d5973abc462..eabdb36a7ef 100644 --- a/src/test/compile-fail/issue-17905.rs +++ b/src/test/compile-fail/issue-17905.rs @@ -25,6 +25,6 @@ impl Pair< } fn main() { - let result = &Pair("shane", 1is); + let result = &Pair("shane", 1); result.say(); } diff --git a/src/test/compile-fail/issue-17999.rs b/src/test/compile-fail/issue-17999.rs index f336fdbfbed..f4c0a9c38c3 100644 --- a/src/test/compile-fail/issue-17999.rs +++ b/src/test/compile-fail/issue-17999.rs @@ -12,7 +12,7 @@ #![feature(core)] fn main() { - for _ in 1is..101 { + for _ in 1..101 { let x = (); //~ ERROR: unused variable: `x` match () { a => {} //~ ERROR: unused variable: `a` diff --git a/src/test/compile-fail/issue-19096.rs b/src/test/compile-fail/issue-19096.rs index 7bc79463d3a..90d2acbe581 100644 --- a/src/test/compile-fail/issue-19096.rs +++ b/src/test/compile-fail/issue-19096.rs @@ -9,6 +9,6 @@ // except according to those terms. fn main() { - let t = (42is, 42is); + let t = (42, 42); t.0::<isize>; //~ ERROR expected one of `.`, `;`, `}`, or an operator, found `::` } diff --git a/src/test/compile-fail/issue-1962.rs b/src/test/compile-fail/issue-1962.rs index 44abfca1653..db3e9c23b76 100644 --- a/src/test/compile-fail/issue-1962.rs +++ b/src/test/compile-fail/issue-1962.rs @@ -10,9 +10,9 @@ // compile-flags: -D while-true fn main() { - let mut i = 0is; + let mut i = 0; while true { //~ ERROR denote infinite loops with loop - i += 1is; - if i == 5is { break; } + i += 1; + if i == 5 { break; } } } diff --git a/src/test/compile-fail/issue-3707.rs b/src/test/compile-fail/issue-3707.rs index 0aa357f2398..0d57a8a50cc 100644 --- a/src/test/compile-fail/issue-3707.rs +++ b/src/test/compile-fail/issue-3707.rs @@ -14,7 +14,7 @@ struct Obj { impl Obj { pub fn boom() -> bool { - return 1is+1 == 2 + return 1+1 == 2 } pub fn chirp(&self) { self.boom(); //~ ERROR `&Obj` does not implement any method in scope named `boom` @@ -24,5 +24,5 @@ impl Obj { fn main() { let o = Obj { member: 0 }; o.chirp(); - 1is + 1; + 1 + 1; } diff --git a/src/test/compile-fail/issue-4335.rs b/src/test/compile-fail/issue-4335.rs index 292d1d9616a..3d44c1a52d4 100644 --- a/src/test/compile-fail/issue-4335.rs +++ b/src/test/compile-fail/issue-4335.rs @@ -18,6 +18,6 @@ fn f<'r, T>(v: &'r T) -> Box<FnMut() -> T + 'r> { } fn main() { - let v = &5is; + let v = &5; println!("{}", f(v).call_mut(())); } diff --git a/src/test/compile-fail/issue-7867.rs b/src/test/compile-fail/issue-7867.rs index 0e81ec19c81..7bb4aac23d6 100644 --- a/src/test/compile-fail/issue-7867.rs +++ b/src/test/compile-fail/issue-7867.rs @@ -23,16 +23,16 @@ fn main() { _ => () } - match &Some(42is) { + match &Some(42i32) { Some(x) => (), //~^ ERROR mismatched types - //~| expected `&core::option::Option<isize>` + //~| expected `&core::option::Option<i32>` //~| found `core::option::Option<_>` //~| expected &-ptr //~| found enum `core::option::Option` None => () //~^ ERROR mismatched types - //~| expected `&core::option::Option<isize>` + //~| expected `&core::option::Option<i32>` //~| found `core::option::Option<_>` //~| expected &-ptr //~| found enum `core::option::Option` diff --git a/src/test/compile-fail/kindck-impl-type-params-2.rs b/src/test/compile-fail/kindck-impl-type-params-2.rs index cd47bd721fc..2731be7308a 100644 --- a/src/test/compile-fail/kindck-impl-type-params-2.rs +++ b/src/test/compile-fail/kindck-impl-type-params-2.rs @@ -19,7 +19,7 @@ impl<T:Copy> Foo for T { fn take_param<T:Foo>(foo: &T) { } fn main() { - let x = box 3is; + let x = box 3; take_param(&x); //~^ ERROR the trait `core::marker::Copy` is not implemented } diff --git a/src/test/compile-fail/kindck-inherited-copy-bound.rs b/src/test/compile-fail/kindck-inherited-copy-bound.rs index 4ccb240071d..e146cac21a3 100644 --- a/src/test/compile-fail/kindck-inherited-copy-bound.rs +++ b/src/test/compile-fail/kindck-inherited-copy-bound.rs @@ -23,12 +23,12 @@ impl<T:Copy> Foo for T { fn take_param<T:Foo>(foo: &T) { } fn a() { - let x = box 3is; + let x = box 3; take_param(&x); //~ ERROR `core::marker::Copy` is not implemented } fn b() { - let x = box 3is; + let x = box 3; let y = &x; let z = &x as &Foo; //~ ERROR `core::marker::Copy` is not implemented } diff --git a/src/test/compile-fail/lint-dead-code-1.rs b/src/test/compile-fail/lint-dead-code-1.rs index dc591943731..519839ae2f4 100644 --- a/src/test/compile-fail/lint-dead-code-1.rs +++ b/src/test/compile-fail/lint-dead-code-1.rs @@ -91,7 +91,7 @@ pub fn pub_fn() { let e = used_enum::foo3; SemiUsedStruct::la_la_la(); - let i = 1is; + let i = 1; match i { USED_STATIC => (), USED_CONST => (), diff --git a/src/test/compile-fail/lint-dead-code-3.rs b/src/test/compile-fail/lint-dead-code-3.rs index be135978d2d..f60c39ba020 100644 --- a/src/test/compile-fail/lint-dead-code-3.rs +++ b/src/test/compile-fail/lint-dead-code-3.rs @@ -86,6 +86,6 @@ mod inner { } pub fn foo() { - let a = &1is as &inner::Trait; + let a = &1 as &inner::Trait; a.f(); } diff --git a/src/test/compile-fail/lint-unnecessary-parens.rs b/src/test/compile-fail/lint-unnecessary-parens.rs index 4ccc3d8b641..b5eac73a55d 100644 --- a/src/test/compile-fail/lint-unnecessary-parens.rs +++ b/src/test/compile-fail/lint-unnecessary-parens.rs @@ -17,7 +17,7 @@ impl X { } fn foo() -> isize { - return (1is); //~ ERROR unnecessary parentheses around `return` value + return (1); //~ ERROR unnecessary parentheses around `return` value } fn bar() -> X { return (X { y: true }); //~ ERROR unnecessary parentheses around `return` value @@ -32,8 +32,8 @@ fn main() { match (true) { //~ ERROR unnecessary parentheses around `match` head expression _ => {} } - if let 1is = (1is) {} //~ ERROR unnecessary parentheses around `if let` head expression - while let 1is = (2is) {} //~ ERROR unnecessary parentheses around `while let` head expression + if let 1 = (1) {} //~ ERROR unnecessary parentheses around `if let` head expression + while let 1 = (2) {} //~ ERROR unnecessary parentheses around `while let` head expression let v = X { y: false }; // struct lits needs parens, so these shouldn't warn. if (v == X { y: true }) {} @@ -47,7 +47,7 @@ fn main() { _ => {} } - let mut _a = (0is); //~ ERROR unnecessary parentheses around assigned value - _a = (0is); //~ ERROR unnecessary parentheses around assigned value - _a += (1is); //~ ERROR unnecessary parentheses around assigned value + let mut _a = (0); //~ ERROR unnecessary parentheses around assigned value + _a = (0); //~ ERROR unnecessary parentheses around assigned value + _a += (1); //~ ERROR unnecessary parentheses around assigned value } diff --git a/src/test/compile-fail/lint-unused-imports.rs b/src/test/compile-fail/lint-unused-imports.rs index 84d7200314f..1468ae64d94 100644 --- a/src/test/compile-fail/lint-unused-imports.rs +++ b/src/test/compile-fail/lint-unused-imports.rs @@ -54,7 +54,7 @@ mod bar { pub mod c { use foo::Point; use foo::Square; //~ ERROR unused import - pub fn cc(p: Point) -> isize { return 2is * (p.x + p.y); } + pub fn cc(p: Point) -> isize { return 2 * (p.x + p.y); } } #[allow(unused_imports)] @@ -65,8 +65,8 @@ mod bar { fn main() { cal(foo::Point{x:3, y:9}); - let mut a = 3is; - let mut b = 4is; + let mut a = 3; + let mut b = 4; swap(&mut a, &mut b); test::C.b(); let _a = foo(); diff --git a/src/test/compile-fail/lint-unused-mut-variables.rs b/src/test/compile-fail/lint-unused-mut-variables.rs index 501eea770d8..ddba7b58afa 100644 --- a/src/test/compile-fail/lint-unused-mut-variables.rs +++ b/src/test/compile-fail/lint-unused-mut-variables.rs @@ -18,16 +18,16 @@ fn main() { // negative cases - let mut a = 3is; //~ ERROR: variable does not need to be mutable - let mut a = 2is; //~ ERROR: variable does not need to be mutable - let mut b = 3is; //~ ERROR: variable does not need to be mutable - let mut a = vec!(3is); //~ ERROR: variable does not need to be mutable - let (mut a, b) = (1is, 2is); //~ ERROR: variable does not need to be mutable + let mut a = 3; //~ ERROR: variable does not need to be mutable + let mut a = 2; //~ ERROR: variable does not need to be mutable + let mut b = 3; //~ ERROR: variable does not need to be mutable + let mut a = vec!(3); //~ ERROR: variable does not need to be mutable + let (mut a, b) = (1, 2); //~ ERROR: variable does not need to be mutable - match 30is { + match 30 { mut x => {} //~ ERROR: variable does not need to be mutable } - match (30is, 2is) { + match (30, 2) { (mut x, 1) | //~ ERROR: variable does not need to be mutable (mut x, 2) | (mut x, 3) => { @@ -35,28 +35,28 @@ fn main() { _ => {} } - let x = |&: mut y: isize| 10is; //~ ERROR: variable does not need to be mutable + let x = |&: mut y: isize| 10; //~ ERROR: variable does not need to be mutable fn what(mut foo: isize) {} //~ ERROR: variable does not need to be mutable // positive cases - let mut a = 2is; - a = 3is; + let mut a = 2; + a = 3; let mut a = Vec::new(); - a.push(3is); + a.push(3); let mut a = Vec::new(); callback(|| { - a.push(3is); + a.push(3); }); - let (mut a, b) = (1is, 2is); + let (mut a, b) = (1, 2); a = 34; - match 30is { + match 30 { mut x => { - x = 21is; + x = 21; } } - match (30is, 2is) { + match (30, 2) { (mut x, 1) | (mut x, 2) | (mut x, 3) => { @@ -65,12 +65,12 @@ fn main() { _ => {} } - let x = |&mut: mut y: isize| y = 32is; - fn nothing(mut foo: isize) { foo = 37is; } + let x = |&mut: mut y: isize| y = 32; + fn nothing(mut foo: isize) { foo = 37; } // leading underscore should avoid the warning, just like the // unused variable lint. - let mut _allowed = 1is; + let mut _allowed = 1; } fn callback<F>(f: F) where F: FnOnce() {} @@ -78,6 +78,6 @@ fn callback<F>(f: F) where F: FnOnce() {} // make sure the lint attribute can be turned off #[allow(unused_mut)] fn foo(mut a: isize) { - let mut a = 3is; - let mut b = vec!(2is); + let mut a = 3; + let mut b = vec!(2); } diff --git a/src/test/compile-fail/liveness-bad-bang-2.rs b/src/test/compile-fail/liveness-bad-bang-2.rs index bb049175594..181ba124fdd 100644 --- a/src/test/compile-fail/liveness-bad-bang-2.rs +++ b/src/test/compile-fail/liveness-bad-bang-2.rs @@ -11,7 +11,7 @@ // Tests that a function with a ! annotation always actually fails fn bad_bang(i: usize) -> ! { //~ ERROR computation may converge in a function marked as diverging - println!("{}", 3is); + println!("{}", 3); } fn main() { bad_bang(5us); } diff --git a/src/test/compile-fail/liveness-return-last-stmt-semi.rs b/src/test/compile-fail/liveness-return-last-stmt-semi.rs index 4b8f84ae704..57252dd58d7 100644 --- a/src/test/compile-fail/liveness-return-last-stmt-semi.rs +++ b/src/test/compile-fail/liveness-return-last-stmt-semi.rs @@ -10,11 +10,11 @@ // // regression test for #8005 -macro_rules! test { () => { fn foo() -> isize { 1is; } } } - //~^ ERROR not all control paths return a value - //~^^ HELP consider removing this semicolon +macro_rules! test { () => { fn foo() -> i32 { 1i32; } } } + //~^ ERROR not all control paths return a value + //~^^ HELP consider removing this semicolon -fn no_return() -> isize {} //~ ERROR not all control paths return a value +fn no_return() -> i32 {} //~ ERROR not all control paths return a value fn bar(x: u32) -> u32 { //~ ERROR not all control paths return a value x * 2; //~ HELP consider removing this semicolon diff --git a/src/test/compile-fail/liveness-unused.rs b/src/test/compile-fail/liveness-unused.rs index ebcf46f7277..60c4c246552 100644 --- a/src/test/compile-fail/liveness-unused.rs +++ b/src/test/compile-fail/liveness-unused.rs @@ -31,40 +31,40 @@ fn f1d() { } fn f2() { - let x = 3is; + let x = 3; //~^ ERROR unused variable: `x` } fn f3() { - let mut x = 3is; + let mut x = 3; //~^ ERROR variable `x` is assigned to, but never used - x += 4is; + x += 4; //~^ ERROR value assigned to `x` is never read } fn f3b() { - let mut z = 3is; + let mut z = 3; //~^ ERROR variable `z` is assigned to, but never used loop { - z += 4is; + z += 4; } } #[allow(unused_variables)] fn f3c() { - let mut z = 3is; - loop { z += 4is; } + let mut z = 3; + loop { z += 4; } } #[allow(unused_variables)] #[allow(unused_assignments)] fn f3d() { - let mut x = 3is; - x += 4is; + let mut x = 3; + x += 4; } fn f4() { - match Some(3is) { + match Some(3) { Some(i) => { //~^ ERROR unused variable: `i` } @@ -77,7 +77,7 @@ enum tri { } fn f4b() -> isize { - match tri::a(3is) { + match tri::a(3) { tri::a(i) | tri::b(i) | tri::c(i) => { i } @@ -85,17 +85,17 @@ fn f4b() -> isize { } fn f5a() { - for x in 1is..10 { } + for x in 1..10 { } //~^ ERROR unused variable: `x` } fn f5b() { - for (x, _) in [1is, 2, 3].iter().enumerate() { } + for (x, _) in [1, 2, 3].iter().enumerate() { } //~^ ERROR unused variable: `x` } fn f5c() { - for (_, x) in [1is, 2, 3].iter().enumerate() { + for (_, x) in [1, 2, 3].iter().enumerate() { //~^ ERROR unused variable: `x` continue; std::os::set_exit_status(*x); //~ WARNING unreachable statement diff --git a/src/test/compile-fail/liveness-use-after-move.rs b/src/test/compile-fail/liveness-use-after-move.rs index 21e52f13060..985eb1cd7ba 100644 --- a/src/test/compile-fail/liveness-use-after-move.rs +++ b/src/test/compile-fail/liveness-use-after-move.rs @@ -11,7 +11,7 @@ #![feature(box_syntax)] fn main() { - let x = box 5is; + let x = box 5; let y = x; println!("{}", *x); //~ ERROR use of moved value: `*x` y.clone(); diff --git a/src/test/compile-fail/loop-does-not-diverge.rs b/src/test/compile-fail/loop-does-not-diverge.rs index e2d3d059ad8..12de4a714ef 100644 --- a/src/test/compile-fail/loop-does-not-diverge.rs +++ b/src/test/compile-fail/loop-does-not-diverge.rs @@ -14,7 +14,7 @@ fn forever() -> ! { loop { break; } - return 42is; //~ ERROR `return` in a function declared as diverging + return 42; //~ ERROR `return` in a function declared as diverging } fn main() { diff --git a/src/test/compile-fail/match-ill-type2.rs b/src/test/compile-fail/match-ill-type2.rs index 6b6954101b2..aa47ea670fd 100644 --- a/src/test/compile-fail/match-ill-type2.rs +++ b/src/test/compile-fail/match-ill-type2.rs @@ -9,9 +9,9 @@ // except according to those terms. fn main() { - match 1is { - 1is => 1is, - 2us => 1is, //~ ERROR mismatched types - _ => 2is, + match 1i32 { + 1i32 => 1, + 2u32 => 1, //~ ERROR mismatched types + _ => 2, }; } diff --git a/src/test/compile-fail/match-non-exhaustive.rs b/src/test/compile-fail/match-non-exhaustive.rs index 2aeccacb0f6..a24d2ed4b7f 100644 --- a/src/test/compile-fail/match-non-exhaustive.rs +++ b/src/test/compile-fail/match-non-exhaustive.rs @@ -9,6 +9,6 @@ // except according to those terms. fn main() { - match 0is { 1is => () } //~ ERROR non-exhaustive patterns - match 0is { 0is if false => () } //~ ERROR non-exhaustive patterns + match 0 { 1 => () } //~ ERROR non-exhaustive patterns + match 0 { 0 if false => () } //~ ERROR non-exhaustive patterns } diff --git a/src/test/compile-fail/match-vec-fixed.rs b/src/test/compile-fail/match-vec-fixed.rs index c35dc8d7c86..e778dd18e68 100644 --- a/src/test/compile-fail/match-vec-fixed.rs +++ b/src/test/compile-fail/match-vec-fixed.rs @@ -9,7 +9,7 @@ // except according to those terms. fn a() { - let v = [1is, 2, 3]; + let v = [1, 2, 3]; match v { [_, _, _] => {} [_, _, _] => {} //~ ERROR unreachable pattern diff --git a/src/test/compile-fail/method-missing-call.rs b/src/test/compile-fail/method-missing-call.rs index 899c1ef16a6..6616dcc8e1b 100644 --- a/src/test/compile-fail/method-missing-call.rs +++ b/src/test/compile-fail/method-missing-call.rs @@ -33,7 +33,7 @@ fn main() { //~^ HELP maybe a `()` to call it is missing // Ensure the span is useful - let ys = &[1is,2,3,4,5,6,7]; + let ys = &[1,2,3,4,5,6,7]; let a = ys.iter() .map(|x| x) .filter(|&&x| x == 1) diff --git a/src/test/compile-fail/method-self-arg-1.rs b/src/test/compile-fail/method-self-arg-1.rs index 98b9e453889..7b6868af805 100644 --- a/src/test/compile-fail/method-self-arg-1.rs +++ b/src/test/compile-fail/method-self-arg-1.rs @@ -23,9 +23,9 @@ fn main() { //~| found `Foo` //~| expected &-ptr //~| found struct `Foo` - Foo::bar(&42is); //~ ERROR mismatched types - //~| expected `&Foo` - //~| found `&isize` - //~| expected struct `Foo` - //~| found isize + Foo::bar(&42i32); //~ ERROR mismatched types + //~| expected `&Foo` + //~| found `&i32` + //~| expected struct `Foo` + //~| found i32 } diff --git a/src/test/compile-fail/move-out-of-tuple-field.rs b/src/test/compile-fail/move-out-of-tuple-field.rs index ace6c80e3e3..7e3a85569d4 100644 --- a/src/test/compile-fail/move-out-of-tuple-field.rs +++ b/src/test/compile-fail/move-out-of-tuple-field.rs @@ -13,11 +13,11 @@ struct Foo(Box<isize>); fn main() { - let x = (box 1is,); + let x = (box 1,); let y = x.0; let z = x.0; //~ ERROR use of moved value: `x.0` - let x = Foo(box 1is); + let x = Foo(box 1); let y = x.0; let z = x.0; //~ ERROR use of moved value: `x.0` } diff --git a/src/test/compile-fail/moves-based-on-type-exprs.rs b/src/test/compile-fail/moves-based-on-type-exprs.rs index 58f1f78fa5d..c9f73e86a2c 100644 --- a/src/test/compile-fail/moves-based-on-type-exprs.rs +++ b/src/test/compile-fail/moves-based-on-type-exprs.rs @@ -24,13 +24,13 @@ fn f10() { fn f20() { let x = "hi".to_string(); - let _y = (x, 3is); + let _y = (x, 3); touch(&x); //~ ERROR use of moved value: `x` } fn f21() { - let x = vec!(1is, 2, 3); - let _y = (x[0], 3is); + let x = vec!(1, 2, 3); + let _y = (x[0], 3); touch(&x); } @@ -61,9 +61,9 @@ fn f50(cond: bool) { let x = "hi".to_string(); let y = "ho".to_string(); let _y = match cond { - _ if guard(x) => 10is, - true => 10is, - false => 20is, + _ if guard(x) => 10, + true => 10, + false => 20, }; touch(&x); //~ ERROR use of moved value: `x` touch(&y); diff --git a/src/test/compile-fail/mut-cant-alias.rs b/src/test/compile-fail/mut-cant-alias.rs index 847a3eaf8a1..99d7258477a 100644 --- a/src/test/compile-fail/mut-cant-alias.rs +++ b/src/test/compile-fail/mut-cant-alias.rs @@ -11,7 +11,7 @@ use std::cell::RefCell; fn main() { - let m = RefCell::new(0is); + let m = RefCell::new(0); let mut b = m.borrow_mut(); let b1 = &mut *b; let b2 = &mut *b; //~ ERROR cannot borrow diff --git a/src/test/compile-fail/mut-cross-borrowing.rs b/src/test/compile-fail/mut-cross-borrowing.rs index 7fb5c2ac4a4..2cf6e67a909 100644 --- a/src/test/compile-fail/mut-cross-borrowing.rs +++ b/src/test/compile-fail/mut-cross-borrowing.rs @@ -13,7 +13,7 @@ fn f(_: &mut isize) {} fn main() { - let mut x = box 3is; + let mut x = box 3; f(x) //~ ERROR mismatched types } diff --git a/src/test/compile-fail/mut-not-freeze.rs b/src/test/compile-fail/mut-not-freeze.rs index 8c39320276a..2269c58c97d 100644 --- a/src/test/compile-fail/mut-not-freeze.rs +++ b/src/test/compile-fail/mut-not-freeze.rs @@ -13,7 +13,7 @@ use std::cell::RefCell; fn f<T: Sync>(_: T) {} fn main() { - let x = RefCell::new(0is); + let x = RefCell::new(0); f(x); //~^ ERROR `core::marker::Sync` is not implemented //~^^ ERROR `core::marker::Sync` is not implemented diff --git a/src/test/compile-fail/mut-pattern-internal-mutability.rs b/src/test/compile-fail/mut-pattern-internal-mutability.rs index 92f02114a13..b0d618328dc 100644 --- a/src/test/compile-fail/mut-pattern-internal-mutability.rs +++ b/src/test/compile-fail/mut-pattern-internal-mutability.rs @@ -9,7 +9,7 @@ // except according to those terms. fn main() { - let foo = &mut 1is; + let foo = &mut 1; let &mut x = foo; x += 1; //~ ERROR re-assignment of immutable variable diff --git a/src/test/compile-fail/mut-pattern-mismatched.rs b/src/test/compile-fail/mut-pattern-mismatched.rs index a3d016d756f..6de69a9adb0 100644 --- a/src/test/compile-fail/mut-pattern-mismatched.rs +++ b/src/test/compile-fail/mut-pattern-mismatched.rs @@ -9,21 +9,21 @@ // except according to those terms. fn main() { - let foo = &mut 1is; + let foo = &mut 1i32; // (separate lines to ensure the spans are accurate) let &_ //~ ERROR mismatched types - //~| expected `&mut isize` + //~| expected `&mut i32` //~| found `&_` //~| values differ in mutability = foo; let &mut _ = foo; - let bar = &1is; + let bar = &1i32; let &_ = bar; let &mut _ //~ ERROR mismatched types - //~| expected `&isize` + //~| expected `&i32` //~| found `&mut _` //~| values differ in mutability = bar; diff --git a/src/test/compile-fail/mut-ptr-cant-outlive-ref.rs b/src/test/compile-fail/mut-ptr-cant-outlive-ref.rs index 74b561c37aa..8e968d90a2f 100644 --- a/src/test/compile-fail/mut-ptr-cant-outlive-ref.rs +++ b/src/test/compile-fail/mut-ptr-cant-outlive-ref.rs @@ -11,7 +11,7 @@ use std::cell::RefCell; fn main() { - let m = RefCell::new(0is); + let m = RefCell::new(0); let p; { let b = m.borrow(); diff --git a/src/test/compile-fail/no-capture-arc.rs b/src/test/compile-fail/no-capture-arc.rs index beb0d0ee47e..939d7c7a534 100644 --- a/src/test/compile-fail/no-capture-arc.rs +++ b/src/test/compile-fail/no-capture-arc.rs @@ -14,7 +14,7 @@ use std::sync::Arc; use std::thread::Thread; fn main() { - let v = vec!(1is, 2, 3, 4, 5, 6, 7, 8, 9, 10); + let v = vec!(1, 2, 3, 4, 5, 6, 7, 8, 9, 10); let arc_v = Arc::new(v); Thread::spawn(move|| { diff --git a/src/test/compile-fail/no-reuse-move-arc.rs b/src/test/compile-fail/no-reuse-move-arc.rs index d8f0fa497a4..730ba9ab9ea 100644 --- a/src/test/compile-fail/no-reuse-move-arc.rs +++ b/src/test/compile-fail/no-reuse-move-arc.rs @@ -12,7 +12,7 @@ use std::sync::Arc; use std::thread::Thread; fn main() { - let v = vec!(1is, 2, 3, 4, 5, 6, 7, 8, 9, 10); + let v = vec!(1, 2, 3, 4, 5, 6, 7, 8, 9, 10); let arc_v = Arc::new(v); Thread::spawn(move|| { diff --git a/src/test/compile-fail/no_send-rc.rs b/src/test/compile-fail/no_send-rc.rs index d404988bd98..b5c572b17dd 100644 --- a/src/test/compile-fail/no_send-rc.rs +++ b/src/test/compile-fail/no_send-rc.rs @@ -13,7 +13,7 @@ use std::rc::Rc; fn bar<T: Send>(_: T) {} fn main() { - let x = Rc::new(5is); + let x = Rc::new(5); bar(x); //~^ ERROR `core::marker::Send` is not implemented } diff --git a/src/test/compile-fail/no_share-rc.rs b/src/test/compile-fail/no_share-rc.rs index 4917db602e1..4bc3442871f 100644 --- a/src/test/compile-fail/no_share-rc.rs +++ b/src/test/compile-fail/no_share-rc.rs @@ -14,7 +14,7 @@ use std::cell::RefCell; fn bar<T: Sync>(_: T) {} fn main() { - let x = Rc::new(RefCell::new(5is)); + let x = Rc::new(RefCell::new(5)); bar(x); //~^ ERROR the trait `core::marker::Sync` is not implemented } diff --git a/src/test/compile-fail/non-exhaustive-match.rs b/src/test/compile-fail/non-exhaustive-match.rs index ccf69a4d2c8..fce72f507b6 100644 --- a/src/test/compile-fail/non-exhaustive-match.rs +++ b/src/test/compile-fail/non-exhaustive-match.rs @@ -16,10 +16,10 @@ fn main() { match true { //~ ERROR non-exhaustive patterns: `false` not covered true => {} } - match Some(10is) { //~ ERROR non-exhaustive patterns: `Some(_)` not covered + match Some(10) { //~ ERROR non-exhaustive patterns: `Some(_)` not covered None => {} } - match (2is, 3is, 4is) { //~ ERROR non-exhaustive patterns: `(_, _, _)` not covered + match (2, 3, 4) { //~ ERROR non-exhaustive patterns: `(_, _, _)` not covered (_, _, 4) => {} } match (t::a, t::a) { //~ ERROR non-exhaustive patterns: `(a, a)` not covered @@ -35,14 +35,14 @@ fn main() { (_, t::a) => {} (t::b, t::b) => {} } - let vec = vec!(Some(42is), None, Some(21is)); + let vec = vec!(Some(42), None, Some(21)); let vec: &[Option<isize>] = vec.as_slice(); match vec { //~ ERROR non-exhaustive patterns: `[]` not covered [Some(..), None, tail..] => {} [Some(..), Some(..), tail..] => {} [None] => {} } - let vec = vec!(1is); + let vec = vec!(1); let vec: &[isize] = vec.as_slice(); match vec { [_, tail..] => (), @@ -56,7 +56,7 @@ fn main() { [0.1] => (), [] => () } - let vec = vec!(Some(42is), None, Some(21is)); + let vec = vec!(Some(42), None, Some(21)); let vec: &[Option<isize>] = vec.as_slice(); match vec { [Some(..), None, tail..] => {} diff --git a/src/test/compile-fail/pat-range-bad-dots.rs b/src/test/compile-fail/pat-range-bad-dots.rs index 7f67d7a5fb1..b48d3e8871b 100644 --- a/src/test/compile-fail/pat-range-bad-dots.rs +++ b/src/test/compile-fail/pat-range-bad-dots.rs @@ -9,7 +9,7 @@ // except according to those terms. pub fn main() { - match 22is { + match 22 { 0 .. 3 => {} //~ ERROR expected one of `...`, `=>`, or `|`, found `..` _ => {} } diff --git a/src/test/compile-fail/pattern-bindings-after-at.rs b/src/test/compile-fail/pattern-bindings-after-at.rs index 70840200aad..80544099329 100644 --- a/src/test/compile-fail/pattern-bindings-after-at.rs +++ b/src/test/compile-fail/pattern-bindings-after-at.rs @@ -14,7 +14,7 @@ enum Option<T> { } fn main() { - match &mut Some(1is) { + match &mut Some(1) { ref mut z @ &mut Some(ref a) => { //~^ ERROR pattern bindings are not allowed after an `@` **z = None; diff --git a/src/test/compile-fail/pptypedef.rs b/src/test/compile-fail/pptypedef.rs index 9e5081ed550..ccf82e90b7a 100644 --- a/src/test/compile-fail/pptypedef.rs +++ b/src/test/compile-fail/pptypedef.rs @@ -11,17 +11,17 @@ fn let_in<T, F>(x: T, f: F) where F: FnOnce(T) {} fn main() { - let_in(3us, |i| { assert!(i == 3is); }); + let_in(3u32, |i| { assert!(i == 3i32); }); //~^ ERROR mismatched types - //~| expected `usize` - //~| found `isize` - //~| expected usize - //~| found isize + //~| expected `u32` + //~| found `i32` + //~| expected u32 + //~| found i32 - let_in(3is, |i| { assert!(i == 3us); }); + let_in(3i32, |i| { assert!(i == 3u32); }); //~^ ERROR mismatched types - //~| expected `isize` - //~| found `usize` - //~| expected isize - //~| found usize + //~| expected `i32` + //~| found `u32` + //~| expected i32 + //~| found u32 } diff --git a/src/test/compile-fail/ptr-coercion.rs b/src/test/compile-fail/ptr-coercion.rs index 463754b29c7..18e210076cb 100644 --- a/src/test/compile-fail/ptr-coercion.rs +++ b/src/test/compile-fail/ptr-coercion.rs @@ -13,7 +13,7 @@ pub fn main() { // *const -> *mut - let x: *const isize = &42is; + let x: *const isize = &42; let x: *mut isize = x; //~ ERROR mismatched types //~| expected `*mut isize` //~| found `*const isize` diff --git a/src/test/compile-fail/range-1.rs b/src/test/compile-fail/range-1.rs index fbc9ad99b72..67b203bec19 100644 --- a/src/test/compile-fail/range-1.rs +++ b/src/test/compile-fail/range-1.rs @@ -12,7 +12,7 @@ pub fn main() { // Mixed types. - let _ = 0us..10is; + let _ = 0u32..10i32; //~^ ERROR start and end of range have incompatible types // Float => does not implement iterator. @@ -23,7 +23,7 @@ pub fn main() { // FIXME(#21528) not fulfilled obligation error should be reported once, not thrice // Unsized type. - let arr: &[_] = &[1us, 2, 3]; + let arr: &[_] = &[1u32, 2, 3]; let range = *arr..; //~^ ERROR the trait `core::marker::Sized` is not implemented } diff --git a/src/test/compile-fail/range-2.rs b/src/test/compile-fail/range-2.rs index 9d89f4b05c5..c9053328572 100644 --- a/src/test/compile-fail/range-2.rs +++ b/src/test/compile-fail/range-2.rs @@ -12,7 +12,7 @@ pub fn main() { let r = { - &42is..&42 + &42..&42 //~^ ERROR borrowed value does not live long enough //~^^ ERROR borrowed value does not live long enough }; diff --git a/src/test/compile-fail/refutable-pattern-errors.rs b/src/test/compile-fail/refutable-pattern-errors.rs index d06c73c4cc0..ce93e1875ae 100644 --- a/src/test/compile-fail/refutable-pattern-errors.rs +++ b/src/test/compile-fail/refutable-pattern-errors.rs @@ -13,6 +13,6 @@ fn func((1, (Some(1), 2...3)): (isize, (Option<isize>, isize))) { } //~^ ERROR refutable pattern in function argument: `(_, _)` not covered fn main() { - let (1is, (Some(1is), 2is...3is)) = (1is, (None, 2is)); + let (1, (Some(1), 2...3)) = (1, (None, 2)); //~^ ERROR refutable pattern in local binding: `(_, _)` not covered } diff --git a/src/test/compile-fail/regions-close-over-type-parameter-2.rs b/src/test/compile-fail/regions-close-over-type-parameter-2.rs index 543d4d1620b..053af49e068 100644 --- a/src/test/compile-fail/regions-close-over-type-parameter-2.rs +++ b/src/test/compile-fail/regions-close-over-type-parameter-2.rs @@ -29,7 +29,7 @@ fn main() { // ~Repeat<&'blk isize> where blk is the lifetime of the block below. let _ = { - let tmp0 = 3is; + let tmp0 = 3; let tmp1 = &tmp0; //~ ERROR `tmp0` does not live long enough repeater3(tmp1) }; diff --git a/src/test/compile-fail/regions-escape-loop-via-variable.rs b/src/test/compile-fail/regions-escape-loop-via-variable.rs index c300c86f70f..f588655d1af 100644 --- a/src/test/compile-fail/regions-escape-loop-via-variable.rs +++ b/src/test/compile-fail/regions-escape-loop-via-variable.rs @@ -9,7 +9,7 @@ // except according to those terms. fn main() { - let x = 3is; + let x = 3; // Here, the variable `p` gets inferred to a type with a lifetime // of the loop body. The regionck then determines that this type @@ -17,7 +17,7 @@ fn main() { let mut p = &x; loop { - let x = 1is + *p; + let x = 1 + *p; p = &x; //~ ERROR `x` does not live long enough } } diff --git a/src/test/compile-fail/regions-escape-loop-via-vec.rs b/src/test/compile-fail/regions-escape-loop-via-vec.rs index 5e6e1858cf1..89350f16167 100644 --- a/src/test/compile-fail/regions-escape-loop-via-vec.rs +++ b/src/test/compile-fail/regions-escape-loop-via-vec.rs @@ -10,7 +10,7 @@ // The type of `y` ends up getting inferred to the type of the block. fn broken() { - let mut x = 3is; + let mut x = 3; let mut _y = vec!(&mut x); while x < 10 { //~ ERROR cannot use `x` because it was mutably borrowed let mut z = x; //~ ERROR cannot use `x` because it was mutably borrowed diff --git a/src/test/compile-fail/regions-infer-proc-static-upvar.rs b/src/test/compile-fail/regions-infer-proc-static-upvar.rs index 4e99f64dbf7..ee5d5cad0a3 100644 --- a/src/test/compile-fail/regions-infer-proc-static-upvar.rs +++ b/src/test/compile-fail/regions-infer-proc-static-upvar.rs @@ -16,7 +16,7 @@ fn foo<F:FnOnce()+'static>(_p: F) { } static i: isize = 3; fn capture_local() { - let x = 3is; + let x = 3; let y = &x; //~ ERROR `x` does not live long enough foo(move|| { let _a = *y; diff --git a/src/test/compile-fail/regions-steal-closure.rs b/src/test/compile-fail/regions-steal-closure.rs index 583d9695be4..97b51fdb325 100644 --- a/src/test/compile-fail/regions-steal-closure.rs +++ b/src/test/compile-fail/regions-steal-closure.rs @@ -21,7 +21,7 @@ fn box_it<'r>(x: Box<FnMut() + 'r>) -> closure_box<'r> { fn main() { let cl_box = { - let mut i = 3is; + let mut i = 3; box_it(box || i += 1) //~ ERROR cannot infer }; cl_box.cl.call_mut(()); diff --git a/src/test/compile-fail/regions-var-type-out-of-scope.rs b/src/test/compile-fail/regions-var-type-out-of-scope.rs index 039de994ea3..8955a26de0b 100644 --- a/src/test/compile-fail/regions-var-type-out-of-scope.rs +++ b/src/test/compile-fail/regions-var-type-out-of-scope.rs @@ -14,8 +14,8 @@ fn foo(cond: bool) { let mut x; if cond { - x = &3is; //~ ERROR borrowed value does not live long enough - assert_eq!(*x, 3is); + x = &3; //~ ERROR borrowed value does not live long enough + assert_eq!(*x, 3); } } diff --git a/src/test/compile-fail/static-assert2.rs b/src/test/compile-fail/static-assert2.rs index e988cfb9097..d5e70205e95 100644 --- a/src/test/compile-fail/static-assert2.rs +++ b/src/test/compile-fail/static-assert2.rs @@ -11,6 +11,6 @@ #![allow(dead_code)] #[static_assert] -static E: bool = 1is == 2; //~ ERROR static assertion failed +static E: bool = 1 == 2; //~ ERROR static assertion failed fn main() {} diff --git a/src/test/compile-fail/static-mut-not-pat.rs b/src/test/compile-fail/static-mut-not-pat.rs index bfdeff6ed70..76fecea0c3a 100644 --- a/src/test/compile-fail/static-mut-not-pat.rs +++ b/src/test/compile-fail/static-mut-not-pat.rs @@ -19,7 +19,7 @@ fn main() { // name as a variable, hence this should be an unreachable pattern situation // instead of spitting out a custom error about some identifier collisions // (we should allow shadowing) - match 4is { + match 4 { a => {} //~ ERROR static variables cannot be referenced in a pattern _ => {} } diff --git a/src/test/compile-fail/static-region-bound.rs b/src/test/compile-fail/static-region-bound.rs index 4c59e7a769f..200aa989193 100644 --- a/src/test/compile-fail/static-region-bound.rs +++ b/src/test/compile-fail/static-region-bound.rs @@ -13,8 +13,8 @@ fn f<T:'static>(_: T) {} fn main() { - let x = box 3is; + let x = box 3; f(x); - let x = &3is; //~ ERROR borrowed value does not live long enough + let x = &3; //~ ERROR borrowed value does not live long enough f(x); } diff --git a/src/test/compile-fail/structure-constructor-type-mismatch.rs b/src/test/compile-fail/structure-constructor-type-mismatch.rs index a22f390499f..a82c05c72c3 100644 --- a/src/test/compile-fail/structure-constructor-type-mismatch.rs +++ b/src/test/compile-fail/structure-constructor-type-mismatch.rs @@ -26,39 +26,39 @@ fn main() { let pt = PointF { //~^ ERROR structure constructor specifies a structure of type //~| expected f32 - //~| found isize - x: 1is, - y: 2is, + //~| found i32 + x: 1i32, + y: 2i32, }; let pt2 = Point::<f32> { //~^ ERROR structure constructor specifies a structure of type //~| expected f32 - //~| found isize - x: 3is, - y: 4is, + //~| found i32 + x: 3i32, + y: 4i32, }; let pair = PairF { //~^ ERROR structure constructor specifies a structure of type //~| expected f32 - //~| found isize - x: 5is, - y: 6is, + //~| found i32 + x: 5i32, + y: 6i32, }; - let pair2 = PairF::<isize> { + let pair2 = PairF::<i32> { //~^ ERROR structure constructor specifies a structure of type //~| expected f32 - //~| found isize - x: 7is, - y: 8is, + //~| found i32 + x: 7i32, + y: 8i32, }; - let pt3 = PointF::<isize> { + let pt3 = PointF::<i32> { //~^ ERROR wrong number of type arguments - x: 9is, - y: 10is, + x: 9i32, + y: 10i32, }; } diff --git a/src/test/compile-fail/trailing-plus-in-bounds.rs b/src/test/compile-fail/trailing-plus-in-bounds.rs index 069c2e88793..e8f9ed4d2cf 100644 --- a/src/test/compile-fail/trailing-plus-in-bounds.rs +++ b/src/test/compile-fail/trailing-plus-in-bounds.rs @@ -11,7 +11,7 @@ use std::fmt::Show; fn main() { - let x: Box<Show+> = box 3is as Box<Show+>; + let x: Box<Show+> = box 3 as Box<Show+>; //~^ ERROR at least one type parameter bound must be specified //~^^ ERROR at least one type parameter bound must be specified } diff --git a/src/test/compile-fail/trait-bounds-on-structs-and-enums-locals.rs b/src/test/compile-fail/trait-bounds-on-structs-and-enums-locals.rs index 45a74a235e0..118dfeb37c2 100644 --- a/src/test/compile-fail/trait-bounds-on-structs-and-enums-locals.rs +++ b/src/test/compile-fail/trait-bounds-on-structs-and-enums-locals.rs @@ -17,7 +17,7 @@ struct Foo<T:Trait> { fn main() { let foo = Foo { //~^ ERROR not implemented - x: 3is + x: 3 }; let baz: Foo<usize> = panic!(); diff --git a/src/test/compile-fail/trait-bounds-on-structs-and-enums-xc1.rs b/src/test/compile-fail/trait-bounds-on-structs-and-enums-xc1.rs index 6179301c11d..8a9732de7fb 100644 --- a/src/test/compile-fail/trait-bounds-on-structs-and-enums-xc1.rs +++ b/src/test/compile-fail/trait-bounds-on-structs-and-enums-xc1.rs @@ -17,7 +17,7 @@ use trait_bounds_on_structs_and_enums_xc::{Bar, Foo, Trait}; fn main() { let foo = Foo { //~^ ERROR not implemented - x: 3is + x: 3 }; let bar: Bar<f64> = return; //~^ ERROR not implemented diff --git a/src/test/compile-fail/trait-impl-1.rs b/src/test/compile-fail/trait-impl-1.rs index 1c7fa1e4263..dadcbd5bce7 100644 --- a/src/test/compile-fail/trait-impl-1.rs +++ b/src/test/compile-fail/trait-impl-1.rs @@ -18,9 +18,9 @@ impl<'a> T+'a { fn foo(&self) {} } -impl T for isize {} +impl T for i32 {} fn main() { - let x = &42is; - x.foo(); //~ERROR: type `&isize` does not implement any method in scope named `foo` + let x = &42i32; + x.foo(); //~ERROR: type `&i32` does not implement any method in scope named `foo` } diff --git a/src/test/compile-fail/trait-test-2.rs b/src/test/compile-fail/trait-test-2.rs index bdfc6dcda88..d8b3176787c 100644 --- a/src/test/compile-fail/trait-test-2.rs +++ b/src/test/compile-fail/trait-test-2.rs @@ -11,11 +11,11 @@ #![feature(box_syntax)] trait bar { fn dup(&self) -> Self; fn blah<X>(&self); } -impl bar for isize { fn dup(&self) -> isize { *self } fn blah<X>(&self) {} } -impl bar for usize { fn dup(&self) -> usize { *self } fn blah<X>(&self) {} } +impl bar for i32 { fn dup(&self) -> i32 { *self } fn blah<X>(&self) {} } +impl bar for u32 { fn dup(&self) -> u32 { *self } fn blah<X>(&self) {} } fn main() { - 10is.dup::<isize>(); //~ ERROR does not take type parameters - 10is.blah::<isize, isize>(); //~ ERROR incorrect number of type parameters - (box 10is as Box<bar>).dup(); //~ ERROR cannot convert to a trait object + 10.dup::<i32>(); //~ ERROR does not take type parameters + 10.blah::<i32, i32>(); //~ ERROR incorrect number of type parameters + (box 10 as Box<bar>).dup(); //~ ERROR cannot convert to a trait object } diff --git a/src/test/compile-fail/traits-multidispatch-bad.rs b/src/test/compile-fail/traits-multidispatch-bad.rs index 2e29a61846e..392eccf0f31 100644 --- a/src/test/compile-fail/traits-multidispatch-bad.rs +++ b/src/test/compile-fail/traits-multidispatch-bad.rs @@ -14,9 +14,9 @@ trait Convert<Target> { fn convert(&self) -> Target; } -impl Convert<usize> for isize { - fn convert(&self) -> usize { - *self as usize +impl Convert<u32> for i32 { + fn convert(&self) -> u32 { + *self as u32 } } @@ -26,7 +26,7 @@ where T : Convert<U> } fn a() { - test(22is, 44is); //~ ERROR mismatched types + test(22i32, 44i32); //~ ERROR mismatched types } fn main() {} diff --git a/src/test/compile-fail/tuple-index-out-of-bounds.rs b/src/test/compile-fail/tuple-index-out-of-bounds.rs index 20dd71e3bdf..54b8d551f20 100644 --- a/src/test/compile-fail/tuple-index-out-of-bounds.rs +++ b/src/test/compile-fail/tuple-index-out-of-bounds.rs @@ -8,17 +8,17 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -struct Point(isize, isize); +struct Point(i32, i32); fn main() { - let origin = Point(0, 0); + let origin = Point(0i32, 0i32); origin.0; origin.1; origin.2; //~^ ERROR attempted out-of-bounds tuple index `2` on type `Point` - let tuple = (0is, 0is); + let tuple = (0i32, 0i32); tuple.0; tuple.1; tuple.2; - //~^ ERROR attempted out-of-bounds tuple index `2` on type `(isize, isize)` + //~^ ERROR attempted out-of-bounds tuple index `2` on type `(i32, i32)` } diff --git a/src/test/compile-fail/tutorial-suffix-inference-test.rs b/src/test/compile-fail/tutorial-suffix-inference-test.rs index c8c596fdb4f..bb1e199920d 100644 --- a/src/test/compile-fail/tutorial-suffix-inference-test.rs +++ b/src/test/compile-fail/tutorial-suffix-inference-test.rs @@ -29,7 +29,7 @@ fn main() { //~| expected u16 //~| found i32 - let a = 3is; + let a = 3; fn identity_i(n: isize) -> isize { n } diff --git a/src/test/compile-fail/type-mismatch-multiple.rs b/src/test/compile-fail/type-mismatch-multiple.rs index 4ab6bd53191..3bf0896d990 100644 --- a/src/test/compile-fail/type-mismatch-multiple.rs +++ b/src/test/compile-fail/type-mismatch-multiple.rs @@ -10,14 +10,14 @@ // Checking that the compiler reports multiple type errors at once -fn main() { let a: bool = 1is; let b: isize = true; } +fn main() { let a: bool = 1i32; let b: i32 = true; } //~^ ERROR mismatched types //~| expected `bool` -//~| found `isize` +//~| found `i32` //~| expected bool -//~| found isize +//~| found i32 //~| ERROR mismatched types -//~| expected `isize` +//~| expected `i32` //~| found `bool` -//~| expected isize +//~| expected i32 //~| found bool diff --git a/src/test/compile-fail/typeck-unsafe-always-share.rs b/src/test/compile-fail/typeck-unsafe-always-share.rs index 38e3b576348..1cb6bd048cc 100644 --- a/src/test/compile-fail/typeck-unsafe-always-share.rs +++ b/src/test/compile-fail/typeck-unsafe-always-share.rs @@ -25,7 +25,7 @@ impl !Sync for NoSync {} fn test<T: Sync>(s: T) {} fn main() { - let us = UnsafeCell::new(MySync{u: UnsafeCell::new(0is)}); + let us = UnsafeCell::new(MySync{u: UnsafeCell::new(0)}); test(us); //~^ ERROR `core::marker::Sync` is not implemented diff --git a/src/test/compile-fail/unboxed-closures-infer-argument-types-two-region-pointers.rs b/src/test/compile-fail/unboxed-closures-infer-argument-types-two-region-pointers.rs index 525d0b31995..ef6c439aeb8 100644 --- a/src/test/compile-fail/unboxed-closures-infer-argument-types-two-region-pointers.rs +++ b/src/test/compile-fail/unboxed-closures-infer-argument-types-two-region-pointers.rs @@ -23,7 +23,7 @@ fn doit<T,F>(val: T, f: &F) } pub fn main() { - doit(0is, &|&: x, y| { + doit(0, &|&: x, y| { x.set(y); //~ ERROR cannot infer }); } diff --git a/src/test/compile-fail/unboxed-closures-static-call-wrong-trait.rs b/src/test/compile-fail/unboxed-closures-static-call-wrong-trait.rs index 22bfabf040a..8d3721f28db 100644 --- a/src/test/compile-fail/unboxed-closures-static-call-wrong-trait.rs +++ b/src/test/compile-fail/unboxed-closures-static-call-wrong-trait.rs @@ -12,6 +12,6 @@ fn main() { let mut_ = |&mut: x| x; - mut_.call((0is, )); //~ ERROR does not implement any method in scope named `call` + mut_.call((0, )); //~ ERROR does not implement any method in scope named `call` } diff --git a/src/test/compile-fail/unique-unique-kind.rs b/src/test/compile-fail/unique-unique-kind.rs index 322de45daf0..d45a31abcb7 100644 --- a/src/test/compile-fail/unique-unique-kind.rs +++ b/src/test/compile-fail/unique-unique-kind.rs @@ -16,7 +16,7 @@ fn f<T:Send>(_i: T) { } fn main() { - let i = box Rc::new(100is); + let i = box Rc::new(100); f(i); //~^ ERROR `core::marker::Send` is not implemented } diff --git a/src/test/compile-fail/unreachable-code.rs b/src/test/compile-fail/unreachable-code.rs index d96578f2df9..dd08eed5df9 100644 --- a/src/test/compile-fail/unreachable-code.rs +++ b/src/test/compile-fail/unreachable-code.rs @@ -14,5 +14,5 @@ fn main() { loop{} - let a = 3is; //~ ERROR: unreachable statement + let a = 3; //~ ERROR: unreachable statement } diff --git a/src/test/compile-fail/unsized3.rs b/src/test/compile-fail/unsized3.rs index 9d4cfe0f4ac..4fc76c99c60 100644 --- a/src/test/compile-fail/unsized3.rs +++ b/src/test/compile-fail/unsized3.rs @@ -55,12 +55,12 @@ fn f8<X: ?Sized>(x1: &S<X>, x2: &S<X>) { // Test some tuples. fn f9<X: ?Sized>(x1: Box<S<X>>, x2: Box<E<X>>) { - f5(&(*x1, 34is)); + f5(&(*x1, 34)); //~^ ERROR the trait `core::marker::Sized` is not implemented } fn f10<X: ?Sized>(x1: Box<S<X>>, x2: Box<E<X>>) { - f5(&(32is, *x2)); + f5(&(32, *x2)); //~^ ERROR the trait `core::marker::Sized` is not implemented } diff --git a/src/test/compile-fail/unsized6.rs b/src/test/compile-fail/unsized6.rs index 21953d1bb09..217d1f44d84 100644 --- a/src/test/compile-fail/unsized6.rs +++ b/src/test/compile-fail/unsized6.rs @@ -27,12 +27,12 @@ fn f2<X: ?Sized + T>(x: &X) { fn f3<X: ?Sized>(x1: Box<X>, x2: Box<X>, x3: Box<X>) { let y: X = *x1; //~ERROR the trait `core::marker::Sized` is not implemented let y = *x2; //~ERROR the trait `core::marker::Sized` is not implemented - let (y, z) = (*x3, 4is); //~ERROR the trait `core::marker::Sized` is not implemented + let (y, z) = (*x3, 4); //~ERROR the trait `core::marker::Sized` is not implemented } fn f4<X: ?Sized + T>(x1: Box<X>, x2: Box<X>, x3: Box<X>) { let y: X = *x1; //~ERROR the trait `core::marker::Sized` is not implemented let y = *x2; //~ERROR the trait `core::marker::Sized` is not implemented - let (y, z) = (*x3, 4is); //~ERROR the trait `core::marker::Sized` is not implemented + let (y, z) = (*x3, 4); //~ERROR the trait `core::marker::Sized` is not implemented } fn g1<X: ?Sized>(x: X) {} //~ERROR the trait `core::marker::Sized` is not implemented diff --git a/src/test/compile-fail/unused-mut-warning-captured-var.rs b/src/test/compile-fail/unused-mut-warning-captured-var.rs index aa5adb6a6b0..87ea56c0553 100644 --- a/src/test/compile-fail/unused-mut-warning-captured-var.rs +++ b/src/test/compile-fail/unused-mut-warning-captured-var.rs @@ -11,7 +11,7 @@ #![forbid(unused_mut)] fn main() { - let mut x = 1is; + let mut x = 1; //~^ ERROR: variable does not need to be mutable move|:| { println!("{}", x); }; } diff --git a/src/test/compile-fail/vec-mut-iter-borrow.rs b/src/test/compile-fail/vec-mut-iter-borrow.rs index 59c490f2fff..7dcedc8ecad 100644 --- a/src/test/compile-fail/vec-mut-iter-borrow.rs +++ b/src/test/compile-fail/vec-mut-iter-borrow.rs @@ -12,6 +12,6 @@ fn main() { let mut xs: Vec<isize> = vec!(); for x in xs.iter_mut() { - xs.push(1is) //~ ERROR cannot borrow `xs` + xs.push(1) //~ ERROR cannot borrow `xs` } } diff --git a/src/test/compile-fail/vtable-res-trait-param.rs b/src/test/compile-fail/vtable-res-trait-param.rs index bbe88379aa7..c21d8274da0 100644 --- a/src/test/compile-fail/vtable-res-trait-param.rs +++ b/src/test/compile-fail/vtable-res-trait-param.rs @@ -28,6 +28,6 @@ fn call_it<B:TraitB>(b: B) -> isize { } fn main() { - let x = 3is; + let x = 3; assert_eq!(call_it(x), 22); } diff --git a/src/test/compile-fail/warn-path-statement.rs b/src/test/compile-fail/warn-path-statement.rs index d205e2a2e4e..892d82d0934 100644 --- a/src/test/compile-fail/warn-path-statement.rs +++ b/src/test/compile-fail/warn-path-statement.rs @@ -11,6 +11,6 @@ // compile-flags: -D path-statements fn main() { - let x = 10is; + let x = 10; x; //~ ERROR path statement with no effect } diff --git a/src/test/compile-fail/where-clauses-not-parameter.rs b/src/test/compile-fail/where-clauses-not-parameter.rs index 5573464c5ab..313ae273c07 100644 --- a/src/test/compile-fail/where-clauses-not-parameter.rs +++ b/src/test/compile-fail/where-clauses-not-parameter.rs @@ -41,5 +41,5 @@ impl Baz<isize> for isize where isize : Eq { } fn main() { - equal(&0is, &0is); + equal(&0, &0); } diff --git a/src/test/compile-fail/while-let.rs b/src/test/compile-fail/while-let.rs index 45e0d0aaeab..a70dcccd4e8 100644 --- a/src/test/compile-fail/while-let.rs +++ b/src/test/compile-fail/while-let.rs @@ -20,16 +20,16 @@ fn macros() { }} } - foo!(a, 1is, { //~ ERROR irrefutable while-let + foo!(a, 1, { //~ ERROR irrefutable while-let println!("irrefutable pattern"); }); - bar!(a, 1is, { //~ ERROR irrefutable while-let + bar!(a, 1, { //~ ERROR irrefutable while-let println!("irrefutable pattern"); }); } pub fn main() { - while let a = 1is { //~ ERROR irrefutable while-let + while let a = 1 { //~ ERROR irrefutable while-let println!("irrefutable pattern"); } } diff --git a/src/test/pretty/issue-4264.pp b/src/test/pretty/issue-4264.pp index b1d38f5dc9b..cc8337027b0 100644 --- a/src/test/pretty/issue-4264.pp +++ b/src/test/pretty/issue-4264.pp @@ -19,7 +19,7 @@ extern crate "std" as std; // #4264 fixed-length vector types -pub fn foo(_: [isize; (3 as usize)]) { } +pub fn foo(_: [i32; (3 as usize)]) { } pub fn bar() { const FOO: usize = ((5us as usize) - (4us as usize) as usize); @@ -28,9 +28,9 @@ pub fn bar() { let _: [(); (1us as usize)] = ([(() as ())] as [(); 1]); let _ = - (((&((([(1is as isize), (2 as isize), (3 as isize)] as [isize; 3])) as - [isize; 3]) as &[isize; 3]) as *const _ as *const [isize; 3]) - as *const [isize; (3us as usize)] as *const [isize; 3]); + (((&((([(1 as i32), (2 as i32), (3 as i32)] as [i32; 3])) as [i32; 3]) + as &[i32; 3]) as *const _ as *const [i32; 3]) as + *const [i32; (3us as usize)] as *const [i32; 3]); @@ -78,19 +78,18 @@ pub fn bar() { core::fmt::Arguments<'_>)) as collections::string::String); } -pub type Foo = [isize; (3us as usize)]; +pub type Foo = [i32; (3us as usize)]; pub struct Bar { - pub x: [isize; (3us as usize)], + pub x: [i32; (3us as usize)], } -pub struct TupleBar([isize; (4us as usize)]); -pub enum Baz { BazVariant([isize; (5us as usize)]), } +pub struct TupleBar([i32; (4us as usize)]); +pub enum Baz { BazVariant([i32; (5us as usize)]), } pub fn id<T>(x: T) -> T { (x as T) } pub fn use_id() { let _ = - ((id::<[isize; (3us as usize)]> as - fn([isize; 3]) -> [isize; 3] {id})(([(1 as isize), (2 as isize), - (3 as isize)] as - [isize; 3])) as - [isize; 3]); + ((id::<[i32; (3us as usize)]> as + fn([i32; 3]) -> [i32; 3] {id})(([(1 as i32), (2 as i32), + (3 as i32)] as [i32; 3])) as + [i32; 3]); } fn main() { } diff --git a/src/test/pretty/issue-4264.rs b/src/test/pretty/issue-4264.rs index 75be2f23c2b..ff30bc6c157 100644 --- a/src/test/pretty/issue-4264.rs +++ b/src/test/pretty/issue-4264.rs @@ -14,7 +14,7 @@ // #4264 fixed-length vector types -pub fn foo(_: [isize; 3]) {} +pub fn foo(_: [i32; 3]) {} pub fn bar() { const FOO: usize = 5us - 4us; @@ -22,27 +22,27 @@ pub fn bar() { let _ : [(); 1us] = [()]; - let _ = &([1is,2,3]) as *const _ as *const [isize; 3us]; + let _ = &([1,2,3]) as *const _ as *const [i32; 3us]; format!("test"); } -pub type Foo = [isize; 3us]; +pub type Foo = [i32; 3us]; pub struct Bar { - pub x: [isize; 3us] + pub x: [i32; 3us] } -pub struct TupleBar([isize; 4us]); +pub struct TupleBar([i32; 4us]); pub enum Baz { - BazVariant([isize; 5us]) + BazVariant([i32; 5us]) } pub fn id<T>(x: T) -> T { x } pub fn use_id() { - let _ = id::<[isize; 3us]>([1,2,3]); + let _ = id::<[i32; 3us]>([1,2,3]); } diff --git a/src/test/run-fail/assert-as-macro.rs b/src/test/run-fail/assert-as-macro.rs index 59e79fe9266..c52c11b1b91 100644 --- a/src/test/run-fail/assert-as-macro.rs +++ b/src/test/run-fail/assert-as-macro.rs @@ -8,8 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// error-pattern:assertion failed: 1is == 2 +// error-pattern:assertion failed: 1 == 2 fn main() { - assert!(1is == 2); + assert!(1 == 2); } diff --git a/src/test/run-fail/panic.rs b/src/test/run-fail/panic.rs index dd4c58f176c..7c6473ebfc2 100644 --- a/src/test/run-fail/panic.rs +++ b/src/test/run-fail/panic.rs @@ -8,5 +8,5 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// error-pattern:1is == 2 -fn main() { assert!((1is == 2)); } +// error-pattern:1 == 2 +fn main() { assert!((1 == 2)); } diff --git a/src/test/run-make/graphviz-flowgraph/f01.dot-expected.dot b/src/test/run-make/graphviz-flowgraph/f01.dot-expected.dot index 694a06ed83a..d924890b311 100644 --- a/src/test/run-make/graphviz-flowgraph/f01.dot-expected.dot +++ b/src/test/run-make/graphviz-flowgraph/f01.dot-expected.dot @@ -1,9 +1,9 @@ digraph block { N0[label="entry"]; N1[label="exit"]; - N2[label="expr 1is"]; - N3[label="stmt 1is;"]; - N4[label="block { 1is; }"]; + N2[label="expr 1"]; + N3[label="stmt 1;"]; + N4[label="block { 1; }"]; N0 -> N2; N2 -> N3; N3 -> N4; diff --git a/src/test/run-make/graphviz-flowgraph/f01.rs b/src/test/run-make/graphviz-flowgraph/f01.rs index 27b19807865..231aab69e50 100644 --- a/src/test/run-make/graphviz-flowgraph/f01.rs +++ b/src/test/run-make/graphviz-flowgraph/f01.rs @@ -9,5 +9,5 @@ // except according to those terms. pub fn lit_1() { - 1is; + 1; } diff --git a/src/test/run-make/graphviz-flowgraph/f03.dot-expected.dot b/src/test/run-make/graphviz-flowgraph/f03.dot-expected.dot index efa2c6404a2..8b650076185 100644 --- a/src/test/run-make/graphviz-flowgraph/f03.dot-expected.dot +++ b/src/test/run-make/graphviz-flowgraph/f03.dot-expected.dot @@ -1,11 +1,11 @@ digraph block { N0[label="entry"]; N1[label="exit"]; - N2[label="expr 3is"]; + N2[label="expr 3"]; N3[label="expr 4"]; - N4[label="expr 3is + 4"]; - N5[label="stmt 3is + 4;"]; - N6[label="block { 3is + 4; }"]; + N4[label="expr 3 + 4"]; + N5[label="stmt 3 + 4;"]; + N6[label="block { 3 + 4; }"]; N0 -> N2; N2 -> N3; N3 -> N4; diff --git a/src/test/run-make/graphviz-flowgraph/f03.rs b/src/test/run-make/graphviz-flowgraph/f03.rs index c95dbcbb31c..2dd71b623c2 100644 --- a/src/test/run-make/graphviz-flowgraph/f03.rs +++ b/src/test/run-make/graphviz-flowgraph/f03.rs @@ -9,5 +9,5 @@ // except according to those terms. pub fn expr_add_3() { - 3is + 4; + 3 + 4; } diff --git a/src/test/run-make/graphviz-flowgraph/f04.dot-expected.dot b/src/test/run-make/graphviz-flowgraph/f04.dot-expected.dot index 1f375b767ce..fde6cc29005 100644 --- a/src/test/run-make/graphviz-flowgraph/f04.dot-expected.dot +++ b/src/test/run-make/graphviz-flowgraph/f04.dot-expected.dot @@ -1,10 +1,10 @@ digraph block { N0[label="entry"]; N1[label="exit"]; - N2[label="expr 4is"]; + N2[label="expr 4"]; N3[label="local _x"]; - N4[label="stmt let _x = 4is;"]; - N5[label="block { let _x = 4is; }"]; + N4[label="stmt let _x = 4;"]; + N5[label="block { let _x = 4; }"]; N0 -> N2; N2 -> N3; N3 -> N4; diff --git a/src/test/run-make/graphviz-flowgraph/f04.rs b/src/test/run-make/graphviz-flowgraph/f04.rs index 552cb24c750..2a0ac8ac9e5 100644 --- a/src/test/run-make/graphviz-flowgraph/f04.rs +++ b/src/test/run-make/graphviz-flowgraph/f04.rs @@ -9,5 +9,5 @@ // except according to those terms. pub fn pat_id_4() { - let _x = 4is; + let _x = 4; } diff --git a/src/test/run-make/graphviz-flowgraph/f05.dot-expected.dot b/src/test/run-make/graphviz-flowgraph/f05.dot-expected.dot index 8c9a930098a..efd56cd0c75 100644 --- a/src/test/run-make/graphviz-flowgraph/f05.dot-expected.dot +++ b/src/test/run-make/graphviz-flowgraph/f05.dot-expected.dot @@ -1,14 +1,14 @@ digraph block { N0[label="entry"]; N1[label="exit"]; - N2[label="expr 5is"]; - N3[label="expr 55is"]; - N4[label="expr (5is, 55is)"]; + N2[label="expr 5"]; + N3[label="expr 55"]; + N4[label="expr (5, 55)"]; N5[label="local _x"]; N6[label="local _y"]; N7[label="pat (_x, _y)"]; - N8[label="stmt let (_x, _y) = (5is, 55is);"]; - N9[label="block { let (_x, _y) = (5is, 55is); }"]; + N8[label="stmt let (_x, _y) = (5, 55);"]; + N9[label="block { let (_x, _y) = (5, 55); }"]; N0 -> N2; N2 -> N3; N3 -> N4; diff --git a/src/test/run-make/graphviz-flowgraph/f05.rs b/src/test/run-make/graphviz-flowgraph/f05.rs index 09a45c9bd21..616d822bed0 100644 --- a/src/test/run-make/graphviz-flowgraph/f05.rs +++ b/src/test/run-make/graphviz-flowgraph/f05.rs @@ -9,5 +9,5 @@ // except according to those terms. pub fn pat_tup_5() { - let (_x, _y) = (5is, 55is); + let (_x, _y) = (5, 55); } diff --git a/src/test/run-make/graphviz-flowgraph/f07.dot-expected.dot b/src/test/run-make/graphviz-flowgraph/f07.dot-expected.dot index da7d5759b7e..bee4a120d59 100644 --- a/src/test/run-make/graphviz-flowgraph/f07.dot-expected.dot +++ b/src/test/run-make/graphviz-flowgraph/f07.dot-expected.dot @@ -1,12 +1,12 @@ digraph block { N0[label="entry"]; N1[label="exit"]; - N2[label="expr 7is"]; - N3[label="expr 77is"]; - N4[label="expr 777is"]; - N5[label="expr 7777is"]; - N6[label="expr [7is, 77is, 777is, 7777is]"]; - N7[label="expr match [7is, 77is, 777is, 7777is] { [x, y, ..] => x + y, }"]; + N2[label="expr 7"]; + N3[label="expr 77"]; + N4[label="expr 777"]; + N5[label="expr 7777"]; + N6[label="expr [7, 77, 777, 7777]"]; + N7[label="expr match [7, 77, 777, 7777] { [x, y, ..] => x + y, }"]; N8[label="(dummy_node)"]; N9[label="local x"]; N10[label="local y"]; @@ -15,8 +15,8 @@ digraph block { N13[label="expr x"]; N14[label="expr y"]; N15[label="expr x + y"]; - N16[label="stmt match [7is, 77is, 777is, 7777is] { [x, y, ..] => x + y, };"]; - N17[label="block { match [7is, 77is, 777is, 7777is] { [x, y, ..] => x + y, }; }"]; + N16[label="stmt match [7, 77, 777, 7777] { [x, y, ..] => x + y, };"]; + N17[label="block { match [7, 77, 777, 7777] { [x, y, ..] => x + y, }; }"]; N0 -> N2; N2 -> N3; N3 -> N4; diff --git a/src/test/run-make/graphviz-flowgraph/f07.rs b/src/test/run-make/graphviz-flowgraph/f07.rs index 8334f81c080..39f71d309fd 100644 --- a/src/test/run-make/graphviz-flowgraph/f07.rs +++ b/src/test/run-make/graphviz-flowgraph/f07.rs @@ -9,7 +9,7 @@ // except according to those terms. pub fn pat_vec_7() { - match [7is, 77is, 777is, 7777is] { + match [7, 77, 777, 7777] { [x, y, ..] => x + y }; } diff --git a/src/test/run-make/graphviz-flowgraph/f08.dot-expected.dot b/src/test/run-make/graphviz-flowgraph/f08.dot-expected.dot index ac1972424dc..da0120b7bdc 100644 --- a/src/test/run-make/graphviz-flowgraph/f08.dot-expected.dot +++ b/src/test/run-make/graphviz-flowgraph/f08.dot-expected.dot @@ -1,21 +1,21 @@ digraph block { N0[label="entry"]; N1[label="exit"]; - N2[label="expr 8is"]; + N2[label="expr 8"]; N3[label="local x"]; - N4[label="stmt let x = 8is;"]; + N4[label="stmt let x = 8;"]; N5[label="local _y"]; N6[label="stmt let _y;"]; N7[label="expr x"]; - N8[label="expr 88is"]; - N9[label="expr x > 88is"]; - N10[label="expr 888is"]; + N8[label="expr 88"]; + N9[label="expr x > 88"]; + N10[label="expr 888"]; N11[label="expr _y"]; - N12[label="expr _y = 888is"]; - N13[label="stmt _y = 888is;"]; - N14[label="block { _y = 888is; }"]; - N15[label="expr if x > 88is { _y = 888is; }"]; - N16[label="block { let x = 8is; let _y; if x > 88is { _y = 888is; } }"]; + N12[label="expr _y = 888"]; + N13[label="stmt _y = 888;"]; + N14[label="block { _y = 888; }"]; + N15[label="expr if x > 88 { _y = 888; }"]; + N16[label="block { let x = 8; let _y; if x > 88 { _y = 888; } }"]; N0 -> N2; N2 -> N3; N3 -> N4; diff --git a/src/test/run-make/graphviz-flowgraph/f08.rs b/src/test/run-make/graphviz-flowgraph/f08.rs index ad96f30073b..6ba7b03d54d 100644 --- a/src/test/run-make/graphviz-flowgraph/f08.rs +++ b/src/test/run-make/graphviz-flowgraph/f08.rs @@ -9,8 +9,8 @@ // except according to those terms. pub fn expr_if_onearm_8() { - let x = 8is; let _y; - if x > 88is { - _y = 888is; + let x = 8; let _y; + if x > 88 { + _y = 888; } } diff --git a/src/test/run-make/graphviz-flowgraph/f09.dot-expected.dot b/src/test/run-make/graphviz-flowgraph/f09.dot-expected.dot index 0dc3ff14fba..c98d1b0bed5 100644 --- a/src/test/run-make/graphviz-flowgraph/f09.dot-expected.dot +++ b/src/test/run-make/graphviz-flowgraph/f09.dot-expected.dot @@ -1,29 +1,29 @@ digraph block { N0[label="entry"]; N1[label="exit"]; - N2[label="expr 91is"]; + N2[label="expr 91"]; N3[label="local x"]; - N4[label="stmt let x = 91is;"]; + N4[label="stmt let x = 91;"]; N5[label="local _y"]; N6[label="stmt let _y;"]; N7[label="expr x"]; - N8[label="expr 92is"]; - N9[label="expr x > 92is"]; - N10[label="expr 93is"]; + N8[label="expr 92"]; + N9[label="expr x > 92"]; + N10[label="expr 93"]; N11[label="expr _y"]; - N12[label="expr _y = 93is"]; - N13[label="stmt _y = 93is;"]; - N14[label="block { _y = 93is; }"]; - N15[label="expr 94is"]; - N16[label="expr 95is"]; - N17[label="expr 94is + 95is"]; + N12[label="expr _y = 93"]; + N13[label="stmt _y = 93;"]; + N14[label="block { _y = 93; }"]; + N15[label="expr 94"]; + N16[label="expr 95"]; + N17[label="expr 94 + 95"]; N18[label="expr _y"]; - N19[label="expr _y = 94is + 95is"]; - N20[label="stmt _y = 94is + 95is;"]; - N21[label="block { _y = 94is + 95is; }"]; - N22[label="expr { _y = 94is + 95is; }"]; - N23[label="expr if x > 92is { _y = 93is; } else { _y = 94is + 95is; }"]; - N24[label="block {\l let x = 91is;\l let _y;\l if x > 92is { _y = 93is; } else { _y = 94is + 95is; }\l}\l"]; + N19[label="expr _y = 94 + 95"]; + N20[label="stmt _y = 94 + 95;"]; + N21[label="block { _y = 94 + 95; }"]; + N22[label="expr { _y = 94 + 95; }"]; + N23[label="expr if x > 92 { _y = 93; } else { _y = 94 + 95; }"]; + N24[label="block { let x = 91; let _y; if x > 92 { _y = 93; } else { _y = 94 + 95; } }"]; N0 -> N2; N2 -> N3; N3 -> N4; diff --git a/src/test/run-make/graphviz-flowgraph/f09.rs b/src/test/run-make/graphviz-flowgraph/f09.rs index 184772e7d51..a78ccb8a937 100644 --- a/src/test/run-make/graphviz-flowgraph/f09.rs +++ b/src/test/run-make/graphviz-flowgraph/f09.rs @@ -9,10 +9,10 @@ // except according to those terms. pub fn expr_if_twoarm_9() { - let x = 91is; let _y; - if x > 92is { - _y = 93is; + let x = 91; let _y; + if x > 92 { + _y = 93; } else { - _y = 94is+95is; + _y = 94+95; } } diff --git a/src/test/run-make/graphviz-flowgraph/f10.dot-expected.dot b/src/test/run-make/graphviz-flowgraph/f10.dot-expected.dot index 37606ddac70..516c39ef560 100644 --- a/src/test/run-make/graphviz-flowgraph/f10.dot-expected.dot +++ b/src/test/run-make/graphviz-flowgraph/f10.dot-expected.dot @@ -1,20 +1,20 @@ digraph block { N0[label="entry"]; N1[label="exit"]; - N2[label="expr 10is"]; + N2[label="expr 10"]; N3[label="local mut x"]; - N4[label="stmt let mut x = 10is;"]; + N4[label="stmt let mut x = 10;"]; N5[label="(dummy_node)"]; N6[label="expr x"]; - N7[label="expr 0is"]; - N8[label="expr x > 0is"]; - N9[label="expr while x > 0is { x -= 1is; }"]; - N10[label="expr 1is"]; + N7[label="expr 0"]; + N8[label="expr x > 0"]; + N9[label="expr while x > 0 { x -= 1; }"]; + N10[label="expr 1"]; N11[label="expr x"]; - N12[label="expr x -= 1is"]; - N13[label="stmt x -= 1is;"]; - N14[label="block { x -= 1is; }"]; - N15[label="block { let mut x = 10is; while x > 0is { x -= 1is; } }"]; + N12[label="expr x -= 1"]; + N13[label="stmt x -= 1;"]; + N14[label="block { x -= 1; }"]; + N15[label="block { let mut x = 10; while x > 0 { x -= 1; } }"]; N0 -> N2; N2 -> N3; N3 -> N4; diff --git a/src/test/run-make/graphviz-flowgraph/f10.rs b/src/test/run-make/graphviz-flowgraph/f10.rs index 456f740d468..0ca7cc5ee86 100644 --- a/src/test/run-make/graphviz-flowgraph/f10.rs +++ b/src/test/run-make/graphviz-flowgraph/f10.rs @@ -9,8 +9,8 @@ // except according to those terms. pub fn expr_while_10() { - let mut x = 10is; - while x > 0is { - x -= 1is; + let mut x = 10; + while x > 0 { + x -= 1; } } diff --git a/src/test/run-make/graphviz-flowgraph/f11.dot-expected.dot b/src/test/run-make/graphviz-flowgraph/f11.dot-expected.dot index 39a55f1a092..9b66fd581cb 100644 --- a/src/test/run-make/graphviz-flowgraph/f11.dot-expected.dot +++ b/src/test/run-make/graphviz-flowgraph/f11.dot-expected.dot @@ -1,20 +1,20 @@ digraph block { N0[label="entry"]; N1[label="exit"]; - N2[label="expr 11is"]; + N2[label="expr 11"]; N3[label="local mut _x"]; - N4[label="stmt let mut _x = 11is;"]; + N4[label="stmt let mut _x = 11;"]; N5[label="(dummy_node)"]; - N6[label="expr loop { _x -= 1is; }"]; - N7[label="expr 1is"]; + N6[label="expr loop { _x -= 1; }"]; + N7[label="expr 1"]; N8[label="expr _x"]; - N9[label="expr _x -= 1is"]; - N10[label="stmt _x -= 1is;"]; - N11[label="block { _x -= 1is; }"]; - N12[label="stmt loop { _x -= 1is; }"]; + N9[label="expr _x -= 1"]; + N10[label="stmt _x -= 1;"]; + N11[label="block { _x -= 1; }"]; + N12[label="stmt loop { _x -= 1; }"]; N13[label="expr \"unreachable\""]; N14[label="stmt \"unreachable\";"]; - N15[label="block { let mut _x = 11is; loop { _x -= 1is; } \"unreachable\"; }"]; + N15[label="block { let mut _x = 11; loop { _x -= 1; } \"unreachable\"; }"]; N0 -> N2; N2 -> N3; N3 -> N4; diff --git a/src/test/run-make/graphviz-flowgraph/f11.rs b/src/test/run-make/graphviz-flowgraph/f11.rs index 65262f249bc..d0f3452119e 100644 --- a/src/test/run-make/graphviz-flowgraph/f11.rs +++ b/src/test/run-make/graphviz-flowgraph/f11.rs @@ -10,9 +10,9 @@ #[allow(unreachable_code)] pub fn expr_loop_11() { - let mut _x = 11is; + let mut _x = 11; loop { - _x -= 1is; + _x -= 1; } "unreachable"; } diff --git a/src/test/run-make/graphviz-flowgraph/f12.dot-expected.dot b/src/test/run-make/graphviz-flowgraph/f12.dot-expected.dot index 12b16cc9f8c..071af6faf6f 100644 --- a/src/test/run-make/graphviz-flowgraph/f12.dot-expected.dot +++ b/src/test/run-make/graphviz-flowgraph/f12.dot-expected.dot @@ -1,27 +1,27 @@ digraph block { N0[label="entry"]; N1[label="exit"]; - N2[label="expr 12is"]; + N2[label="expr 12"]; N3[label="local mut x"]; - N4[label="stmt let mut x = 12is;"]; + N4[label="stmt let mut x = 12;"]; N5[label="(dummy_node)"]; - N6[label="expr loop { x -= 1is; if x == 2is { break ; \"unreachable\"; } }"]; - N7[label="expr 1is"]; + N6[label="expr loop { x -= 1; if x == 2 { break ; \"unreachable\"; } }"]; + N7[label="expr 1"]; N8[label="expr x"]; - N9[label="expr x -= 1is"]; - N10[label="stmt x -= 1is;"]; + N9[label="expr x -= 1"]; + N10[label="stmt x -= 1;"]; N11[label="expr x"]; - N12[label="expr 2is"]; - N13[label="expr x == 2is"]; + N12[label="expr 2"]; + N13[label="expr x == 2"]; N14[label="expr break"]; N15[label="(dummy_node)"]; N16[label="stmt break ;"]; N17[label="expr \"unreachable\""]; N18[label="stmt \"unreachable\";"]; N19[label="block { break ; \"unreachable\"; }"]; - N20[label="expr if x == 2is { break ; \"unreachable\"; }"]; - N21[label="block { x -= 1is; if x == 2is { break ; \"unreachable\"; } }"]; - N22[label="block {\l let mut x = 12is;\l loop { x -= 1is; if x == 2is { break ; \"unreachable\"; } }\l}\l"]; + N20[label="expr if x == 2 { break ; \"unreachable\"; }"]; + N21[label="block { x -= 1; if x == 2 { break ; \"unreachable\"; } }"]; + N22[label="block { let mut x = 12; loop { x -= 1; if x == 2 { break ; \"unreachable\"; } } }"]; N0 -> N2; N2 -> N3; N3 -> N4; diff --git a/src/test/run-make/graphviz-flowgraph/f12.rs b/src/test/run-make/graphviz-flowgraph/f12.rs index 5651d73baff..90b146340b6 100644 --- a/src/test/run-make/graphviz-flowgraph/f12.rs +++ b/src/test/run-make/graphviz-flowgraph/f12.rs @@ -10,9 +10,9 @@ #[allow(unreachable_code)] pub fn expr_loop_12() { - let mut x = 12is; + let mut x = 12; loop { - x -= 1is; - if x == 2is { break; "unreachable"; } + x -= 1; + if x == 2 { break; "unreachable"; } } } diff --git a/src/test/run-make/graphviz-flowgraph/f14.dot-expected.dot b/src/test/run-make/graphviz-flowgraph/f14.dot-expected.dot index ac1a631eb56..66250aa441e 100644 --- a/src/test/run-make/graphviz-flowgraph/f14.dot-expected.dot +++ b/src/test/run-make/graphviz-flowgraph/f14.dot-expected.dot @@ -1,20 +1,20 @@ digraph block { N0[label="entry"]; N1[label="exit"]; - N2[label="expr 14is"]; + N2[label="expr 14"]; N3[label="local x"]; - N4[label="stmt let x = 14is;"]; + N4[label="stmt let x = 14;"]; N5[label="expr x"]; - N6[label="expr 1is"]; - N7[label="expr x > 1is"]; + N6[label="expr 1"]; + N7[label="expr x > 1"]; N8[label="expr return"]; N9[label="(dummy_node)"]; N10[label="stmt return;"]; N11[label="expr \"unreachable\""]; N12[label="stmt \"unreachable\";"]; N13[label="block { return; \"unreachable\"; }"]; - N14[label="expr if x > 1is { return; \"unreachable\"; }"]; - N15[label="block { let x = 14is; if x > 1is { return; \"unreachable\"; } }"]; + N14[label="expr if x > 1 { return; \"unreachable\"; }"]; + N15[label="block { let x = 14; if x > 1 { return; \"unreachable\"; } }"]; N0 -> N2; N2 -> N3; N3 -> N4; diff --git a/src/test/run-make/graphviz-flowgraph/f14.rs b/src/test/run-make/graphviz-flowgraph/f14.rs index adb7b193d16..98ff095c831 100644 --- a/src/test/run-make/graphviz-flowgraph/f14.rs +++ b/src/test/run-make/graphviz-flowgraph/f14.rs @@ -10,8 +10,8 @@ #[allow(unreachable_code)] pub fn expr_ret_14() { - let x = 14is; - if x > 1is { + let x = 14; + if x > 1 { return; "unreachable"; } diff --git a/src/test/run-make/graphviz-flowgraph/f15.dot-expected.dot b/src/test/run-make/graphviz-flowgraph/f15.dot-expected.dot index 47e9b3f6cbe..4c94630f4e1 100644 --- a/src/test/run-make/graphviz-flowgraph/f15.dot-expected.dot +++ b/src/test/run-make/graphviz-flowgraph/f15.dot-expected.dot @@ -1,54 +1,54 @@ digraph block { N0[label="entry"]; N1[label="exit"]; - N2[label="expr 15is"]; + N2[label="expr 15"]; N3[label="local mut x"]; - N4[label="stmt let mut x = 15is;"]; - N5[label="expr 151is"]; + N4[label="stmt let mut x = 15;"]; + N5[label="expr 151"]; N6[label="local mut y"]; - N7[label="stmt let mut y = 151is;"]; + N7[label="stmt let mut y = 151;"]; N8[label="(dummy_node)"]; - N9[label="expr \'outer:\l loop {\l \'inner:\l loop {\l if x == 1is { break \'outer ; \"unreachable\"; }\l if y >= 2is { break ; \"unreachable\"; }\l y -= 3is;\l }\l y -= 4is;\l x -= 5is;\l }\l"]; + N9[label="expr \'outer:\l loop {\l \'inner:\l loop {\l if x == 1 { break \'outer ; \"unreachable\"; }\l if y >= 2 { break ; \"unreachable\"; }\l y -= 3;\l }\l y -= 4;\l x -= 5;\l }\l"]; N10[label="(dummy_node)"]; - N11[label="expr \'inner:\l loop {\l if x == 1is { break \'outer ; \"unreachable\"; }\l if y >= 2is { break ; \"unreachable\"; }\l y -= 3is;\l }\l"]; + N11[label="expr \'inner:\l loop {\l if x == 1 { break \'outer ; \"unreachable\"; }\l if y >= 2 { break ; \"unreachable\"; }\l y -= 3;\l }\l"]; N12[label="expr x"]; - N13[label="expr 1is"]; - N14[label="expr x == 1is"]; + N13[label="expr 1"]; + N14[label="expr x == 1"]; N15[label="expr break \'outer"]; N16[label="(dummy_node)"]; N17[label="stmt break \'outer ;"]; N18[label="expr \"unreachable\""]; N19[label="stmt \"unreachable\";"]; N20[label="block { break \'outer ; \"unreachable\"; }"]; - N21[label="expr if x == 1is { break \'outer ; \"unreachable\"; }"]; - N22[label="stmt if x == 1is { break \'outer ; \"unreachable\"; }"]; + N21[label="expr if x == 1 { break \'outer ; \"unreachable\"; }"]; + N22[label="stmt if x == 1 { break \'outer ; \"unreachable\"; }"]; N23[label="expr y"]; - N24[label="expr 2is"]; - N25[label="expr y >= 2is"]; + N24[label="expr 2"]; + N25[label="expr y >= 2"]; N26[label="expr break"]; N27[label="(dummy_node)"]; N28[label="stmt break ;"]; N29[label="expr \"unreachable\""]; N30[label="stmt \"unreachable\";"]; N31[label="block { break ; \"unreachable\"; }"]; - N32[label="expr if y >= 2is { break ; \"unreachable\"; }"]; - N33[label="stmt if y >= 2is { break ; \"unreachable\"; }"]; - N34[label="expr 3is"]; + N32[label="expr if y >= 2 { break ; \"unreachable\"; }"]; + N33[label="stmt if y >= 2 { break ; \"unreachable\"; }"]; + N34[label="expr 3"]; N35[label="expr y"]; - N36[label="expr y -= 3is"]; - N37[label="stmt y -= 3is;"]; - N38[label="block {\l if x == 1is { break \'outer ; \"unreachable\"; }\l if y >= 2is { break ; \"unreachable\"; }\l y -= 3is;\l}\l"]; - N39[label="stmt \'inner:\l loop {\l if x == 1is { break \'outer ; \"unreachable\"; }\l if y >= 2is { break ; \"unreachable\"; }\l y -= 3is;\l }\l"]; - N40[label="expr 4is"]; + N36[label="expr y -= 3"]; + N37[label="stmt y -= 3;"]; + N38[label="block {\l if x == 1 { break \'outer ; \"unreachable\"; }\l if y >= 2 { break ; \"unreachable\"; }\l y -= 3;\l}\l"]; + N39[label="stmt \'inner:\l loop {\l if x == 1 { break \'outer ; \"unreachable\"; }\l if y >= 2 { break ; \"unreachable\"; }\l y -= 3;\l }\l"]; + N40[label="expr 4"]; N41[label="expr y"]; - N42[label="expr y -= 4is"]; - N43[label="stmt y -= 4is;"]; - N44[label="expr 5is"]; + N42[label="expr y -= 4"]; + N43[label="stmt y -= 4;"]; + N44[label="expr 5"]; N45[label="expr x"]; - N46[label="expr x -= 5is"]; - N47[label="stmt x -= 5is;"]; - N48[label="block {\l \'inner:\l loop {\l if x == 1is { break \'outer ; \"unreachable\"; }\l if y >= 2is { break ; \"unreachable\"; }\l y -= 3is;\l }\l y -= 4is;\l x -= 5is;\l}\l"]; - N49[label="block {\l let mut x = 15is;\l let mut y = 151is;\l \'outer:\l loop {\l \'inner:\l loop {\l if x == 1is { break \'outer ; \"unreachable\"; }\l if y >= 2is { break ; \"unreachable\"; }\l y -= 3is;\l }\l y -= 4is;\l x -= 5is;\l }\l}\l"]; + N46[label="expr x -= 5"]; + N47[label="stmt x -= 5;"]; + N48[label="block {\l \'inner:\l loop {\l if x == 1 { break \'outer ; \"unreachable\"; }\l if y >= 2 { break ; \"unreachable\"; }\l y -= 3;\l }\l y -= 4;\l x -= 5;\l}\l"]; + N49[label="block {\l let mut x = 15;\l let mut y = 151;\l \'outer:\l loop {\l \'inner:\l loop {\l if x == 1 { break \'outer ; \"unreachable\"; }\l if y >= 2 { break ; \"unreachable\"; }\l y -= 3;\l }\l y -= 4;\l x -= 5;\l }\l}\l"]; N0 -> N2; N2 -> N3; N3 -> N4; diff --git a/src/test/run-make/graphviz-flowgraph/f15.rs b/src/test/run-make/graphviz-flowgraph/f15.rs index a1141eb6768..056458e5558 100644 --- a/src/test/run-make/graphviz-flowgraph/f15.rs +++ b/src/test/run-make/graphviz-flowgraph/f15.rs @@ -10,21 +10,21 @@ #[allow(unreachable_code)] pub fn expr_break_label_15() { - let mut x = 15is; - let mut y = 151is; + let mut x = 15; + let mut y = 151; 'outer: loop { 'inner: loop { - if x == 1is { + if x == 1 { break 'outer; "unreachable"; } - if y >= 2is { + if y >= 2 { break; "unreachable"; } - y -= 3is; + y -= 3; } - y -= 4is; - x -= 5is; + y -= 4; + x -= 5; } } diff --git a/src/test/run-make/graphviz-flowgraph/f16.dot-expected.dot b/src/test/run-make/graphviz-flowgraph/f16.dot-expected.dot index a37869b2264..d7d027cefb5 100644 --- a/src/test/run-make/graphviz-flowgraph/f16.dot-expected.dot +++ b/src/test/run-make/graphviz-flowgraph/f16.dot-expected.dot @@ -1,57 +1,57 @@ digraph block { N0[label="entry"]; N1[label="exit"]; - N2[label="expr 16is"]; + N2[label="expr 16"]; N3[label="local mut x"]; - N4[label="stmt let mut x = 16is;"]; - N5[label="expr 16is"]; + N4[label="stmt let mut x = 16;"]; + N5[label="expr 16"]; N6[label="local mut y"]; - N7[label="stmt let mut y = 16is;"]; + N7[label="stmt let mut y = 16;"]; N8[label="(dummy_node)"]; - N9[label="expr \'outer:\l loop {\l \'inner:\l loop {\l if x == 1is { continue \'outer ; \"unreachable\"; }\l if y >= 1is { break ; \"unreachable\"; }\l y -= 1is;\l }\l y -= 1is;\l x -= 1is;\l }\l"]; + N9[label="expr \'outer:\l loop {\l \'inner:\l loop {\l if x == 1 { continue \'outer ; \"unreachable\"; }\l if y >= 1 { break ; \"unreachable\"; }\l y -= 1;\l }\l y -= 1;\l x -= 1;\l }\l"]; N10[label="(dummy_node)"]; - N11[label="expr \'inner:\l loop {\l if x == 1is { continue \'outer ; \"unreachable\"; }\l if y >= 1is { break ; \"unreachable\"; }\l y -= 1is;\l }\l"]; + N11[label="expr \'inner:\l loop {\l if x == 1 { continue \'outer ; \"unreachable\"; }\l if y >= 1 { break ; \"unreachable\"; }\l y -= 1;\l }\l"]; N12[label="expr x"]; - N13[label="expr 1is"]; - N14[label="expr x == 1is"]; + N13[label="expr 1"]; + N14[label="expr x == 1"]; N15[label="expr continue \'outer"]; N16[label="(dummy_node)"]; N17[label="stmt continue \'outer ;"]; N18[label="expr \"unreachable\""]; N19[label="stmt \"unreachable\";"]; N20[label="block { continue \'outer ; \"unreachable\"; }"]; - N21[label="expr if x == 1is { continue \'outer ; \"unreachable\"; }"]; - N22[label="stmt if x == 1is { continue \'outer ; \"unreachable\"; }"]; + N21[label="expr if x == 1 { continue \'outer ; \"unreachable\"; }"]; + N22[label="stmt if x == 1 { continue \'outer ; \"unreachable\"; }"]; N23[label="expr y"]; - N24[label="expr 1is"]; - N25[label="expr y >= 1is"]; + N24[label="expr 1"]; + N25[label="expr y >= 1"]; N26[label="expr break"]; N27[label="(dummy_node)"]; N28[label="stmt break ;"]; N29[label="expr \"unreachable\""]; N30[label="stmt \"unreachable\";"]; N31[label="block { break ; \"unreachable\"; }"]; - N32[label="expr if y >= 1is { break ; \"unreachable\"; }"]; - N33[label="stmt if y >= 1is { break ; \"unreachable\"; }"]; - N34[label="expr 1is"]; + N32[label="expr if y >= 1 { break ; \"unreachable\"; }"]; + N33[label="stmt if y >= 1 { break ; \"unreachable\"; }"]; + N34[label="expr 1"]; N35[label="expr y"]; - N36[label="expr y -= 1is"]; - N37[label="stmt y -= 1is;"]; - N38[label="block {\l if x == 1is { continue \'outer ; \"unreachable\"; }\l if y >= 1is { break ; \"unreachable\"; }\l y -= 1is;\l}\l"]; - N39[label="stmt \'inner:\l loop {\l if x == 1is { continue \'outer ; \"unreachable\"; }\l if y >= 1is { break ; \"unreachable\"; }\l y -= 1is;\l }\l"]; - N40[label="expr 1is"]; + N36[label="expr y -= 1"]; + N37[label="stmt y -= 1;"]; + N38[label="block {\l if x == 1 { continue \'outer ; \"unreachable\"; }\l if y >= 1 { break ; \"unreachable\"; }\l y -= 1;\l}\l"]; + N39[label="stmt \'inner:\l loop {\l if x == 1 { continue \'outer ; \"unreachable\"; }\l if y >= 1 { break ; \"unreachable\"; }\l y -= 1;\l }\l"]; + N40[label="expr 1"]; N41[label="expr y"]; - N42[label="expr y -= 1is"]; - N43[label="stmt y -= 1is;"]; - N44[label="expr 1is"]; + N42[label="expr y -= 1"]; + N43[label="stmt y -= 1;"]; + N44[label="expr 1"]; N45[label="expr x"]; - N46[label="expr x -= 1is"]; - N47[label="stmt x -= 1is;"]; - N48[label="block {\l \'inner:\l loop {\l if x == 1is { continue \'outer ; \"unreachable\"; }\l if y >= 1is { break ; \"unreachable\"; }\l y -= 1is;\l }\l y -= 1is;\l x -= 1is;\l}\l"]; - N49[label="stmt \'outer:\l loop {\l \'inner:\l loop {\l if x == 1is { continue \'outer ; \"unreachable\"; }\l if y >= 1is { break ; \"unreachable\"; }\l y -= 1is;\l }\l y -= 1is;\l x -= 1is;\l }\l"]; + N46[label="expr x -= 1"]; + N47[label="stmt x -= 1;"]; + N48[label="block {\l \'inner:\l loop {\l if x == 1 { continue \'outer ; \"unreachable\"; }\l if y >= 1 { break ; \"unreachable\"; }\l y -= 1;\l }\l y -= 1;\l x -= 1;\l}\l"]; + N49[label="stmt \'outer:\l loop {\l \'inner:\l loop {\l if x == 1 { continue \'outer ; \"unreachable\"; }\l if y >= 1 { break ; \"unreachable\"; }\l y -= 1;\l }\l y -= 1;\l x -= 1;\l }\l"]; N50[label="expr \"unreachable\""]; N51[label="stmt \"unreachable\";"]; - N52[label="block {\l let mut x = 16is;\l let mut y = 16is;\l \'outer:\l loop {\l \'inner:\l loop {\l if x == 1is { continue \'outer ; \"unreachable\"; }\l if y >= 1is { break ; \"unreachable\"; }\l y -= 1is;\l }\l y -= 1is;\l x -= 1is;\l }\l \"unreachable\";\l}\l"]; + N52[label="block {\l let mut x = 16;\l let mut y = 16;\l \'outer:\l loop {\l \'inner:\l loop {\l if x == 1 { continue \'outer ; \"unreachable\"; }\l if y >= 1 { break ; \"unreachable\"; }\l y -= 1;\l }\l y -= 1;\l x -= 1;\l }\l \"unreachable\";\l}\l"]; N0 -> N2; N2 -> N3; N3 -> N4; diff --git a/src/test/run-make/graphviz-flowgraph/f16.rs b/src/test/run-make/graphviz-flowgraph/f16.rs index 5d0e9f963a0..e225b0080e5 100644 --- a/src/test/run-make/graphviz-flowgraph/f16.rs +++ b/src/test/run-make/graphviz-flowgraph/f16.rs @@ -10,22 +10,22 @@ #[allow(unreachable_code)] pub fn expr_continue_label_16() { - let mut x = 16is; - let mut y = 16is; + let mut x = 16; + let mut y = 16; 'outer: loop { 'inner: loop { - if x == 1is { + if x == 1 { continue 'outer; "unreachable"; } - if y >= 1is { + if y >= 1 { break; "unreachable"; } - y -= 1is; + y -= 1; } - y -= 1is; - x -= 1is; + y -= 1; + x -= 1; } "unreachable"; } diff --git a/src/test/run-make/graphviz-flowgraph/f17.dot-expected.dot b/src/test/run-make/graphviz-flowgraph/f17.dot-expected.dot index 7941b4f7ce5..f87b70a71ca 100644 --- a/src/test/run-make/graphviz-flowgraph/f17.dot-expected.dot +++ b/src/test/run-make/graphviz-flowgraph/f17.dot-expected.dot @@ -1,13 +1,13 @@ digraph block { N0[label="entry"]; N1[label="exit"]; - N2[label="expr 1is"]; - N3[label="expr 7is"]; - N4[label="expr 17is"]; - N5[label="expr [1is, 7is, 17is]"]; + N2[label="expr 1"]; + N3[label="expr 7"]; + N4[label="expr 17"]; + N5[label="expr [1, 7, 17]"]; N6[label="local _v"]; - N7[label="stmt let _v = [1is, 7is, 17is];"]; - N8[label="block { let _v = [1is, 7is, 17is]; }"]; + N7[label="stmt let _v = [1, 7, 17];"]; + N8[label="block { let _v = [1, 7, 17]; }"]; N0 -> N2; N2 -> N3; N3 -> N4; diff --git a/src/test/run-make/graphviz-flowgraph/f17.rs b/src/test/run-make/graphviz-flowgraph/f17.rs index de9b3bd5676..23f5bb8a1eb 100644 --- a/src/test/run-make/graphviz-flowgraph/f17.rs +++ b/src/test/run-make/graphviz-flowgraph/f17.rs @@ -9,5 +9,5 @@ // except according to those terms. pub fn expr_vec_17() { - let _v = [1is, 7is, 17is]; + let _v = [1, 7, 17]; } diff --git a/src/test/run-make/graphviz-flowgraph/f21.dot-expected.dot b/src/test/run-make/graphviz-flowgraph/f21.dot-expected.dot index 46f1634416e..796bf4910c9 100644 --- a/src/test/run-make/graphviz-flowgraph/f21.dot-expected.dot +++ b/src/test/run-make/graphviz-flowgraph/f21.dot-expected.dot @@ -1,52 +1,52 @@ digraph block { N0[label="entry"]; N1[label="exit"]; - N2[label="expr 15is"]; + N2[label="expr 15"]; N3[label="local mut x"]; - N4[label="stmt let mut x = 15is;"]; - N5[label="expr 151is"]; + N4[label="stmt let mut x = 15;"]; + N5[label="expr 151"]; N6[label="local mut y"]; - N7[label="stmt let mut y = 151is;"]; + N7[label="stmt let mut y = 151;"]; N8[label="(dummy_node)"]; - N9[label="expr \'outer:\l loop {\l \'inner:\l loop {\l if x == 1is { break \'outer ; \"unreachable\"; }\l if y >= 2is { return; \"unreachable\"; }\l y -= 3is;\l x -= 5is;\l }\l \"unreachable\";\l }\l"]; + N9[label="expr \'outer:\l loop {\l \'inner:\l loop {\l if x == 1 { break \'outer ; \"unreachable\"; }\l if y >= 2 { return; \"unreachable\"; }\l y -= 3;\l x -= 5;\l }\l \"unreachable\";\l }\l"]; N10[label="(dummy_node)"]; - N11[label="expr \'inner:\l loop {\l if x == 1is { break \'outer ; \"unreachable\"; }\l if y >= 2is { return; \"unreachable\"; }\l y -= 3is;\l x -= 5is;\l }\l"]; + N11[label="expr \'inner:\l loop {\l if x == 1 { break \'outer ; \"unreachable\"; }\l if y >= 2 { return; \"unreachable\"; }\l y -= 3;\l x -= 5;\l }\l"]; N12[label="expr x"]; - N13[label="expr 1is"]; - N14[label="expr x == 1is"]; + N13[label="expr 1"]; + N14[label="expr x == 1"]; N15[label="expr break \'outer"]; N16[label="(dummy_node)"]; N17[label="stmt break \'outer ;"]; N18[label="expr \"unreachable\""]; N19[label="stmt \"unreachable\";"]; N20[label="block { break \'outer ; \"unreachable\"; }"]; - N21[label="expr if x == 1is { break \'outer ; \"unreachable\"; }"]; - N22[label="stmt if x == 1is { break \'outer ; \"unreachable\"; }"]; + N21[label="expr if x == 1 { break \'outer ; \"unreachable\"; }"]; + N22[label="stmt if x == 1 { break \'outer ; \"unreachable\"; }"]; N23[label="expr y"]; - N24[label="expr 2is"]; - N25[label="expr y >= 2is"]; + N24[label="expr 2"]; + N25[label="expr y >= 2"]; N26[label="expr return"]; N27[label="(dummy_node)"]; N28[label="stmt return;"]; N29[label="expr \"unreachable\""]; N30[label="stmt \"unreachable\";"]; N31[label="block { return; \"unreachable\"; }"]; - N32[label="expr if y >= 2is { return; \"unreachable\"; }"]; - N33[label="stmt if y >= 2is { return; \"unreachable\"; }"]; - N34[label="expr 3is"]; + N32[label="expr if y >= 2 { return; \"unreachable\"; }"]; + N33[label="stmt if y >= 2 { return; \"unreachable\"; }"]; + N34[label="expr 3"]; N35[label="expr y"]; - N36[label="expr y -= 3is"]; - N37[label="stmt y -= 3is;"]; - N38[label="expr 5is"]; + N36[label="expr y -= 3"]; + N37[label="stmt y -= 3;"]; + N38[label="expr 5"]; N39[label="expr x"]; - N40[label="expr x -= 5is"]; - N41[label="stmt x -= 5is;"]; - N42[label="block {\l if x == 1is { break \'outer ; \"unreachable\"; }\l if y >= 2is { return; \"unreachable\"; }\l y -= 3is;\l x -= 5is;\l}\l"]; - N43[label="stmt \'inner:\l loop {\l if x == 1is { break \'outer ; \"unreachable\"; }\l if y >= 2is { return; \"unreachable\"; }\l y -= 3is;\l x -= 5is;\l }\l"]; + N40[label="expr x -= 5"]; + N41[label="stmt x -= 5;"]; + N42[label="block {\l if x == 1 { break \'outer ; \"unreachable\"; }\l if y >= 2 { return; \"unreachable\"; }\l y -= 3;\l x -= 5;\l}\l"]; + N43[label="stmt \'inner:\l loop {\l if x == 1 { break \'outer ; \"unreachable\"; }\l if y >= 2 { return; \"unreachable\"; }\l y -= 3;\l x -= 5;\l }\l"]; N44[label="expr \"unreachable\""]; N45[label="stmt \"unreachable\";"]; - N46[label="block {\l \'inner:\l loop {\l if x == 1is { break \'outer ; \"unreachable\"; }\l if y >= 2is { return; \"unreachable\"; }\l y -= 3is;\l x -= 5is;\l }\l \"unreachable\";\l}\l"]; - N47[label="block {\l let mut x = 15is;\l let mut y = 151is;\l \'outer:\l loop {\l \'inner:\l loop {\l if x == 1is { break \'outer ; \"unreachable\"; }\l if y >= 2is { return; \"unreachable\"; }\l y -= 3is;\l x -= 5is;\l }\l \"unreachable\";\l }\l}\l"]; + N46[label="block {\l \'inner:\l loop {\l if x == 1 { break \'outer ; \"unreachable\"; }\l if y >= 2 { return; \"unreachable\"; }\l y -= 3;\l x -= 5;\l }\l \"unreachable\";\l}\l"]; + N47[label="block {\l let mut x = 15;\l let mut y = 151;\l \'outer:\l loop {\l \'inner:\l loop {\l if x == 1 { break \'outer ; \"unreachable\"; }\l if y >= 2 { return; \"unreachable\"; }\l y -= 3;\l x -= 5;\l }\l \"unreachable\";\l }\l}\l"]; N0 -> N2; N2 -> N3; N3 -> N4; diff --git a/src/test/run-make/graphviz-flowgraph/f21.rs b/src/test/run-make/graphviz-flowgraph/f21.rs index 25e93f65110..70083ed8312 100644 --- a/src/test/run-make/graphviz-flowgraph/f21.rs +++ b/src/test/run-make/graphviz-flowgraph/f21.rs @@ -10,20 +10,20 @@ #[allow(unreachable_code)] pub fn expr_break_label_21() { - let mut x = 15is; - let mut y = 151is; + let mut x = 15; + let mut y = 151; 'outer: loop { 'inner: loop { - if x == 1is { + if x == 1 { break 'outer; "unreachable"; } - if y >= 2is { + if y >= 2 { return; "unreachable"; } - y -= 3is; - x -= 5is; + y -= 3; + x -= 5; } "unreachable"; } diff --git a/src/test/run-make/graphviz-flowgraph/f22.dot-expected.dot b/src/test/run-make/graphviz-flowgraph/f22.dot-expected.dot index 3f35a9b0f9a..9e8049f0741 100644 --- a/src/test/run-make/graphviz-flowgraph/f22.dot-expected.dot +++ b/src/test/run-make/graphviz-flowgraph/f22.dot-expected.dot @@ -1,55 +1,55 @@ digraph block { N0[label="entry"]; N1[label="exit"]; - N2[label="expr 15is"]; + N2[label="expr 15"]; N3[label="local mut x"]; - N4[label="stmt let mut x = 15is;"]; - N5[label="expr 151is"]; + N4[label="stmt let mut x = 15;"]; + N5[label="expr 151"]; N6[label="local mut y"]; - N7[label="stmt let mut y = 151is;"]; + N7[label="stmt let mut y = 151;"]; N8[label="(dummy_node)"]; - N9[label="expr \'outer:\l loop {\l \'inner:\l loop {\l if x == 1is { continue \'outer ; \"unreachable\"; }\l if y >= 2is { return; \"unreachable\"; }\l x -= 1is;\l y -= 3is;\l }\l \"unreachable\";\l }\l"]; + N9[label="expr \'outer:\l loop {\l \'inner:\l loop {\l if x == 1 { continue \'outer ; \"unreachable\"; }\l if y >= 2 { return; \"unreachable\"; }\l x -= 1;\l y -= 3;\l }\l \"unreachable\";\l }\l"]; N10[label="(dummy_node)"]; - N11[label="expr \'inner:\l loop {\l if x == 1is { continue \'outer ; \"unreachable\"; }\l if y >= 2is { return; \"unreachable\"; }\l x -= 1is;\l y -= 3is;\l }\l"]; + N11[label="expr \'inner:\l loop {\l if x == 1 { continue \'outer ; \"unreachable\"; }\l if y >= 2 { return; \"unreachable\"; }\l x -= 1;\l y -= 3;\l }\l"]; N12[label="expr x"]; - N13[label="expr 1is"]; - N14[label="expr x == 1is"]; + N13[label="expr 1"]; + N14[label="expr x == 1"]; N15[label="expr continue \'outer"]; N16[label="(dummy_node)"]; N17[label="stmt continue \'outer ;"]; N18[label="expr \"unreachable\""]; N19[label="stmt \"unreachable\";"]; N20[label="block { continue \'outer ; \"unreachable\"; }"]; - N21[label="expr if x == 1is { continue \'outer ; \"unreachable\"; }"]; - N22[label="stmt if x == 1is { continue \'outer ; \"unreachable\"; }"]; + N21[label="expr if x == 1 { continue \'outer ; \"unreachable\"; }"]; + N22[label="stmt if x == 1 { continue \'outer ; \"unreachable\"; }"]; N23[label="expr y"]; - N24[label="expr 2is"]; - N25[label="expr y >= 2is"]; + N24[label="expr 2"]; + N25[label="expr y >= 2"]; N26[label="expr return"]; N27[label="(dummy_node)"]; N28[label="stmt return;"]; N29[label="expr \"unreachable\""]; N30[label="stmt \"unreachable\";"]; N31[label="block { return; \"unreachable\"; }"]; - N32[label="expr if y >= 2is { return; \"unreachable\"; }"]; - N33[label="stmt if y >= 2is { return; \"unreachable\"; }"]; - N34[label="expr 1is"]; + N32[label="expr if y >= 2 { return; \"unreachable\"; }"]; + N33[label="stmt if y >= 2 { return; \"unreachable\"; }"]; + N34[label="expr 1"]; N35[label="expr x"]; - N36[label="expr x -= 1is"]; - N37[label="stmt x -= 1is;"]; - N38[label="expr 3is"]; + N36[label="expr x -= 1"]; + N37[label="stmt x -= 1;"]; + N38[label="expr 3"]; N39[label="expr y"]; - N40[label="expr y -= 3is"]; - N41[label="stmt y -= 3is;"]; - N42[label="block {\l if x == 1is { continue \'outer ; \"unreachable\"; }\l if y >= 2is { return; \"unreachable\"; }\l x -= 1is;\l y -= 3is;\l}\l"]; - N43[label="stmt \'inner:\l loop {\l if x == 1is { continue \'outer ; \"unreachable\"; }\l if y >= 2is { return; \"unreachable\"; }\l x -= 1is;\l y -= 3is;\l }\l"]; + N40[label="expr y -= 3"]; + N41[label="stmt y -= 3;"]; + N42[label="block {\l if x == 1 { continue \'outer ; \"unreachable\"; }\l if y >= 2 { return; \"unreachable\"; }\l x -= 1;\l y -= 3;\l}\l"]; + N43[label="stmt \'inner:\l loop {\l if x == 1 { continue \'outer ; \"unreachable\"; }\l if y >= 2 { return; \"unreachable\"; }\l x -= 1;\l y -= 3;\l }\l"]; N44[label="expr \"unreachable\""]; N45[label="stmt \"unreachable\";"]; - N46[label="block {\l \'inner:\l loop {\l if x == 1is { continue \'outer ; \"unreachable\"; }\l if y >= 2is { return; \"unreachable\"; }\l x -= 1is;\l y -= 3is;\l }\l \"unreachable\";\l}\l"]; - N47[label="stmt \'outer:\l loop {\l \'inner:\l loop {\l if x == 1is { continue \'outer ; \"unreachable\"; }\l if y >= 2is { return; \"unreachable\"; }\l x -= 1is;\l y -= 3is;\l }\l \"unreachable\";\l }\l"]; + N46[label="block {\l \'inner:\l loop {\l if x == 1 { continue \'outer ; \"unreachable\"; }\l if y >= 2 { return; \"unreachable\"; }\l x -= 1;\l y -= 3;\l }\l \"unreachable\";\l}\l"]; + N47[label="stmt \'outer:\l loop {\l \'inner:\l loop {\l if x == 1 { continue \'outer ; \"unreachable\"; }\l if y >= 2 { return; \"unreachable\"; }\l x -= 1;\l y -= 3;\l }\l \"unreachable\";\l }\l"]; N48[label="expr \"unreachable\""]; N49[label="stmt \"unreachable\";"]; - N50[label="block {\l let mut x = 15is;\l let mut y = 151is;\l \'outer:\l loop {\l \'inner:\l loop {\l if x == 1is { continue \'outer ; \"unreachable\"; }\l if y >= 2is { return; \"unreachable\"; }\l x -= 1is;\l y -= 3is;\l }\l \"unreachable\";\l }\l \"unreachable\";\l}\l"]; + N50[label="block {\l let mut x = 15;\l let mut y = 151;\l \'outer:\l loop {\l \'inner:\l loop {\l if x == 1 { continue \'outer ; \"unreachable\"; }\l if y >= 2 { return; \"unreachable\"; }\l x -= 1;\l y -= 3;\l }\l \"unreachable\";\l }\l \"unreachable\";\l}\l"]; N0 -> N2; N2 -> N3; N3 -> N4; diff --git a/src/test/run-make/graphviz-flowgraph/f22.rs b/src/test/run-make/graphviz-flowgraph/f22.rs index 6de703a42f6..b35aac9ec42 100644 --- a/src/test/run-make/graphviz-flowgraph/f22.rs +++ b/src/test/run-make/graphviz-flowgraph/f22.rs @@ -10,20 +10,20 @@ #[allow(unreachable_code)] pub fn expr_break_label_21() { - let mut x = 15is; - let mut y = 151is; + let mut x = 15; + let mut y = 151; 'outer: loop { 'inner: loop { - if x == 1is { + if x == 1 { continue 'outer; "unreachable"; } - if y >= 2is { + if y >= 2 { return; "unreachable"; } - x -= 1is; - y -= 3is; + x -= 1; + y -= 3; } "unreachable"; } diff --git a/src/test/run-make/graphviz-flowgraph/f23.dot-expected.dot b/src/test/run-make/graphviz-flowgraph/f23.dot-expected.dot index c9f7d4cdf0a..b3f285049c5 100644 --- a/src/test/run-make/graphviz-flowgraph/f23.dot-expected.dot +++ b/src/test/run-make/graphviz-flowgraph/f23.dot-expected.dot @@ -1,57 +1,57 @@ digraph block { N0[label="entry"]; N1[label="exit"]; - N2[label="expr 23is"]; + N2[label="expr 23"]; N3[label="local mut x"]; - N4[label="stmt let mut x = 23is;"]; - N5[label="expr 23is"]; + N4[label="stmt let mut x = 23;"]; + N5[label="expr 23"]; N6[label="local mut y"]; - N7[label="stmt let mut y = 23is;"]; - N8[label="expr 23is"]; + N7[label="stmt let mut y = 23;"]; + N8[label="expr 23"]; N9[label="local mut z"]; - N10[label="stmt let mut z = 23is;"]; + N10[label="stmt let mut z = 23;"]; N11[label="(dummy_node)"]; N12[label="expr x"]; - N13[label="expr 0is"]; - N14[label="expr x > 0is"]; - N15[label="expr while x > 0is {\l x -= 1is;\l while y > 0is {\l y -= 1is;\l while z > 0is { z -= 1is; }\l if x > 10is { return; \"unreachable\"; }\l }\l}\l"]; - N16[label="expr 1is"]; + N13[label="expr 0"]; + N14[label="expr x > 0"]; + N15[label="expr while x > 0 {\l x -= 1;\l while y > 0 {\l y -= 1;\l while z > 0 { z -= 1; }\l if x > 10 { return; \"unreachable\"; }\l }\l}\l"]; + N16[label="expr 1"]; N17[label="expr x"]; - N18[label="expr x -= 1is"]; - N19[label="stmt x -= 1is;"]; + N18[label="expr x -= 1"]; + N19[label="stmt x -= 1;"]; N20[label="(dummy_node)"]; N21[label="expr y"]; - N22[label="expr 0is"]; - N23[label="expr y > 0is"]; - N24[label="expr while y > 0is {\l y -= 1is;\l while z > 0is { z -= 1is; }\l if x > 10is { return; \"unreachable\"; }\l}\l"]; - N25[label="expr 1is"]; + N22[label="expr 0"]; + N23[label="expr y > 0"]; + N24[label="expr while y > 0 {\l y -= 1;\l while z > 0 { z -= 1; }\l if x > 10 { return; \"unreachable\"; }\l}\l"]; + N25[label="expr 1"]; N26[label="expr y"]; - N27[label="expr y -= 1is"]; - N28[label="stmt y -= 1is;"]; + N27[label="expr y -= 1"]; + N28[label="stmt y -= 1;"]; N29[label="(dummy_node)"]; N30[label="expr z"]; - N31[label="expr 0is"]; - N32[label="expr z > 0is"]; - N33[label="expr while z > 0is { z -= 1is; }"]; - N34[label="expr 1is"]; + N31[label="expr 0"]; + N32[label="expr z > 0"]; + N33[label="expr while z > 0 { z -= 1; }"]; + N34[label="expr 1"]; N35[label="expr z"]; - N36[label="expr z -= 1is"]; - N37[label="stmt z -= 1is;"]; - N38[label="block { z -= 1is; }"]; - N39[label="stmt while z > 0is { z -= 1is; }"]; + N36[label="expr z -= 1"]; + N37[label="stmt z -= 1;"]; + N38[label="block { z -= 1; }"]; + N39[label="stmt while z > 0 { z -= 1; }"]; N40[label="expr x"]; - N41[label="expr 10is"]; - N42[label="expr x > 10is"]; + N41[label="expr 10"]; + N42[label="expr x > 10"]; N43[label="expr return"]; N44[label="(dummy_node)"]; N45[label="stmt return;"]; N46[label="expr \"unreachable\""]; N47[label="stmt \"unreachable\";"]; N48[label="block { return; \"unreachable\"; }"]; - N49[label="expr if x > 10is { return; \"unreachable\"; }"]; - N50[label="block {\l y -= 1is;\l while z > 0is { z -= 1is; }\l if x > 10is { return; \"unreachable\"; }\l}\l"]; - N51[label="block {\l x -= 1is;\l while y > 0is {\l y -= 1is;\l while z > 0is { z -= 1is; }\l if x > 10is { return; \"unreachable\"; }\l }\l}\l"]; - N52[label="block {\l let mut x = 23is;\l let mut y = 23is;\l let mut z = 23is;\l while x > 0is {\l x -= 1is;\l while y > 0is {\l y -= 1is;\l while z > 0is { z -= 1is; }\l if x > 10is { return; \"unreachable\"; }\l }\l }\l}\l"]; + N49[label="expr if x > 10 { return; \"unreachable\"; }"]; + N50[label="block { y -= 1; while z > 0 { z -= 1; } if x > 10 { return; \"unreachable\"; } }"]; + N51[label="block {\l x -= 1;\l while y > 0 {\l y -= 1;\l while z > 0 { z -= 1; }\l if x > 10 { return; \"unreachable\"; }\l }\l}\l"]; + N52[label="block {\l let mut x = 23;\l let mut y = 23;\l let mut z = 23;\l while x > 0 {\l x -= 1;\l while y > 0 {\l y -= 1;\l while z > 0 { z -= 1; }\l if x > 10 { return; \"unreachable\"; }\l }\l }\l}\l"]; N0 -> N2; N2 -> N3; N3 -> N4; diff --git a/src/test/run-make/graphviz-flowgraph/f23.rs b/src/test/run-make/graphviz-flowgraph/f23.rs index 6ffa1838903..52341a3fbd4 100644 --- a/src/test/run-make/graphviz-flowgraph/f23.rs +++ b/src/test/run-make/graphviz-flowgraph/f23.rs @@ -10,19 +10,19 @@ #[allow(unreachable_code)] pub fn expr_while_23() { - let mut x = 23is; - let mut y = 23is; - let mut z = 23is; + let mut x = 23; + let mut y = 23; + let mut z = 23; - while x > 0is { - x -= 1is; + while x > 0 { + x -= 1; - while y > 0is { - y -= 1is; + while y > 0 { + y -= 1; - while z > 0is { z -= 1is; } + while z > 0 { z -= 1; } - if x > 10is { + if x > 10 { return; "unreachable"; } diff --git a/src/test/run-make/graphviz-flowgraph/f24.dot-expected.dot b/src/test/run-make/graphviz-flowgraph/f24.dot-expected.dot index a5373bda39b..43b3295bf3b 100644 --- a/src/test/run-make/graphviz-flowgraph/f24.dot-expected.dot +++ b/src/test/run-make/graphviz-flowgraph/f24.dot-expected.dot @@ -1,81 +1,81 @@ digraph block { N0[label="entry"]; N1[label="exit"]; - N2[label="expr 24is"]; + N2[label="expr 24"]; N3[label="local mut x"]; - N4[label="stmt let mut x = 24is;"]; - N5[label="expr 24is"]; + N4[label="stmt let mut x = 24;"]; + N5[label="expr 24"]; N6[label="local mut y"]; - N7[label="stmt let mut y = 24is;"]; - N8[label="expr 24is"]; + N7[label="stmt let mut y = 24;"]; + N8[label="expr 24"]; N9[label="local mut z"]; - N10[label="stmt let mut z = 24is;"]; + N10[label="stmt let mut z = 24;"]; N11[label="(dummy_node)"]; - N12[label="expr loop {\l if x == 0is { break ; \"unreachable\"; }\l x -= 1is;\l loop {\l if y == 0is { break ; \"unreachable\"; }\l y -= 1is;\l loop { if z == 0is { break ; \"unreachable\"; } z -= 1is; }\l if x > 10is { return; \"unreachable\"; }\l }\l}\l"]; + N12[label="expr loop {\l if x == 0 { break ; \"unreachable\"; }\l x -= 1;\l loop {\l if y == 0 { break ; \"unreachable\"; }\l y -= 1;\l loop { if z == 0 { break ; \"unreachable\"; } z -= 1; }\l if x > 10 { return; \"unreachable\"; }\l }\l}\l"]; N13[label="expr x"]; - N14[label="expr 0is"]; - N15[label="expr x == 0is"]; + N14[label="expr 0"]; + N15[label="expr x == 0"]; N16[label="expr break"]; N17[label="(dummy_node)"]; N18[label="stmt break ;"]; N19[label="expr \"unreachable\""]; N20[label="stmt \"unreachable\";"]; N21[label="block { break ; \"unreachable\"; }"]; - N22[label="expr if x == 0is { break ; \"unreachable\"; }"]; - N23[label="stmt if x == 0is { break ; \"unreachable\"; }"]; - N24[label="expr 1is"]; + N22[label="expr if x == 0 { break ; \"unreachable\"; }"]; + N23[label="stmt if x == 0 { break ; \"unreachable\"; }"]; + N24[label="expr 1"]; N25[label="expr x"]; - N26[label="expr x -= 1is"]; - N27[label="stmt x -= 1is;"]; + N26[label="expr x -= 1"]; + N27[label="stmt x -= 1;"]; N28[label="(dummy_node)"]; - N29[label="expr loop {\l if y == 0is { break ; \"unreachable\"; }\l y -= 1is;\l loop { if z == 0is { break ; \"unreachable\"; } z -= 1is; }\l if x > 10is { return; \"unreachable\"; }\l}\l"]; + N29[label="expr loop {\l if y == 0 { break ; \"unreachable\"; }\l y -= 1;\l loop { if z == 0 { break ; \"unreachable\"; } z -= 1; }\l if x > 10 { return; \"unreachable\"; }\l}\l"]; N30[label="expr y"]; - N31[label="expr 0is"]; - N32[label="expr y == 0is"]; + N31[label="expr 0"]; + N32[label="expr y == 0"]; N33[label="expr break"]; N34[label="(dummy_node)"]; N35[label="stmt break ;"]; N36[label="expr \"unreachable\""]; N37[label="stmt \"unreachable\";"]; N38[label="block { break ; \"unreachable\"; }"]; - N39[label="expr if y == 0is { break ; \"unreachable\"; }"]; - N40[label="stmt if y == 0is { break ; \"unreachable\"; }"]; - N41[label="expr 1is"]; + N39[label="expr if y == 0 { break ; \"unreachable\"; }"]; + N40[label="stmt if y == 0 { break ; \"unreachable\"; }"]; + N41[label="expr 1"]; N42[label="expr y"]; - N43[label="expr y -= 1is"]; - N44[label="stmt y -= 1is;"]; + N43[label="expr y -= 1"]; + N44[label="stmt y -= 1;"]; N45[label="(dummy_node)"]; - N46[label="expr loop { if z == 0is { break ; \"unreachable\"; } z -= 1is; }"]; + N46[label="expr loop { if z == 0 { break ; \"unreachable\"; } z -= 1; }"]; N47[label="expr z"]; - N48[label="expr 0is"]; - N49[label="expr z == 0is"]; + N48[label="expr 0"]; + N49[label="expr z == 0"]; N50[label="expr break"]; N51[label="(dummy_node)"]; N52[label="stmt break ;"]; N53[label="expr \"unreachable\""]; N54[label="stmt \"unreachable\";"]; N55[label="block { break ; \"unreachable\"; }"]; - N56[label="expr if z == 0is { break ; \"unreachable\"; }"]; - N57[label="stmt if z == 0is { break ; \"unreachable\"; }"]; - N58[label="expr 1is"]; + N56[label="expr if z == 0 { break ; \"unreachable\"; }"]; + N57[label="stmt if z == 0 { break ; \"unreachable\"; }"]; + N58[label="expr 1"]; N59[label="expr z"]; - N60[label="expr z -= 1is"]; - N61[label="stmt z -= 1is;"]; - N62[label="block { if z == 0is { break ; \"unreachable\"; } z -= 1is; }"]; - N63[label="stmt loop { if z == 0is { break ; \"unreachable\"; } z -= 1is; }"]; + N60[label="expr z -= 1"]; + N61[label="stmt z -= 1;"]; + N62[label="block { if z == 0 { break ; \"unreachable\"; } z -= 1; }"]; + N63[label="stmt loop { if z == 0 { break ; \"unreachable\"; } z -= 1; }"]; N64[label="expr x"]; - N65[label="expr 10is"]; - N66[label="expr x > 10is"]; + N65[label="expr 10"]; + N66[label="expr x > 10"]; N67[label="expr return"]; N68[label="(dummy_node)"]; N69[label="stmt return;"]; N70[label="expr \"unreachable\""]; N71[label="stmt \"unreachable\";"]; N72[label="block { return; \"unreachable\"; }"]; - N73[label="expr if x > 10is { return; \"unreachable\"; }"]; - N74[label="block {\l if y == 0is { break ; \"unreachable\"; }\l y -= 1is;\l loop { if z == 0is { break ; \"unreachable\"; } z -= 1is; }\l if x > 10is { return; \"unreachable\"; }\l}\l"]; - N75[label="block {\l if x == 0is { break ; \"unreachable\"; }\l x -= 1is;\l loop {\l if y == 0is { break ; \"unreachable\"; }\l y -= 1is;\l loop { if z == 0is { break ; \"unreachable\"; } z -= 1is; }\l if x > 10is { return; \"unreachable\"; }\l }\l}\l"]; - N76[label="block {\l let mut x = 24is;\l let mut y = 24is;\l let mut z = 24is;\l loop {\l if x == 0is { break ; \"unreachable\"; }\l x -= 1is;\l loop {\l if y == 0is { break ; \"unreachable\"; }\l y -= 1is;\l loop { if z == 0is { break ; \"unreachable\"; } z -= 1is; }\l if x > 10is { return; \"unreachable\"; }\l }\l }\l}\l"]; + N73[label="expr if x > 10 { return; \"unreachable\"; }"]; + N74[label="block {\l if y == 0 { break ; \"unreachable\"; }\l y -= 1;\l loop { if z == 0 { break ; \"unreachable\"; } z -= 1; }\l if x > 10 { return; \"unreachable\"; }\l}\l"]; + N75[label="block {\l if x == 0 { break ; \"unreachable\"; }\l x -= 1;\l loop {\l if y == 0 { break ; \"unreachable\"; }\l y -= 1;\l loop { if z == 0 { break ; \"unreachable\"; } z -= 1; }\l if x > 10 { return; \"unreachable\"; }\l }\l}\l"]; + N76[label="block {\l let mut x = 24;\l let mut y = 24;\l let mut z = 24;\l loop {\l if x == 0 { break ; \"unreachable\"; }\l x -= 1;\l loop {\l if y == 0 { break ; \"unreachable\"; }\l y -= 1;\l loop { if z == 0 { break ; \"unreachable\"; } z -= 1; }\l if x > 10 { return; \"unreachable\"; }\l }\l }\l}\l"]; N0 -> N2; N2 -> N3; N3 -> N4; diff --git a/src/test/run-make/graphviz-flowgraph/f24.rs b/src/test/run-make/graphviz-flowgraph/f24.rs index ebaf7f28101..f796d660a18 100644 --- a/src/test/run-make/graphviz-flowgraph/f24.rs +++ b/src/test/run-make/graphviz-flowgraph/f24.rs @@ -10,24 +10,24 @@ #[allow(unreachable_code)] pub fn expr_while_24() { - let mut x = 24is; - let mut y = 24is; - let mut z = 24is; + let mut x = 24; + let mut y = 24; + let mut z = 24; loop { - if x == 0is { break; "unreachable"; } - x -= 1is; + if x == 0 { break; "unreachable"; } + x -= 1; loop { - if y == 0is { break; "unreachable"; } - y -= 1is; + if y == 0 { break; "unreachable"; } + y -= 1; loop { - if z == 0is { break; "unreachable"; } - z -= 1is; + if z == 0 { break; "unreachable"; } + z -= 1; } - if x > 10is { + if x > 10 { return; "unreachable"; } diff --git a/src/test/run-make/graphviz-flowgraph/f25.dot-expected.dot b/src/test/run-make/graphviz-flowgraph/f25.dot-expected.dot index 2611219e816..50fdffb781d 100644 --- a/src/test/run-make/graphviz-flowgraph/f25.dot-expected.dot +++ b/src/test/run-make/graphviz-flowgraph/f25.dot-expected.dot @@ -1,81 +1,81 @@ digraph block { N0[label="entry"]; N1[label="exit"]; - N2[label="expr 25is"]; + N2[label="expr 25"]; N3[label="local mut x"]; - N4[label="stmt let mut x = 25is;"]; - N5[label="expr 25is"]; + N4[label="stmt let mut x = 25;"]; + N5[label="expr 25"]; N6[label="local mut y"]; - N7[label="stmt let mut y = 25is;"]; - N8[label="expr 25is"]; + N7[label="stmt let mut y = 25;"]; + N8[label="expr 25"]; N9[label="local mut z"]; - N10[label="stmt let mut z = 25is;"]; + N10[label="stmt let mut z = 25;"]; N11[label="(dummy_node)"]; - N12[label="expr \'a:\l loop {\l if x == 0is { break ; \"unreachable\"; }\l x -= 1is;\l \'a:\l loop {\l if y == 0is { break ; \"unreachable\"; }\l y -= 1is;\l \'a: loop { if z == 0is { break ; \"unreachable\"; } z -= 1is; }\l if x > 10is { continue \'a ; \"unreachable\"; }\l }\l }\l"]; + N12[label="expr \'a:\l loop {\l if x == 0 { break ; \"unreachable\"; }\l x -= 1;\l \'a:\l loop {\l if y == 0 { break ; \"unreachable\"; }\l y -= 1;\l \'a: loop { if z == 0 { break ; \"unreachable\"; } z -= 1; }\l if x > 10 { continue \'a ; \"unreachable\"; }\l }\l }\l"]; N13[label="expr x"]; - N14[label="expr 0is"]; - N15[label="expr x == 0is"]; + N14[label="expr 0"]; + N15[label="expr x == 0"]; N16[label="expr break"]; N17[label="(dummy_node)"]; N18[label="stmt break ;"]; N19[label="expr \"unreachable\""]; N20[label="stmt \"unreachable\";"]; N21[label="block { break ; \"unreachable\"; }"]; - N22[label="expr if x == 0is { break ; \"unreachable\"; }"]; - N23[label="stmt if x == 0is { break ; \"unreachable\"; }"]; - N24[label="expr 1is"]; + N22[label="expr if x == 0 { break ; \"unreachable\"; }"]; + N23[label="stmt if x == 0 { break ; \"unreachable\"; }"]; + N24[label="expr 1"]; N25[label="expr x"]; - N26[label="expr x -= 1is"]; - N27[label="stmt x -= 1is;"]; + N26[label="expr x -= 1"]; + N27[label="stmt x -= 1;"]; N28[label="(dummy_node)"]; - N29[label="expr \'a:\l loop {\l if y == 0is { break ; \"unreachable\"; }\l y -= 1is;\l \'a: loop { if z == 0is { break ; \"unreachable\"; } z -= 1is; }\l if x > 10is { continue \'a ; \"unreachable\"; }\l }\l"]; + N29[label="expr \'a:\l loop {\l if y == 0 { break ; \"unreachable\"; }\l y -= 1;\l \'a: loop { if z == 0 { break ; \"unreachable\"; } z -= 1; }\l if x > 10 { continue \'a ; \"unreachable\"; }\l }\l"]; N30[label="expr y"]; - N31[label="expr 0is"]; - N32[label="expr y == 0is"]; + N31[label="expr 0"]; + N32[label="expr y == 0"]; N33[label="expr break"]; N34[label="(dummy_node)"]; N35[label="stmt break ;"]; N36[label="expr \"unreachable\""]; N37[label="stmt \"unreachable\";"]; N38[label="block { break ; \"unreachable\"; }"]; - N39[label="expr if y == 0is { break ; \"unreachable\"; }"]; - N40[label="stmt if y == 0is { break ; \"unreachable\"; }"]; - N41[label="expr 1is"]; + N39[label="expr if y == 0 { break ; \"unreachable\"; }"]; + N40[label="stmt if y == 0 { break ; \"unreachable\"; }"]; + N41[label="expr 1"]; N42[label="expr y"]; - N43[label="expr y -= 1is"]; - N44[label="stmt y -= 1is;"]; + N43[label="expr y -= 1"]; + N44[label="stmt y -= 1;"]; N45[label="(dummy_node)"]; - N46[label="expr \'a: loop { if z == 0is { break ; \"unreachable\"; } z -= 1is; }"]; + N46[label="expr \'a: loop { if z == 0 { break ; \"unreachable\"; } z -= 1; }"]; N47[label="expr z"]; - N48[label="expr 0is"]; - N49[label="expr z == 0is"]; + N48[label="expr 0"]; + N49[label="expr z == 0"]; N50[label="expr break"]; N51[label="(dummy_node)"]; N52[label="stmt break ;"]; N53[label="expr \"unreachable\""]; N54[label="stmt \"unreachable\";"]; N55[label="block { break ; \"unreachable\"; }"]; - N56[label="expr if z == 0is { break ; \"unreachable\"; }"]; - N57[label="stmt if z == 0is { break ; \"unreachable\"; }"]; - N58[label="expr 1is"]; + N56[label="expr if z == 0 { break ; \"unreachable\"; }"]; + N57[label="stmt if z == 0 { break ; \"unreachable\"; }"]; + N58[label="expr 1"]; N59[label="expr z"]; - N60[label="expr z -= 1is"]; - N61[label="stmt z -= 1is;"]; - N62[label="block { if z == 0is { break ; \"unreachable\"; } z -= 1is; }"]; - N63[label="stmt \'a: loop { if z == 0is { break ; \"unreachable\"; } z -= 1is; }"]; + N60[label="expr z -= 1"]; + N61[label="stmt z -= 1;"]; + N62[label="block { if z == 0 { break ; \"unreachable\"; } z -= 1; }"]; + N63[label="stmt \'a: loop { if z == 0 { break ; \"unreachable\"; } z -= 1; }"]; N64[label="expr x"]; - N65[label="expr 10is"]; - N66[label="expr x > 10is"]; + N65[label="expr 10"]; + N66[label="expr x > 10"]; N67[label="expr continue \'a"]; N68[label="(dummy_node)"]; N69[label="stmt continue \'a ;"]; N70[label="expr \"unreachable\""]; N71[label="stmt \"unreachable\";"]; N72[label="block { continue \'a ; \"unreachable\"; }"]; - N73[label="expr if x > 10is { continue \'a ; \"unreachable\"; }"]; - N74[label="block {\l if y == 0is { break ; \"unreachable\"; }\l y -= 1is;\l \'a: loop { if z == 0is { break ; \"unreachable\"; } z -= 1is; }\l if x > 10is { continue \'a ; \"unreachable\"; }\l}\l"]; - N75[label="block {\l if x == 0is { break ; \"unreachable\"; }\l x -= 1is;\l \'a:\l loop {\l if y == 0is { break ; \"unreachable\"; }\l y -= 1is;\l \'a: loop { if z == 0is { break ; \"unreachable\"; } z -= 1is; }\l if x > 10is { continue \'a ; \"unreachable\"; }\l }\l}\l"]; - N76[label="block {\l let mut x = 25is;\l let mut y = 25is;\l let mut z = 25is;\l \'a:\l loop {\l if x == 0is { break ; \"unreachable\"; }\l x -= 1is;\l \'a:\l loop {\l if y == 0is { break ; \"unreachable\"; }\l y -= 1is;\l \'a:\l loop {\l if z == 0is { break ; \"unreachable\"; }\l z -= 1is;\l }\l if x > 10is { continue \'a ; \"unreachable\"; }\l }\l }\l}\l"]; + N73[label="expr if x > 10 { continue \'a ; \"unreachable\"; }"]; + N74[label="block {\l if y == 0 { break ; \"unreachable\"; }\l y -= 1;\l \'a: loop { if z == 0 { break ; \"unreachable\"; } z -= 1; }\l if x > 10 { continue \'a ; \"unreachable\"; }\l}\l"]; + N75[label="block {\l if x == 0 { break ; \"unreachable\"; }\l x -= 1;\l \'a:\l loop {\l if y == 0 { break ; \"unreachable\"; }\l y -= 1;\l \'a: loop { if z == 0 { break ; \"unreachable\"; } z -= 1; }\l if x > 10 { continue \'a ; \"unreachable\"; }\l }\l}\l"]; + N76[label="block {\l let mut x = 25;\l let mut y = 25;\l let mut z = 25;\l \'a:\l loop {\l if x == 0 { break ; \"unreachable\"; }\l x -= 1;\l \'a:\l loop {\l if y == 0 { break ; \"unreachable\"; }\l y -= 1;\l \'a: loop { if z == 0 { break ; \"unreachable\"; } z -= 1; }\l if x > 10 { continue \'a ; \"unreachable\"; }\l }\l }\l}\l"]; N0 -> N2; N2 -> N3; N3 -> N4; diff --git a/src/test/run-make/graphviz-flowgraph/f25.rs b/src/test/run-make/graphviz-flowgraph/f25.rs index 8896a854787..2ee2e48fd10 100644 --- a/src/test/run-make/graphviz-flowgraph/f25.rs +++ b/src/test/run-make/graphviz-flowgraph/f25.rs @@ -10,24 +10,24 @@ #[allow(unreachable_code)] pub fn expr_while_25() { - let mut x = 25is; - let mut y = 25is; - let mut z = 25is; + let mut x = 25; + let mut y = 25; + let mut z = 25; 'a: loop { - if x == 0is { break; "unreachable"; } - x -= 1is; + if x == 0 { break; "unreachable"; } + x -= 1; 'a: loop { - if y == 0is { break; "unreachable"; } - y -= 1is; + if y == 0 { break; "unreachable"; } + y -= 1; 'a: loop { - if z == 0is { break; "unreachable"; } - z -= 1is; + if z == 0 { break; "unreachable"; } + z -= 1; } - if x > 10is { + if x > 10 { continue 'a; "unreachable"; } diff --git a/src/test/run-make/save-analysis/foo.rs b/src/test/run-make/save-analysis/foo.rs index 690f40b4f5b..cb3b3d9af38 100644 --- a/src/test/run-make/save-analysis/foo.rs +++ b/src/test/run-make/save-analysis/foo.rs @@ -50,7 +50,7 @@ fn test_alias<I: Iterator>(i: Option<<I as Iterator>::Item>) { myflate::deflate_bytes(&[]); - let x = (3is, 4us); + let x = (3, 4us); let y = x.1; } diff --git a/src/test/run-pass/ifmt.rs b/src/test/run-pass/ifmt.rs index 0acc70f6b5d..ce628668996 100644 --- a/src/test/run-pass/ifmt.rs +++ b/src/test/run-pass/ifmt.rs @@ -77,8 +77,8 @@ pub fn main() { t!(format!("{:X}", B), "adios"); t!(format!("foo {} ☃☃☃☃☃☃", "bar"), "foo bar ☃☃☃☃☃☃"); t!(format!("{1} {0}", 0, 1), "1 0"); - t!(format!("{foo} {bar}", foo=0, bar=1is), "0 1"); - t!(format!("{foo} {1} {bar} {0}", 0is, 1is, foo=2is, bar=3is), "2 1 3 0"); + t!(format!("{foo} {bar}", foo=0, bar=1), "0 1"); + t!(format!("{foo} {1} {bar} {0}", 0, 1, foo=2, bar=3), "2 1 3 0"); t!(format!("{} {0}", "a"), "a a"); t!(format!("{foo_bar}", foo_bar=1), "1"); t!(format!("{}", 5 + 5), "10"); diff --git a/src/test/run-pass/issue-13494.rs b/src/test/run-pass/issue-13494.rs index 5025d403468..95562d75c3e 100644 --- a/src/test/run-pass/issue-13494.rs +++ b/src/test/run-pass/issue-13494.rs @@ -25,7 +25,7 @@ fn main() { let _t = Thread::spawn(move|| { helper(rx) }); let (snd, rcv) = channel::<int>(); for _ in 1..100000 { - snd.send(1i).unwrap(); + snd.send(1).unwrap(); let (tx2, rx2) = channel(); tx.send(tx2).unwrap(); select! { diff --git a/src/test/run-pass/numeric-method-autoexport.rs b/src/test/run-pass/numeric-method-autoexport.rs index 140cf33cd1d..fec4a806b43 100644 --- a/src/test/run-pass/numeric-method-autoexport.rs +++ b/src/test/run-pass/numeric-method-autoexport.rs @@ -29,7 +29,7 @@ pub fn main() { // uints // num - assert_eq!(15u.add(6us), 21us); + assert_eq!(15us.add(6us), 21us); assert_eq!(15u8.add(6u8), 21u8); assert_eq!(15u16.add(6u16), 21u16); assert_eq!(15u32.add(6u32), 21u32); @@ -37,6 +37,6 @@ pub fn main() { // floats // num - assert_eq!(10f32.to_int().unwrap(), 10); - assert_eq!(10f64.to_int().unwrap(), 10); + assert_eq!(10f32.to_i32().unwrap(), 10); + assert_eq!(10f64.to_i32().unwrap(), 10); } |