about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorFlavio Percoco <flaper87@gmail.com>2014-12-22 00:01:20 +0100
committerFlavio Percoco <flaper87@gmail.com>2014-12-26 17:26:33 +0100
commit686ce664da31f87b8d1c7377313f160d8fdcebe9 (patch)
tree99bf6657991659b683804ce6bad9ea042cc84b63 /src/libstd
parentfb803a857000813e4d572900799f0498fb20050b (diff)
downloadrust-686ce664da31f87b8d1c7377313f160d8fdcebe9.tar.gz
rust-686ce664da31f87b8d1c7377313f160d8fdcebe9.zip
Rename `OwnedPtr` to `UniquePtr`
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/collections/hash/table.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libstd/collections/hash/table.rs b/src/libstd/collections/hash/table.rs
index ee37eb27795..643c2b7d074 100644
--- a/src/libstd/collections/hash/table.rs
+++ b/src/libstd/collections/hash/table.rs
@@ -23,7 +23,7 @@ use num::{Int, UnsignedInt};
 use ops::{Deref, DerefMut, Drop};
 use option::Option;
 use option::Option::{Some, None};
-use ptr::{OwnedPtr, RawPtr, copy_nonoverlapping_memory, zero_memory};
+use ptr::{UniquePtr, RawPtr, copy_nonoverlapping_memory, zero_memory};
 use ptr;
 use rt::heap::{allocate, deallocate};
 
@@ -69,7 +69,7 @@ const EMPTY_BUCKET: u64 = 0u64;
 pub struct RawTable<K, V> {
     capacity: uint,
     size:     uint,
-    hashes:   OwnedPtr<u64>,
+    hashes:   UniquePtr<u64>,
     // Because K/V do not appear directly in any of the types in the struct,
     // inform rustc that in fact instances of K and V are reachable from here.
     marker:   marker::CovariantType<(K,V)>,
@@ -563,7 +563,7 @@ impl<K, V> RawTable<K, V> {
             return RawTable {
                 size: 0,
                 capacity: 0,
-                hashes: OwnedPtr::null(),
+                hashes: UniquePtr::null(),
                 marker: marker::CovariantType,
             };
         }
@@ -602,7 +602,7 @@ impl<K, V> RawTable<K, V> {
         RawTable {
             capacity: capacity,
             size:     0,
-            hashes:   OwnedPtr(hashes),
+            hashes:   UniquePtr(hashes),
             marker:   marker::CovariantType,
         }
     }