about summary refs log tree commit diff
path: root/src/libstd/sync
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-02-15 09:36:26 -0800
committerbors <bors@rust-lang.org>2014-02-15 09:36:26 -0800
commit7762baa89bc1f1480b79c410375b36c6bdda600e (patch)
treeaed999c85af0ef7e8552a56a08cbb784e5b7a0c9 /src/libstd/sync
parenta7aa4c477e7ccc51f19805c42b74cf22dfe22c39 (diff)
parent254c155fca415359d998e79e9989b4219136ccdc (diff)
downloadrust-7762baa89bc1f1480b79c410375b36c6bdda600e.tar.gz
rust-7762baa89bc1f1480b79c410375b36c6bdda600e.zip
auto merge of #12282 : cmr/rust/cleanup-ptr, r=huonw
Diffstat (limited to 'src/libstd/sync')
-rw-r--r--src/libstd/sync/deque.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sync/deque.rs b/src/libstd/sync/deque.rs
index 7feff127d69..7ce760040e6 100644
--- a/src/libstd/sync/deque.rs
+++ b/src/libstd/sync/deque.rs
@@ -363,7 +363,7 @@ impl<T: Send> Buffer<T> {
     // very unsafe method which the caller needs to treat specially in case a
     // race is lost.
     unsafe fn get(&self, i: int) -> T {
-        ptr::read_ptr(self.storage.offset(i & self.mask()))
+        ptr::read(self.storage.offset(i & self.mask()))
     }
 
     // Unsafe because this unsafely overwrites possibly uninitialized or