Skip to content

Commit c48b499

Browse files
borsbors
committed
Auto merge of #24888 - tamird:snapshot, r=alexcrichton
r? @alexcrichton cc @brson
2 parents c4b23ae + 69abc12 commit c48b499

File tree

89 files changed

+29
-397
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+29
-397
lines changed

‎src/liballoc/arc.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,6 @@ impl<T: Clone> Arc<T> {
355355
}
356356
}
357357

358-
#[unsafe_destructor]
359358
#[stable(feature = "rust1", since = "1.0.0")]
360359
impl<T> Drop for Arc<T> {
361360
/// Drops the `Arc<T>`.
@@ -489,7 +488,6 @@ impl<T> Clone for Weak<T> {
489488
}
490489
}
491490

492-
#[unsafe_destructor]
493491
#[stable(feature = "rust1", since = "1.0.0")]
494492
impl<T> Drop for Weak<T> {
495493
/// Drops the `Weak<T>`.

‎src/liballoc/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
#![feature(allocator)]
7474
#![feature(custom_attribute)]
7575
#![feature(fundamental)]
76-
#![feature(lang_items, unsafe_destructor)]
76+
#![feature(lang_items)]
7777
#![feature(box_syntax)]
7878
#![feature(optin_builtin_traits)]
7979
#![feature(unboxed_closures)]

‎src/liballoc/rc.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,6 @@ impl<T> Deref for Rc<T> {
375375
}
376376
}
377377

378-
#[unsafe_destructor]
379378
#[stable(feature = "rust1", since = "1.0.0")]
380379
impl<T> Drop for Rc<T> {
381380
/// Drops the `Rc<T>`.
@@ -693,7 +692,6 @@ impl<T> Weak<T> {
693692
}
694693
}
695694

696-
#[unsafe_destructor]
697695
#[stable(feature = "rust1", since = "1.0.0")]
698696
impl<T> Drop for Weak<T> {
699697
/// Drops the `Weak<T>`.

‎src/libarena/lib.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
#![feature(core)]
3636
#![feature(staged_api)]
3737
#![feature(unboxed_closures)]
38-
#![feature(unsafe_destructor)]
3938
#![cfg_attr(test, feature(test))]
4039

4140
extern crate alloc;
@@ -124,7 +123,6 @@ fn chunk(size: usize, is_copy: bool) -> Chunk {
124123
}
125124
}
126125

127-
#[unsafe_destructor]
128126
impl<'longer_than_self> Drop for Arena<'longer_than_self> {
129127
fn drop(&mut self) {
130128
unsafe {
@@ -510,7 +508,6 @@ impl<T> TypedArena<T> {
510508
}
511509
}
512510

513-
#[unsafe_destructor]
514511
impl<T> Drop for TypedArena<T> {
515512
fn drop(&mut self) {
516513
unsafe {

‎src/libcollections/btree/node.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -270,14 +270,12 @@ impl<T> DoubleEndedIterator for RawItems<T> {
270270
}
271271
}
272272

273-
#[unsafe_destructor]
274273
impl<T> Drop for RawItems<T> {
275274
fn drop(&mut self) {
276275
for _ in self.by_ref() {}
277276
}
278277
}
279278

280-
#[unsafe_destructor]
281279
impl<K, V> Drop for Node<K, V> {
282280
fn drop(&mut self) {
283281
if self.keys.is_null() ||
@@ -1394,7 +1392,6 @@ impl<K, V> TraversalImpl for MoveTraversalImpl<K, V> {
13941392
}
13951393
}
13961394

1397-
#[unsafe_destructor]
13981395
impl<K, V> Drop for MoveTraversalImpl<K, V> {
13991396
fn drop(&mut self) {
14001397
// We need to cleanup the stored values manually, as the RawItems destructor would run

‎src/libcollections/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
#![feature(staged_api)]
3434
#![feature(unboxed_closures)]
3535
#![feature(unicode)]
36-
#![feature(unsafe_destructor)]
3736
#![feature(unique)]
3837
#![feature(unsafe_no_drop_flag, filling_drop)]
3938
#![feature(step_by)]

‎src/libcollections/linked_list.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -624,7 +624,6 @@ impl<T> LinkedList<T> {
624624
}
625625
}
626626

627-
#[unsafe_destructor]
628627
#[stable(feature = "rust1", since = "1.0.0")]
629628
impl<T> Drop for LinkedList<T> {
630629
fn drop(&mut self) {

‎src/libcollections/vec.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1626,7 +1626,6 @@ impl<'a, T: Clone> Add<&'a [T]> for Vec<T> {
16261626
}
16271627
}
16281628

1629-
#[unsafe_destructor]
16301629
#[stable(feature = "rust1", since = "1.0.0")]
16311630
impl<T> Drop for Vec<T> {
16321631
fn drop(&mut self) {
@@ -1808,7 +1807,6 @@ impl<T> DoubleEndedIterator for IntoIter<T> {
18081807
#[stable(feature = "rust1", since = "1.0.0")]
18091808
impl<T> ExactSizeIterator for IntoIter<T> {}
18101809

1811-
#[unsafe_destructor]
18121810
#[stable(feature = "rust1", since = "1.0.0")]
18131811
impl<T> Drop for IntoIter<T> {
18141812
fn drop(&mut self) {
@@ -1867,7 +1865,6 @@ impl<'a, T> DoubleEndedIterator for Drain<'a, T> {
18671865
}
18681866
}
18691867

1870-
#[unsafe_destructor]
18711868
#[stable(feature = "rust1", since = "1.0.0")]
18721869
impl<'a, T> Drop for Drain<'a, T> {
18731870
fn drop(&mut self) {
@@ -1914,7 +1911,6 @@ impl<'a, T> Deref for DerefVec<'a, T> {
19141911
}
19151912

19161913
// Prevent the inner `Vec<T>` from attempting to deallocate memory.
1917-
#[unsafe_destructor]
19181914
#[stable(feature = "rust1", since = "1.0.0")]
19191915
impl<'a, T> Drop for DerefVec<'a, T> {
19201916
fn drop(&mut self) {
@@ -1983,7 +1979,6 @@ struct PartialVecZeroSized<T,U> {
19831979
marker: PhantomData<::core::cell::Cell<(T,U)>>,
19841980
}
19851981

1986-
#[unsafe_destructor]
19871982
impl<T,U> Drop for PartialVecNonZeroSized<T,U> {
19881983
fn drop(&mut self) {
19891984
unsafe {
@@ -2009,7 +2004,6 @@ impl<T,U> Drop for PartialVecNonZeroSized<T,U> {
20092004
}
20102005
}
20112006

2012-
#[unsafe_destructor]
20132007
impl<T,U> Drop for PartialVecZeroSized<T,U> {
20142008
fn drop(&mut self) {
20152009
unsafe {

‎src/libcollections/vec_deque.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ impl<T: Clone> Clone for VecDeque<T> {
5959
}
6060
}
6161

62-
#[unsafe_destructor]
6362
#[stable(feature = "rust1", since = "1.0.0")]
6463
impl<T> Drop for VecDeque<T> {
6564
fn drop(&mut self) {
@@ -1612,7 +1611,6 @@ pub struct Drain<'a, T: 'a> {
16121611
inner: &'a mut VecDeque<T>,
16131612
}
16141613

1615-
#[unsafe_destructor]
16161614
#[stable(feature = "rust1", since = "1.0.0")]
16171615
impl<'a, T: 'a> Drop for Drain<'a, T> {
16181616
fn drop(&mut self) {

‎src/libcollectionstest/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
#![feature(test)]
1919
#![feature(unboxed_closures)]
2020
#![feature(unicode)]
21-
#![feature(unsafe_destructor)]
2221
#![feature(into_cow)]
2322
#![feature(step_by)]
2423
#![cfg_attr(test, feature(str_char))]

0 commit comments

Comments
 (0)