Skip to content

Commit 01615b0

Browse files
nikomatsakisnikomatsakis
committed
Convert required suffixes into a use of as.
1 parent 2b5720a commit 01615b0

File tree

13 files changed

+102
-102
lines changed

13 files changed

+102
-102
lines changed

‎src/libcoretest/any.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ fn any_referenced() {
3535

3636
#[test]
3737
fn any_owning() {
38-
let (a, b, c) = (box 5us as Box<Any>, box TEST as Box<Any>, box Test as Box<Any>);
38+
let (a, b, c) = (box 5_usize as Box<Any>, box TEST as Box<Any>, box Test as Box<Any>);
3939

4040
assert!(a.is::<uint>());
4141
assert!(!b.is::<uint>());
@@ -52,7 +52,7 @@ fn any_owning() {
5252

5353
#[test]
5454
fn any_downcast_ref() {
55-
let a = &5us as &Any;
55+
let a = &5_usize as &Any;
5656

5757
match a.downcast_ref::<uint>() {
5858
Some(&5) => {}
@@ -67,8 +67,8 @@ fn any_downcast_ref() {
6767

6868
#[test]
6969
fn any_downcast_mut() {
70-
let mut a = 5us;
71-
let mut b = box 7us;
70+
let mut a = 5_usize;
71+
let mut b = box 7_usize;
7272

7373
let a_r = &mut a as &mut Any;
7474
let tmp: &mut uint = &mut *b;
@@ -113,7 +113,7 @@ fn any_downcast_mut() {
113113

114114
#[test]
115115
fn any_fixed_vec() {
116-
let test = [0us; 8];
116+
let test = [0_usize; 8];
117117
let test = &test as &Any;
118118
assert!(test.is::<[uint; 8]>());
119119
assert!(!test.is::<[uint; 10]>());

‎src/libcoretest/fmt/num.rs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,68 +16,68 @@ fn test_format_int() {
1616
// Formatting integers should select the right implementation based off
1717
// the type of the argument. Also, hex/octal/binary should be defined
1818
// for integers, but they shouldn't emit the negative sign.
19-
assert!(format!("{}", 1is) == "1");
19+
assert!(format!("{}", 1isize) == "1");
2020
assert!(format!("{}", 1i8) == "1");
2121
assert!(format!("{}", 1i16) == "1");
2222
assert!(format!("{}", 1i32) == "1");
2323
assert!(format!("{}", 1i64) == "1");
24-
assert!(format!("{}", -1is) == "-1");
24+
assert!(format!("{}", -1isize) == "-1");
2525
assert!(format!("{}", -1i8) == "-1");
2626
assert!(format!("{}", -1i16) == "-1");
2727
assert!(format!("{}", -1i32) == "-1");
2828
assert!(format!("{}", -1i64) == "-1");
29-
assert!(format!("{:?}", 1is) == "1");
29+
assert!(format!("{:?}", 1isize) == "1");
3030
assert!(format!("{:?}", 1i8) == "1");
3131
assert!(format!("{:?}", 1i16) == "1");
3232
assert!(format!("{:?}", 1i32) == "1");
3333
assert!(format!("{:?}", 1i64) == "1");
34-
assert!(format!("{:b}", 1is) == "1");
34+
assert!(format!("{:b}", 1isize) == "1");
3535
assert!(format!("{:b}", 1i8) == "1");
3636
assert!(format!("{:b}", 1i16) == "1");
3737
assert!(format!("{:b}", 1i32) == "1");
3838
assert!(format!("{:b}", 1i64) == "1");
39-
assert!(format!("{:x}", 1is) == "1");
39+
assert!(format!("{:x}", 1isize) == "1");
4040
assert!(format!("{:x}", 1i8) == "1");
4141
assert!(format!("{:x}", 1i16) == "1");
4242
assert!(format!("{:x}", 1i32) == "1");
4343
assert!(format!("{:x}", 1i64) == "1");
44-
assert!(format!("{:X}", 1is) == "1");
44+
assert!(format!("{:X}", 1isize) == "1");
4545
assert!(format!("{:X}", 1i8) == "1");
4646
assert!(format!("{:X}", 1i16) == "1");
4747
assert!(format!("{:X}", 1i32) == "1");
4848
assert!(format!("{:X}", 1i64) == "1");
49-
assert!(format!("{:o}", 1is) == "1");
49+
assert!(format!("{:o}", 1isize) == "1");
5050
assert!(format!("{:o}", 1i8) == "1");
5151
assert!(format!("{:o}", 1i16) == "1");
5252
assert!(format!("{:o}", 1i32) == "1");
5353
assert!(format!("{:o}", 1i64) == "1");
5454

55-
assert!(format!("{}", 1us) == "1");
55+
assert!(format!("{}", 1usize) == "1");
5656
assert!(format!("{}", 1u8) == "1");
5757
assert!(format!("{}", 1u16) == "1");
5858
assert!(format!("{}", 1u32) == "1");
5959
assert!(format!("{}", 1u64) == "1");
60-
assert!(format!("{:?}", 1us) == "1");
60+
assert!(format!("{:?}", 1usize) == "1");
6161
assert!(format!("{:?}", 1u8) == "1");
6262
assert!(format!("{:?}", 1u16) == "1");
6363
assert!(format!("{:?}", 1u32) == "1");
6464
assert!(format!("{:?}", 1u64) == "1");
65-
assert!(format!("{:b}", 1us) == "1");
65+
assert!(format!("{:b}", 1usize) == "1");
6666
assert!(format!("{:b}", 1u8) == "1");
6767
assert!(format!("{:b}", 1u16) == "1");
6868
assert!(format!("{:b}", 1u32) == "1");
6969
assert!(format!("{:b}", 1u64) == "1");
70-
assert!(format!("{:x}", 1us) == "1");
70+
assert!(format!("{:x}", 1usize) == "1");
7171
assert!(format!("{:x}", 1u8) == "1");
7272
assert!(format!("{:x}", 1u16) == "1");
7373
assert!(format!("{:x}", 1u32) == "1");
7474
assert!(format!("{:x}", 1u64) == "1");
75-
assert!(format!("{:X}", 1us) == "1");
75+
assert!(format!("{:X}", 1usize) == "1");
7676
assert!(format!("{:X}", 1u8) == "1");
7777
assert!(format!("{:X}", 1u16) == "1");
7878
assert!(format!("{:X}", 1u32) == "1");
7979
assert!(format!("{:X}", 1u64) == "1");
80-
assert!(format!("{:o}", 1us) == "1");
80+
assert!(format!("{:o}", 1usize) == "1");
8181
assert!(format!("{:o}", 1u8) == "1");
8282
assert!(format!("{:o}", 1u16) == "1");
8383
assert!(format!("{:o}", 1u32) == "1");

‎src/libcoretest/hash/mod.rs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -46,17 +46,17 @@ fn test_writer_hasher() {
4646

4747
assert_eq!(hash(&()), 0);
4848

49-
assert_eq!(hash(&5u8), 5);
50-
assert_eq!(hash(&5u16), 5);
51-
assert_eq!(hash(&5u32), 5);
52-
assert_eq!(hash(&5u64), 5);
53-
assert_eq!(hash(&5us), 5);
54-
55-
assert_eq!(hash(&5i8), 5);
56-
assert_eq!(hash(&5i16), 5);
57-
assert_eq!(hash(&5i32), 5);
58-
assert_eq!(hash(&5i64), 5);
59-
assert_eq!(hash(&5is), 5);
49+
assert_eq!(hash(&5_u8), 5);
50+
assert_eq!(hash(&5_u16), 5);
51+
assert_eq!(hash(&5_u32), 5);
52+
assert_eq!(hash(&5_u64), 5);
53+
assert_eq!(hash(&5_usize), 5);
54+
55+
assert_eq!(hash(&5_i8), 5);
56+
assert_eq!(hash(&5_i16), 5);
57+
assert_eq!(hash(&5_i32), 5);
58+
assert_eq!(hash(&5_i64), 5);
59+
assert_eq!(hash(&5_isize), 5);
6060

6161
assert_eq!(hash(&false), 0);
6262
assert_eq!(hash(&true), 1);
@@ -76,12 +76,12 @@ fn test_writer_hasher() {
7676
// FIXME (#18248) Add tests for hashing Rc<str> and Rc<[T]>
7777

7878
unsafe {
79-
let ptr: *const i32 = mem::transmute(5us);
79+
let ptr: *const i32 = mem::transmute(5_usize);
8080
assert_eq!(hash(&ptr), 5);
8181
}
8282

8383
unsafe {
84-
let ptr: *mut i32 = mem::transmute(5us);
84+
let ptr: *mut i32 = mem::transmute(5_usize);
8585
assert_eq!(hash(&ptr), 5);
8686
}
8787
}

‎src/librustc/lint/builtin.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -494,13 +494,12 @@ pub struct BoxPointers;
494494
impl BoxPointers {
495495
fn check_heap_type<'a, 'tcx>(&self, cx: &Context<'a, 'tcx>,
496496
span: Span, ty: Ty<'tcx>) {
497-
let mut n_uniq = 0us;
497+
let mut n_uniq: usize = 0;
498498
ty::fold_ty(cx.tcx, ty, |t| {
499499
match t.sty {
500500
ty::ty_uniq(_) => {
501501
n_uniq += 1;
502502
}
503-
504503
_ => ()
505504
};
506505
t

‎src/libserialize/json.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3905,12 +3905,12 @@ mod tests {
39053905

39063906
assert_eq!(array2.to_json(), array2);
39073907
assert_eq!(object.to_json(), object);
3908-
assert_eq!(3_i.to_json(), I64(3));
3908+
assert_eq!(3_isize.to_json(), I64(3));
39093909
assert_eq!(4_i8.to_json(), I64(4));
39103910
assert_eq!(5_i16.to_json(), I64(5));
39113911
assert_eq!(6_i32.to_json(), I64(6));
39123912
assert_eq!(7_i64.to_json(), I64(7));
3913-
assert_eq!(8_u.to_json(), U64(8));
3913+
assert_eq!(8_usize.to_json(), U64(8));
39143914
assert_eq!(9_u8.to_json(), U64(9));
39153915
assert_eq!(10_u16.to_json(), U64(10));
39163916
assert_eq!(11_u32.to_json(), U64(11));
@@ -3924,22 +3924,22 @@ mod tests {
39243924
assert_eq!(false.to_json(), Boolean(false));
39253925
assert_eq!("abc".to_json(), String("abc".to_string()));
39263926
assert_eq!("abc".to_string().to_json(), String("abc".to_string()));
3927-
assert_eq!((1us, 2us).to_json(), array2);
3928-
assert_eq!((1us, 2us, 3us).to_json(), array3);
3929-
assert_eq!([1us, 2us].to_json(), array2);
3930-
assert_eq!((&[1us, 2us, 3us]).to_json(), array3);
3931-
assert_eq!((vec![1us, 2us]).to_json(), array2);
3932-
assert_eq!(vec!(1us, 2us, 3us).to_json(), array3);
3927+
assert_eq!((1_usize, 2_usize).to_json(), array2);
3928+
assert_eq!((1_usize, 2_usize, 3_usize).to_json(), array3);
3929+
assert_eq!([1_usize, 2_usize].to_json(), array2);
3930+
assert_eq!((&[1_usize, 2_usize, 3_usize]).to_json(), array3);
3931+
assert_eq!((vec![1_usize, 2_usize]).to_json(), array2);
3932+
assert_eq!(vec!(1_usize, 2_usize, 3_usize).to_json(), array3);
39333933
let mut tree_map = BTreeMap::new();
3934-
tree_map.insert("a".to_string(), 1us);
3934+
tree_map.insert("a".to_string(), 1 as usize);
39353935
tree_map.insert("b".to_string(), 2);
39363936
assert_eq!(tree_map.to_json(), object);
39373937
let mut hash_map = HashMap::new();
3938-
hash_map.insert("a".to_string(), 1us);
3938+
hash_map.insert("a".to_string(), 1 as usize);
39393939
hash_map.insert("b".to_string(), 2);
39403940
assert_eq!(hash_map.to_json(), object);
39413941
assert_eq!(Some(15).to_json(), I64(15));
3942-
assert_eq!(Some(15us).to_json(), U64(15));
3942+
assert_eq!(Some(15 as usize).to_json(), U64(15));
39433943
assert_eq!(None::<int>.to_json(), Null);
39443944
}
39453945

‎src/libstd/num/mod.rs

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1123,20 +1123,20 @@ mod tests {
11231123
($_20:expr) => ({
11241124
let _20 = $_20;
11251125

1126-
assert_eq!(20u, _20.to_uint().unwrap());
1127-
assert_eq!(20u8, _20.to_u8().unwrap());
1128-
assert_eq!(20u16, _20.to_u16().unwrap());
1129-
assert_eq!(20u32, _20.to_u32().unwrap());
1130-
assert_eq!(20u64, _20.to_u64().unwrap());
1131-
assert_eq!(20, _20.to_int().unwrap());
1132-
assert_eq!(20i8, _20.to_i8().unwrap());
1133-
assert_eq!(20i16, _20.to_i16().unwrap());
1134-
assert_eq!(20i32, _20.to_i32().unwrap());
1135-
assert_eq!(20i64, _20.to_i64().unwrap());
1136-
assert_eq!(20f32, _20.to_f32().unwrap());
1137-
assert_eq!(20f64, _20.to_f64().unwrap());
1138-
1139-
assert_eq!(_20, NumCast::from(20u).unwrap());
1126+
assert_eq!(20usize, _20.to_uint().unwrap());
1127+
assert_eq!(20u8, _20.to_u8().unwrap());
1128+
assert_eq!(20u16, _20.to_u16().unwrap());
1129+
assert_eq!(20u32, _20.to_u32().unwrap());
1130+
assert_eq!(20u64, _20.to_u64().unwrap());
1131+
assert_eq!(20, _20.to_int().unwrap());
1132+
assert_eq!(20i8, _20.to_i8().unwrap());
1133+
assert_eq!(20i16, _20.to_i16().unwrap());
1134+
assert_eq!(20i32, _20.to_i32().unwrap());
1135+
assert_eq!(20i64, _20.to_i64().unwrap());
1136+
assert_eq!(20f32, _20.to_f32().unwrap());
1137+
assert_eq!(20f64, _20.to_f64().unwrap());
1138+
1139+
assert_eq!(_20, NumCast::from(20usize).unwrap());
11401140
assert_eq!(_20, NumCast::from(20u8).unwrap());
11411141
assert_eq!(_20, NumCast::from(20u16).unwrap());
11421142
assert_eq!(_20, NumCast::from(20u32).unwrap());
@@ -1164,18 +1164,18 @@ mod tests {
11641164
})
11651165
}
11661166

1167-
#[test] fn test_u8_cast() { test_cast_20!(20u8) }
1168-
#[test] fn test_u16_cast() { test_cast_20!(20u16) }
1169-
#[test] fn test_u32_cast() { test_cast_20!(20u32) }
1170-
#[test] fn test_u64_cast() { test_cast_20!(20u64) }
1171-
#[test] fn test_uint_cast() { test_cast_20!(20u) }
1172-
#[test] fn test_i8_cast() { test_cast_20!(20i8) }
1173-
#[test] fn test_i16_cast() { test_cast_20!(20i16) }
1174-
#[test] fn test_i32_cast() { test_cast_20!(20i32) }
1175-
#[test] fn test_i64_cast() { test_cast_20!(20i64) }
1176-
#[test] fn test_int_cast() { test_cast_20!(20) }
1177-
#[test] fn test_f32_cast() { test_cast_20!(20f32) }
1178-
#[test] fn test_f64_cast() { test_cast_20!(20f64) }
1167+
#[test] fn test_u8_cast() { test_cast_20!(20u8) }
1168+
#[test] fn test_u16_cast() { test_cast_20!(20u16) }
1169+
#[test] fn test_u32_cast() { test_cast_20!(20u32) }
1170+
#[test] fn test_u64_cast() { test_cast_20!(20u64) }
1171+
#[test] fn test_uint_cast() { test_cast_20!(20usize) }
1172+
#[test] fn test_i8_cast() { test_cast_20!(20i8) }
1173+
#[test] fn test_i16_cast() { test_cast_20!(20i16) }
1174+
#[test] fn test_i32_cast() { test_cast_20!(20i32) }
1175+
#[test] fn test_i64_cast() { test_cast_20!(20i64) }
1176+
#[test] fn test_int_cast() { test_cast_20!(20) }
1177+
#[test] fn test_f32_cast() { test_cast_20!(20f32) }
1178+
#[test] fn test_f64_cast() { test_cast_20!(20f64) }
11791179

11801180
#[test]
11811181
fn test_cast_range_int_min() {
@@ -1548,18 +1548,18 @@ mod tests {
15481548
#[test]
15491549
fn test_saturating_add_uint() {
15501550
use uint::MAX;
1551-
assert_eq!(3u.saturating_add(5u), 8u);
1552-
assert_eq!(3u.saturating_add(MAX-1), MAX);
1551+
assert_eq!(3_usize.saturating_add(5_usize), 8_usize);
1552+
assert_eq!(3_usize.saturating_add(MAX-1), MAX);
15531553
assert_eq!(MAX.saturating_add(MAX), MAX);
15541554
assert_eq!((MAX-2).saturating_add(1), MAX-1);
15551555
}
15561556

15571557
#[test]
15581558
fn test_saturating_sub_uint() {
15591559
use uint::MAX;
1560-
assert_eq!(5u.saturating_sub(3u), 2u);
1561-
assert_eq!(3u.saturating_sub(5u), 0u);
1562-
assert_eq!(0u.saturating_sub(1u), 0u);
1560+
assert_eq!(5_usize.saturating_sub(3_usize), 2_usize);
1561+
assert_eq!(3_usize.saturating_sub(5_usize), 0_usize);
1562+
assert_eq!(0_usize.saturating_sub(1_usize), 0_usize);
15631563
assert_eq!((MAX-1).saturating_sub(MAX), 0);
15641564
}
15651565

@@ -1602,14 +1602,14 @@ mod tests {
16021602

16031603
#[test]
16041604
fn test_checked_sub() {
1605-
assert_eq!(5u.checked_sub(0), Some(5));
1606-
assert_eq!(5u.checked_sub(1), Some(4));
1607-
assert_eq!(5u.checked_sub(2), Some(3));
1608-
assert_eq!(5u.checked_sub(3), Some(2));
1609-
assert_eq!(5u.checked_sub(4), Some(1));
1610-
assert_eq!(5u.checked_sub(5), Some(0));
1611-
assert_eq!(5u.checked_sub(6), None);
1612-
assert_eq!(5u.checked_sub(7), None);
1605+
assert_eq!(5_usize.checked_sub(0), Some(5));
1606+
assert_eq!(5_usize.checked_sub(1), Some(4));
1607+
assert_eq!(5_usize.checked_sub(2), Some(3));
1608+
assert_eq!(5_usize.checked_sub(3), Some(2));
1609+
assert_eq!(5_usize.checked_sub(4), Some(1));
1610+
assert_eq!(5_usize.checked_sub(5), Some(0));
1611+
assert_eq!(5_usize.checked_sub(6), None);
1612+
assert_eq!(5_usize.checked_sub(7), None);
16131613
}
16141614

16151615
#[test]

‎src/test/compile-fail/asm-in-bad-modifier.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ pub fn main() {
2020
let x: isize;
2121
let y: isize;
2222
unsafe {
23-
asm!("mov $1, $0" : "=r"(x) : "=r"(5us)); //~ ERROR input operand constraint contains '='
24-
asm!("mov $1, $0" : "=r"(y) : "+r"(5us)); //~ ERROR input operand constraint contains '+'
23+
asm!("mov $1, $0" : "=r"(x) : "=r"(5_usize)); //~ ERROR operand constraint contains '='
24+
asm!("mov $1, $0" : "=r"(y) : "+r"(5_usize)); //~ ERROR operand constraint contains '+'
2525
}
2626
foo(x);
2727
foo(y);

‎src/test/compile-fail/asm-misplaced-option.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ pub fn main() {
2121
let mut x: isize = 0;
2222
unsafe {
2323
// extra colon
24-
asm!("mov $1, $0" : "=r"(x) : "r"(5us), "0"(x) : : "cc");
24+
asm!("mov $1, $0" : "=r"(x) : "r"(5_usize), "0"(x) : : "cc");
2525
//~^ WARNING unrecognized option
2626
}
2727
assert_eq!(x, 5);

‎src/test/compile-fail/asm-out-assign-imm.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ pub fn main() {
2121
x = 1; //~ NOTE prior assignment occurs here
2222
foo(x);
2323
unsafe {
24-
asm!("mov $1, $0" : "=r"(x) : "r"(5us)); //~ ERROR re-assignment of immutable variable `x`
24+
asm!("mov $1, $0" : "=r"(x) : "r"(5_usize));
25+
//~^ ERROR re-assignment of immutable variable `x`
2526
}
2627
foo(x);
2728
}

‎src/test/compile-fail/asm-out-no-modifier.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ fn foo(x: isize) { println!("{}", x); }
1919
pub fn main() {
2020
let x: isize;
2121
unsafe {
22-
asm!("mov $1, $0" : "r"(x) : "r"(5us)); //~ ERROR output operand constraint lacks '='
22+
asm!("mov $1, $0" : "r"(x) : "r"(5_usize)); //~ ERROR output operand constraint lacks '='
2323
}
2424
foo(x);
2525
}

‎src/test/compile-fail/issue-13058.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ fn check<'r, I: Iterator<Item=usize>, T: Itble<'r, usize, I>>(cont: &T) -> bool
3434
}
3535

3636
fn main() {
37-
check((3us, 5us));
37+
check((3_usize, 5_usize));
3838
//~^ ERROR mismatched types
3939
//~| expected `&_`
4040
//~| found `(usize, usize)`

‎src/test/pretty/issue-4264.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
pub fn foo(_: [i32; (3 as usize)]) { }
2424

2525
pub fn bar() {
26-
const FOO: usize = ((5us as usize) - (4us as usize) as usize);
26+
const FOO: usize = ((5usize as usize) - (4usize as usize) as usize);
2727
let _: [(); (FOO as usize)] = ([(() as ())] as [(); 1]);
2828

2929
let _: [(); (1us as usize)] = ([(() as ())] as [(); 1]);

0 commit comments

Comments
 (0)