diff options
| author | bors <bors@rust-lang.org> | 2015-03-05 21:03:10 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-03-05 21:03:10 +0000 |
| commit | b0746ff19b3bc204215f04bbb5756159f9bc5c92 (patch) | |
| tree | 2116c5865229d3d238832e50c99ad9baebe63087 /src/liballoc | |
| parent | f0c74f85f363a8081b31f9ab696463717ce312d5 (diff) | |
| parent | 340d1cc7d701bf1c5bae6c2ad5b097462c5d1a7c (diff) | |
| download | rust-b0746ff19b3bc204215f04bbb5756159f9bc5c92.tar.gz rust-b0746ff19b3bc204215f04bbb5756159f9bc5c92.zip | |
Auto merge of #23031 - Manishearth:rollup, r=Manishearth
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/boxed.rs | 2 | ||||
| -rw-r--r-- | src/liballoc/boxed_test.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/liballoc/boxed.rs b/src/liballoc/boxed.rs index 630ca837daa..9351b110100 100644 --- a/src/liballoc/boxed.rs +++ b/src/liballoc/boxed.rs @@ -42,7 +42,7 @@ //! } //! ``` //! -//! This will print `Cons(1i32, Box(Cons(2i32, Box(Nil))))`. +//! This will print `Cons(1, Box(Cons(2, Box(Nil))))`. #![stable(feature = "rust1", since = "1.0.0")] diff --git a/src/liballoc/boxed_test.rs b/src/liballoc/boxed_test.rs index b7bacaa0cae..bb1ff9428a7 100644 --- a/src/liballoc/boxed_test.rs +++ b/src/liballoc/boxed_test.rs @@ -72,13 +72,13 @@ fn test_show() { #[test] fn deref() { fn homura<T: Deref<Target=i32>>(_: T) { } - homura(Box::new(765i32)); + homura(Box::new(765)); } #[test] fn raw_sized() { unsafe { - let x = Box::new(17i32); + let x = Box::new(17); let p = boxed::into_raw(x); assert_eq!(17, *p); *p = 19; |
