From ee253c918d2fb961dbdf5c6dbe40dd7fee20148e Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Wed, 21 Jan 2015 13:55:04 -0800 Subject: Revert "Add more explanation for why the assumes are there" This reverts commit a7525bc4c8eb8507a5c248d29286e77133217cf3. --- src/liballoc/rc.rs | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'src/liballoc') diff --git a/src/liballoc/rc.rs b/src/liballoc/rc.rs index f5a5025c665..65f5ed06254 100644 --- a/src/liballoc/rc.rs +++ b/src/liballoc/rc.rs @@ -755,8 +755,6 @@ trait RcBoxPtr { fn inc_strong(&self) { let strong = self.strong(); // The reference count is always at least one unless we're about to drop the type - // This allows the bulk of the destructor to be omitted in cases where we know that - // the reference count must be > 0. unsafe { assume(strong > 0); } self.inner().strong.set(strong + 1); } @@ -765,8 +763,6 @@ trait RcBoxPtr { fn dec_strong(&self) { let strong = self.strong(); // The reference count is always at least one unless we're about to drop the type - // This allows the bulk of the destructor to be omitted in cases where we know that - // the reference count must be > 0 unsafe { assume(strong > 0); } self.inner().strong.set(strong - 1); } @@ -786,9 +782,7 @@ impl RcBoxPtr for Rc { fn inner(&self) -> &RcBox { unsafe { // Safe to assume this here, as if it weren't true, we'd be breaking - // the contract anyway. - // This allows the null check to be elided in the destructor if we - // manipulated the reference count in the same function. + // the contract anyway assume(!self._ptr.is_null()); &(**self._ptr) } @@ -801,8 +795,6 @@ impl RcBoxPtr for Weak { unsafe { // Safe to assume this here, as if it weren't true, we'd be breaking // the contract anyway - // This allows the null check to be elided in the destructor if we - // manipulated the reference count in the same function. assume(!self._ptr.is_null()); &(**self._ptr) } -- cgit 1.4.1-3-g733a5