diff options
| author | bors <bors@rust-lang.org> | 2016-03-28 12:52:03 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-03-28 12:52:03 -0700 |
| commit | 221c940bf34887bb3f1900b757f8245ad23e8ef4 (patch) | |
| tree | 7712d6dfd8920c7648e5d7583cc6177e0935a20d /src/liballoc | |
| parent | 1f131fbe7799b9c3d4a775798b90760f7c11ef33 (diff) | |
| parent | 9eea1d7494277fdf8dfddf93fdfdc27130c31971 (diff) | |
| download | rust-221c940bf34887bb3f1900b757f8245ad23e8ef4.tar.gz rust-221c940bf34887bb3f1900b757f8245ad23e8ef4.zip | |
Auto merge of #32561 - steveklabnik:rollup, r=steveklabnik
Rollup of 7 pull requests - Successful merges: #32177, #32235, #32472, #32504, #32507, #32509, #32534 - Failed merges:
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/arc.rs | 8 | ||||
| -rw-r--r-- | src/liballoc/rc.rs | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/liballoc/arc.rs b/src/liballoc/arc.rs index b5d7279edb0..1dac7dca348 100644 --- a/src/liballoc/arc.rs +++ b/src/liballoc/arc.rs @@ -107,7 +107,7 @@ const MAX_REFCOUNT: usize = (isize::MAX) as usize; /// use std::thread; /// /// fn main() { -/// let numbers: Vec<_> = (0..100u32).collect(); +/// let numbers: Vec<_> = (0..100).collect(); /// let shared_numbers = Arc::new(numbers); /// /// for _ in 0..10 { @@ -1118,7 +1118,7 @@ mod tests { #[test] fn test_strong_count() { - let a = Arc::new(0u32); + let a = Arc::new(0); assert!(Arc::strong_count(&a) == 1); let w = Arc::downgrade(&a); assert!(Arc::strong_count(&a) == 1); @@ -1135,7 +1135,7 @@ mod tests { #[test] fn test_weak_count() { - let a = Arc::new(0u32); + let a = Arc::new(0); assert!(Arc::strong_count(&a) == 1); assert!(Arc::weak_count(&a) == 0); let w = Arc::downgrade(&a); @@ -1161,7 +1161,7 @@ mod tests { #[test] fn show_arc() { - let a = Arc::new(5u32); + let a = Arc::new(5); assert_eq!(format!("{:?}", a), "5"); } diff --git a/src/liballoc/rc.rs b/src/liballoc/rc.rs index dc283f5acdf..da803f57a59 100644 --- a/src/liballoc/rc.rs +++ b/src/liballoc/rc.rs @@ -1014,7 +1014,7 @@ mod tests { #[test] fn test_strong_count() { - let a = Rc::new(0u32); + let a = Rc::new(0); assert!(Rc::strong_count(&a) == 1); let w = Rc::downgrade(&a); assert!(Rc::strong_count(&a) == 1); @@ -1031,7 +1031,7 @@ mod tests { #[test] fn test_weak_count() { - let a = Rc::new(0u32); + let a = Rc::new(0); assert!(Rc::strong_count(&a) == 1); assert!(Rc::weak_count(&a) == 0); let w = Rc::downgrade(&a); |