Skip to content

Commit 5d79f94

Browse files
committed
core: Remove use of deprecated drop
1 parent 89f4193 commit 5d79f94

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

src/libcore/core.rc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ they contained the following prologue:
6363
#[warn(vecs_implicitly_copyable)];
6464
#[deny(non_camel_case_types)];
6565
#[allow(deprecated_mutable_fields)];
66-
#[allow(deprecated_drop)];
6766

6867
// Make core testable by not duplicating lang items. See #2912
6968
#[cfg(test)] extern mod realcore(name = "core", vers = "0.7-pre");

src/libcore/pipes.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ use cast::{forget, transmute, transmute_copy};
8686
use either::{Either, Left, Right};
8787
use kinds::Owned;
8888
use libc;
89+
use ops::Drop;
8990
use option::{None, Option, Some};
9091
use unstable::intrinsics;
9192
use ptr;
@@ -395,11 +396,13 @@ pub fn try_recv<T:Owned,Tbuffer:Owned>(p: RecvPacketBuffered<T, Tbuffer>)
395396
let p_ = p.unwrap();
396397
let p = unsafe { &*p_ };
397398
398-
#[unsafe_destructor]
399399
struct DropState<'self> {
400400
p: &'self PacketHeader,
401+
}
401402
402-
drop {
403+
#[unsafe_destructor]
404+
impl<'self> Drop for DropState<'self> {
405+
fn finalize(&self) {
403406
unsafe {
404407
if task::failing() {
405408
self.p.state = Terminated;
@@ -411,7 +414,7 @@ pub fn try_recv<T:Owned,Tbuffer:Owned>(p: RecvPacketBuffered<T, Tbuffer>)
411414
}
412415
}
413416
}
414-
};
417+
}
415418
416419
let _drop_state = DropState { p: &p.header };
417420

0 commit comments

Comments
 (0)