Skip to content

Commit 3586312

Browse files
committed
Removed integer suffixes that cause a harmless fallback to i32.
1 parent 19354d9 commit 3586312

File tree

108 files changed

+302
-302
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+302
-302
lines changed

src/liballoc/arc.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ use heap::deallocate;
9797
/// use std::thread;
9898
///
9999
/// fn main() {
100-
/// let numbers: Vec<_> = (0..100u32).map(|i| i as f32).collect();
100+
/// let numbers: Vec<_> = (0..100).map(|i| i as f32).collect();
101101
/// let shared_numbers = Arc::new(numbers);
102102
///
103103
/// for _ in 0..10 {
@@ -770,7 +770,7 @@ mod tests {
770770

771771
#[test]
772772
fn test_strong_count() {
773-
let a = Arc::new(0u32);
773+
let a = Arc::new(0);
774774
assert!(strong_count(&a) == 1);
775775
let w = a.downgrade();
776776
assert!(strong_count(&a) == 1);
@@ -787,7 +787,7 @@ mod tests {
787787

788788
#[test]
789789
fn test_weak_count() {
790-
let a = Arc::new(0u32);
790+
let a = Arc::new(0);
791791
assert!(strong_count(&a) == 1);
792792
assert!(weak_count(&a) == 0);
793793
let w = a.downgrade();
@@ -813,7 +813,7 @@ mod tests {
813813

814814
#[test]
815815
fn show_arc() {
816-
let a = Arc::new(5u32);
816+
let a = Arc::new(5);
817817
assert_eq!(format!("{:?}", a), "5");
818818
}
819819

src/liballoc/boxed.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ impl<T : ?Sized> Box<T> {
136136
/// ```
137137
/// use std::boxed;
138138
///
139-
/// let seventeen = Box::new(17u32);
139+
/// let seventeen = Box::new(17);
140140
/// let raw = unsafe { boxed::into_raw(seventeen) };
141141
/// let boxed_again = unsafe { Box::from_raw(raw) };
142142
/// ```

src/liballoc/rc.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -874,7 +874,7 @@ mod tests {
874874

875875
#[test]
876876
fn test_strong_count() {
877-
let a = Rc::new(0u32);
877+
let a = Rc::new(0);
878878
assert!(strong_count(&a) == 1);
879879
let w = a.downgrade();
880880
assert!(strong_count(&a) == 1);
@@ -891,7 +891,7 @@ mod tests {
891891

892892
#[test]
893893
fn test_weak_count() {
894-
let a = Rc::new(0u32);
894+
let a = Rc::new(0);
895895
assert!(strong_count(&a) == 1);
896896
assert!(weak_count(&a) == 0);
897897
let w = a.downgrade();

src/libcollections/slice.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1795,9 +1795,9 @@ mod tests {
17951795
fn test_swap_remove_noncopyable() {
17961796
// Tests that we don't accidentally run destructors twice.
17971797
let mut v = Vec::new();
1798-
v.push(box 0u8);
1799-
v.push(box 0u8);
1800-
v.push(box 0u8);
1798+
v.push(box 0);
1799+
v.push(box 0);
1800+
v.push(box 0);
18011801
let mut _e = v.swap_remove(0);
18021802
assert_eq!(v.len(), 2);
18031803
_e = v.swap_remove(1);
@@ -2116,7 +2116,7 @@ mod tests {
21162116
let mut v: [i32; 0] = [];
21172117
v.sort();
21182118

2119-
let mut v = [0xDEADBEEFu64];
2119+
let mut v = [0xDEADBEEF];
21202120
v.sort();
21212121
assert!(v == [0xDEADBEEF]);
21222122
}
@@ -2170,8 +2170,8 @@ mod tests {
21702170
fn test_connect() {
21712171
let v: [Vec<i32>; 0] = [];
21722172
assert_eq!(v.connect(&0), []);
2173-
assert_eq!([vec![1i], vec![2, 3]].connect(&0), [1, 0, 2, 3]);
2174-
assert_eq!([vec![1i], vec![2], vec![3]].connect(&0), [1, 0, 2, 0, 3]);
2173+
assert_eq!([vec![1], vec![2, 3]].connect(&0), [1, 0, 2, 3]);
2174+
assert_eq!([vec![1], vec![2], vec![3]].connect(&0), [1, 0, 2, 0, 3]);
21752175

21762176
let v: [&[_]; 2] = [&[1], &[2, 3]];
21772177
assert_eq!(v.connect(&0), [1, 0, 2, 3]);
@@ -2658,7 +2658,7 @@ mod tests {
26582658

26592659
#[test]
26602660
fn test_mut_split_at() {
2661-
let mut values = [1u8,2,3,4,5];
2661+
let mut values = [1,2,3,4,5];
26622662
{
26632663
let (left, right) = values.split_at_mut(2);
26642664
{

src/libcollections/vec.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,21 @@
2525
//! ```
2626
//! let ys: Vec<i32> = vec![];
2727
//!
28-
//! let zs = vec![1i32, 2, 3, 4, 5];
28+
//! let zs = vec![1, 2, 3, 4, 5];
2929
//! ```
3030
//!
3131
//! Push:
3232
//!
3333
//! ```
34-
//! let mut xs = vec![1i32, 2];
34+
//! let mut xs = vec![1, 2];
3535
//!
3636
//! xs.push(3);
3737
//! ```
3838
//!
3939
//! And pop:
4040
//!
4141
//! ```
42-
//! let mut xs = vec![1i32, 2];
42+
//! let mut xs = vec![1, 2];
4343
//!
4444
//! let two = xs.pop();
4545
//! ```
@@ -1975,7 +1975,7 @@ mod tests {
19751975

19761976
#[test]
19771977
fn test_as_vec() {
1978-
let xs = [1u8, 2u8, 3u8];
1978+
let xs = [1, 2, 3];
19791979
assert_eq!(&**as_vec(&xs), xs);
19801980
}
19811981

src/libcore/iter.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2316,7 +2316,7 @@ impl<I: RandomAccessIterator, F> RandomAccessIterator for Inspect<I, F>
23162316
/// // This iterator will yield up to the last Fibonacci number before the max
23172317
/// // value of `u32`. You can simply change `u32` to `u64` in this line if
23182318
/// // you want higher values than that.
2319-
/// let mut fibonacci = Unfold::new((Some(0u32), Some(1u32)),
2319+
/// let mut fibonacci = Unfold::new((Some(0), Some(1)),
23202320
/// |&mut (ref mut x2, ref mut x1)| {
23212321
/// // Attempt to get the next Fibonacci number
23222322
/// // `x1` will be `None` if previously overflowed.

src/libcore/mem.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ pub fn size_of<T>() -> usize {
5454
/// ```
5555
/// use std::mem;
5656
///
57-
/// assert_eq!(4, mem::size_of_val(&5i32));
57+
/// assert_eq!(4, mem::size_of_val(&5));
5858
/// ```
5959
#[inline]
6060
#[stable(feature = "rust1", since = "1.0.0")]
@@ -86,7 +86,7 @@ pub fn min_align_of<T>() -> usize {
8686
/// ```
8787
/// use std::mem;
8888
///
89-
/// assert_eq!(4, mem::min_align_of_val(&5i32));
89+
/// assert_eq!(4, mem::min_align_of_val(&5));
9090
/// ```
9191
#[inline]
9292
#[stable(feature = "rust1", since = "1.0.0")]
@@ -126,7 +126,7 @@ pub fn align_of<T>() -> usize {
126126
/// ```
127127
/// use std::mem;
128128
///
129-
/// assert_eq!(4, mem::align_of_val(&5i32));
129+
/// assert_eq!(4, mem::align_of_val(&5));
130130
/// ```
131131
#[inline]
132132
#[stable(feature = "rust1", since = "1.0.0")]

src/libcoretest/iter.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ fn test_rev() {
477477

478478
#[test]
479479
fn test_cloned() {
480-
let xs = [2u8, 4, 6, 8];
480+
let xs = [2, 4, 6, 8];
481481

482482
let mut it = xs.iter().cloned();
483483
assert_eq!(it.len(), 4);

src/libcoretest/option.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -246,8 +246,8 @@ fn test_collect() {
246246

247247
#[test]
248248
fn test_cloned() {
249-
let val1 = 1u32;
250-
let mut val2 = 2u32;
249+
let val1 = 1;
250+
let mut val2 = 2;
251251
let val1_ref = &val1;
252252
let opt_none: Option<&'static u32> = None;
253253
let opt_ref = Some(&val1);
@@ -259,14 +259,14 @@ fn test_cloned() {
259259
assert_eq!(opt_none.cloned(), None);
260260

261261
// Mutable refs work
262-
assert_eq!(opt_mut_ref.cloned(), Some(2u32));
262+
assert_eq!(opt_mut_ref.cloned(), Some(2));
263263

264264
// Immutable ref works
265265
assert_eq!(opt_ref.clone(), Some(&val1));
266-
assert_eq!(opt_ref.cloned(), Some(1u32));
266+
assert_eq!(opt_ref.cloned(), Some(1));
267267

268268
// Double Immutable ref works
269269
assert_eq!(opt_ref_ref.clone(), Some(&val1_ref));
270270
assert_eq!(opt_ref_ref.clone().cloned(), Some(&val1));
271-
assert_eq!(opt_ref_ref.cloned().cloned(), Some(1u32));
271+
assert_eq!(opt_ref_ref.cloned().cloned(), Some(1));
272272
}

src/librustc/metadata/encoder.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1595,7 +1595,7 @@ fn encode_index<T, F>(rbml_w: &mut Encoder, index: Vec<entry<T>>, mut write_fn:
15951595
F: FnMut(&mut SeekableMemWriter, &T),
15961596
T: Hash,
15971597
{
1598-
let mut buckets: Vec<Vec<entry<T>>> = (0..256u16).map(|_| Vec::new()).collect();
1598+
let mut buckets: Vec<Vec<entry<T>>> = (0..256).map(|_| Vec::new()).collect();
15991599
for elt in index {
16001600
let mut s = SipHasher::new();
16011601
elt.val.hash(&mut s);

0 commit comments

Comments
 (0)