diff options
| author | bors <bors@rust-lang.org> | 2015-10-30 19:06:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-10-30 19:06:43 +0000 |
| commit | cc8d398e28b6b1918ef85479c2d040dfd0fe582d (patch) | |
| tree | b509827a80ff356e37cf103d1af204eca809edfe /src/liballoc/rc.rs | |
| parent | 2aa9f7d3916dcff36a5b8b4978981c056ceb8398 (diff) | |
| parent | e351595c61614c41be08f7508422d5f8a02d1a0e (diff) | |
Auto merge of #29475 - apasel422:drop-in, r=alexcrichton
This is a rebase of #27204. r? @alexcrichton CC @Gankro
Diffstat (limited to 'src/liballoc/rc.rs')
| -rw-r--r-- | src/liballoc/rc.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/liballoc/rc.rs b/src/liballoc/rc.rs index d695c0edd1d..463f66b58e9 100644 --- a/src/liballoc/rc.rs +++ b/src/liballoc/rc.rs @@ -160,7 +160,7 @@ use core::cell::Cell; use core::cmp::Ordering; use core::fmt; use core::hash::{Hasher, Hash}; -use core::intrinsics::{assume, drop_in_place, abort}; +use core::intrinsics::{assume, abort}; use core::marker::{self, Unsize}; use core::mem::{self, align_of_val, size_of_val, forget}; use core::ops::{CoerceUnsized, Deref}; @@ -460,7 +460,7 @@ impl<T: ?Sized> Drop for Rc<T> { self.dec_strong(); if self.strong() == 0 { // destroy the contained object - drop_in_place(&mut (*ptr).value); + ptr::drop_in_place(&mut (*ptr).value); // remove the implicit "strong weak" pointer now that we've // destroyed the contents. |
