Skip to content

Commit 33d80bf

Browse files
committed
Return without a reference in unix Weak::get()
1 parent 70c5af8 commit 33d80bf

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

src/libstd/sys/unix/weak.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,15 @@ impl<F> Weak<F> {
4545
}
4646
}
4747

48-
pub fn get(&self) -> Option<&F> {
48+
pub fn get(&self) -> Option<F> {
4949
assert_eq!(mem::size_of::<F>(), mem::size_of::<usize>());
5050
unsafe {
5151
if self.addr.load(Ordering::SeqCst) == 1 {
5252
self.addr.store(fetch(self.name), Ordering::SeqCst);
5353
}
54-
if self.addr.load(Ordering::SeqCst) == 0 {
55-
None
56-
} else {
57-
mem::transmute::<&AtomicUsize, Option<&F>>(&self.addr)
54+
match self.addr.load(Ordering::SeqCst) {
55+
0 => None,
56+
addr => Some(mem::transmute_copy::<usize, F>(&addr)),
5857
}
5958
}
6059
}

0 commit comments

Comments
 (0)