Skip to content

Commit f2c6b51

Browse files
committed
Rollup merge of rust-lang#32177 - srinivasreddy:remove_integer_suffixes, r=steveklabnik
first round of removal of integer suffixes
2 parents 53a03b5 + 91a42be commit f2c6b51

File tree

4 files changed

+18
-18
lines changed

4 files changed

+18
-18
lines changed

src/liballoc/arc.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ const MAX_REFCOUNT: usize = (isize::MAX) as usize;
107107
/// use std::thread;
108108
///
109109
/// fn main() {
110-
/// let numbers: Vec<_> = (0..100u32).collect();
110+
/// let numbers: Vec<_> = (0..100).collect();
111111
/// let shared_numbers = Arc::new(numbers);
112112
///
113113
/// for _ in 0..10 {
@@ -1118,7 +1118,7 @@ mod tests {
11181118

11191119
#[test]
11201120
fn test_strong_count() {
1121-
let a = Arc::new(0u32);
1121+
let a = Arc::new(0);
11221122
assert!(Arc::strong_count(&a) == 1);
11231123
let w = Arc::downgrade(&a);
11241124
assert!(Arc::strong_count(&a) == 1);
@@ -1135,7 +1135,7 @@ mod tests {
11351135

11361136
#[test]
11371137
fn test_weak_count() {
1138-
let a = Arc::new(0u32);
1138+
let a = Arc::new(0);
11391139
assert!(Arc::strong_count(&a) == 1);
11401140
assert!(Arc::weak_count(&a) == 0);
11411141
let w = Arc::downgrade(&a);
@@ -1161,7 +1161,7 @@ mod tests {
11611161

11621162
#[test]
11631163
fn show_arc() {
1164-
let a = Arc::new(5u32);
1164+
let a = Arc::new(5);
11651165
assert_eq!(format!("{:?}", a), "5");
11661166
}
11671167

src/liballoc/rc.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1014,7 +1014,7 @@ mod tests {
10141014

10151015
#[test]
10161016
fn test_strong_count() {
1017-
let a = Rc::new(0u32);
1017+
let a = Rc::new(0);
10181018
assert!(Rc::strong_count(&a) == 1);
10191019
let w = Rc::downgrade(&a);
10201020
assert!(Rc::strong_count(&a) == 1);
@@ -1031,7 +1031,7 @@ mod tests {
10311031

10321032
#[test]
10331033
fn test_weak_count() {
1034-
let a = Rc::new(0u32);
1034+
let a = Rc::new(0);
10351035
assert!(Rc::strong_count(&a) == 1);
10361036
assert!(Rc::weak_count(&a) == 0);
10371037
let w = Rc::downgrade(&a);

src/libcollections/linked_list.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -1305,10 +1305,10 @@ mod tests {
13051305
//
13061306
// https://github.com/rust-lang/rust/issues/26021
13071307
let mut v1 = LinkedList::new();
1308-
v1.push_front(1u8);
1309-
v1.push_front(1u8);
1310-
v1.push_front(1u8);
1311-
v1.push_front(1u8);
1308+
v1.push_front(1);
1309+
v1.push_front(1);
1310+
v1.push_front(1);
1311+
v1.push_front(1);
13121312
let _ = v1.split_off(3); // Dropping this now should not cause laundry consumption
13131313
assert_eq!(v1.len(), 3);
13141314

@@ -1319,10 +1319,10 @@ mod tests {
13191319
#[test]
13201320
fn test_split_off() {
13211321
let mut v1 = LinkedList::new();
1322-
v1.push_front(1u8);
1323-
v1.push_front(1u8);
1324-
v1.push_front(1u8);
1325-
v1.push_front(1u8);
1322+
v1.push_front(1);
1323+
v1.push_front(1);
1324+
v1.push_front(1);
1325+
v1.push_front(1);
13261326

13271327
// test all splits
13281328
for ix in 0..1 + v1.len() {

src/libcollectionstest/slice.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -267,9 +267,9 @@ fn test_swap_remove_fail() {
267267
fn test_swap_remove_noncopyable() {
268268
// Tests that we don't accidentally run destructors twice.
269269
let mut v: Vec<Box<_>> = Vec::new();
270-
v.push(box 0u8);
271-
v.push(box 0u8);
272-
v.push(box 0u8);
270+
v.push(box 0);
271+
v.push(box 0);
272+
v.push(box 0);
273273
let mut _e = v.swap_remove(0);
274274
assert_eq!(v.len(), 2);
275275
_e = v.swap_remove(1);
@@ -884,7 +884,7 @@ fn test_overflow_does_not_cause_segfault_managed() {
884884

885885
#[test]
886886
fn test_mut_split_at() {
887-
let mut values = [1u8,2,3,4,5];
887+
let mut values = [1,2,3,4,5];
888888
{
889889
let (left, right) = values.split_at_mut(2);
890890
{

0 commit comments

Comments
 (0)