Skip to content

Commit d6f0b68

Browse files
committed
---
yaml --- r: 182575 b: refs/heads/beta c: ee253c9 h: refs/heads/master i: 182573: d00575d 182571: 214d95c 182567: 10322bf 182559: b5e8a3f v: v3
1 parent 0b48148 commit d6f0b68

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
3131
refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
3232
refs/heads/batch: b7fd822592a4fb577552d93010c4a4e14f314346
3333
refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
34-
refs/heads/beta: ecbee2e56824161fcc0decd087055d13e0876058
34+
refs/heads/beta: ee253c918d2fb961dbdf5c6dbe40dd7fee20148e
3535
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
3636
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
3737
refs/heads/tmp: eb836bf767aa1d8d4cba488a9091cde3c0ab4b2f

branches/beta/src/liballoc/rc.rs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -755,8 +755,6 @@ trait RcBoxPtr<T> {
755755
fn inc_strong(&self) {
756756
let strong = self.strong();
757757
// The reference count is always at least one unless we're about to drop the type
758-
// This allows the bulk of the destructor to be omitted in cases where we know that
759-
// the reference count must be > 0.
760758
unsafe { assume(strong > 0); }
761759
self.inner().strong.set(strong + 1);
762760
}
@@ -765,8 +763,6 @@ trait RcBoxPtr<T> {
765763
fn dec_strong(&self) {
766764
let strong = self.strong();
767765
// The reference count is always at least one unless we're about to drop the type
768-
// This allows the bulk of the destructor to be omitted in cases where we know that
769-
// the reference count must be > 0
770766
unsafe { assume(strong > 0); }
771767
self.inner().strong.set(strong - 1);
772768
}
@@ -786,9 +782,7 @@ impl<T> RcBoxPtr<T> for Rc<T> {
786782
fn inner(&self) -> &RcBox<T> {
787783
unsafe {
788784
// Safe to assume this here, as if it weren't true, we'd be breaking
789-
// the contract anyway.
790-
// This allows the null check to be elided in the destructor if we
791-
// manipulated the reference count in the same function.
785+
// the contract anyway
792786
assume(!self._ptr.is_null());
793787
&(**self._ptr)
794788
}
@@ -801,8 +795,6 @@ impl<T> RcBoxPtr<T> for Weak<T> {
801795
unsafe {
802796
// Safe to assume this here, as if it weren't true, we'd be breaking
803797
// the contract anyway
804-
// This allows the null check to be elided in the destructor if we
805-
// manipulated the reference count in the same function.
806798
assume(!self._ptr.is_null());
807799
&(**self._ptr)
808800
}

0 commit comments

Comments
 (0)