diff options
| author | bors <bors@rust-lang.org> | 2014-09-29 17:18:07 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-09-29 17:18:07 +0000 |
| commit | 1f3cda8bd8496c3b3771b0201d1073ed575321d0 (patch) | |
| tree | 0acaf08d99d544c93df6f688fa96ce40e747588f /src/liballoc | |
| parent | 5079a10b1e9d87fa0b0d50f1456f920b1ba8323c (diff) | |
| parent | d3e171861f0fd8f3a61ad28d70f675ea9dc712b8 (diff) | |
| download | rust-1f3cda8bd8496c3b3771b0201d1073ed575321d0.tar.gz rust-1f3cda8bd8496c3b3771b0201d1073ed575321d0.zip | |
auto merge of #17629 : alexcrichton/rust/rollup, r=alexcrichton
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/boxed.rs | 6 | ||||
| -rw-r--r-- | src/liballoc/util.rs | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/src/liballoc/boxed.rs b/src/liballoc/boxed.rs index 13d4a0a1f0a..168d0daeb38 100644 --- a/src/liballoc/boxed.rs +++ b/src/liballoc/boxed.rs @@ -96,12 +96,6 @@ pub trait BoxAny { /// `Err(Self)` if it isn't. #[unstable = "naming conventions around accessing innards may change"] fn downcast<T: 'static>(self) -> Result<Box<T>, Self>; - - /// Deprecated; this method has been renamed to `downcast`. - #[deprecated = "use downcast instead"] - fn move<T: 'static>(self) -> Result<Box<T>, Self> { - self.downcast::<T>() - } } #[stable] diff --git a/src/liballoc/util.rs b/src/liballoc/util.rs index 7e35af79eab..d5f0d25fb01 100644 --- a/src/liballoc/util.rs +++ b/src/liballoc/util.rs @@ -16,7 +16,7 @@ use core::raw; #[inline] #[deprecated] pub fn get_box_size(body_size: uint, body_align: uint) -> uint { - let header_size = mem::size_of::<raw::Box<()>>(); + let header_size = mem::size_of::<raw::GcBox<()>>(); let total_size = align_to(header_size, body_align) + body_size; total_size } |