diff options
| author | bors <bors@rust-lang.org> | 2014-08-01 01:56:32 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-08-01 01:56:32 +0000 |
| commit | b495933a7fdc5e7b28ddbb058d1e2dab330ace7b (patch) | |
| tree | 08789d8ee08603d5bee30fc7958e1f8fcae83bea /src/liballoc | |
| parent | 75a39e0fb8fef20d72f7279686ec266bb9cec127 (diff) | |
| parent | ec79d368d2f9b56ac1d00825108b4e8b8bd26498 (diff) | |
| download | rust-b495933a7fdc5e7b28ddbb058d1e2dab330ace7b.tar.gz rust-b495933a7fdc5e7b28ddbb058d1e2dab330ace7b.zip | |
auto merge of #16141 : alexcrichton/rust/rollup, r=alexcrichton
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/rc.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/liballoc/rc.rs b/src/liballoc/rc.rs index b31931c6de3..35914aa3541 100644 --- a/src/liballoc/rc.rs +++ b/src/liballoc/rc.rs @@ -226,7 +226,7 @@ impl<T: Clone> Rc<T> { /// data is cloned if the reference count is greater than one. #[inline] #[experimental] - pub fn make_unique<'a>(&'a mut self) -> &'a mut T { + pub fn make_unique(&mut self) -> &mut T { // Note that we hold a strong reference, which also counts as // a weak reference, so we only clone if there is an // additional reference of either kind. @@ -247,7 +247,7 @@ impl<T: Clone> Rc<T> { impl<T> Deref<T> for Rc<T> { /// Borrow the value contained in the reference-counted box #[inline(always)] - fn deref<'a>(&'a self) -> &'a T { + fn deref(&self) -> &T { &self.inner().value } } @@ -390,7 +390,7 @@ impl<T> Clone for Weak<T> { #[doc(hidden)] trait RcBoxPtr<T> { - fn inner<'a>(&'a self) -> &'a RcBox<T>; + fn inner(&self) -> &RcBox<T>; #[inline] fn strong(&self) -> uint { self.inner().strong.get() } @@ -413,12 +413,12 @@ trait RcBoxPtr<T> { impl<T> RcBoxPtr<T> for Rc<T> { #[inline(always)] - fn inner<'a>(&'a self) -> &'a RcBox<T> { unsafe { &(*self._ptr) } } + fn inner(&self) -> &RcBox<T> { unsafe { &(*self._ptr) } } } impl<T> RcBoxPtr<T> for Weak<T> { #[inline(always)] - fn inner<'a>(&'a self) -> &'a RcBox<T> { unsafe { &(*self._ptr) } } + fn inner(&self) -> &RcBox<T> { unsafe { &(*self._ptr) } } } #[cfg(test)] |
