From 81ec1f3c186cd64450d8141aab467f0a1f3a7ebd Mon Sep 17 00:00:00 2001 From: Flavio Percoco Date: Thu, 27 Mar 2014 00:01:11 +0100 Subject: Rename Pod into Copy Summary: So far, we've used the term POD "Plain Old Data" to refer to types that can be safely copied. However, this term is not consistent with the other built-in bounds that use verbs instead. This patch renames the Pod kind into Copy. RFC: 0003-opt-in-builtin-traits Test Plan: make check Reviewers: cmr Differential Revision: http://phabricator.octayn.net/D3 --- src/libcollections/hashmap.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/libcollections') diff --git a/src/libcollections/hashmap.rs b/src/libcollections/hashmap.rs index b03cfced7cd..2d3f7d512c3 100644 --- a/src/libcollections/hashmap.rs +++ b/src/libcollections/hashmap.rs @@ -110,7 +110,7 @@ mod table { /// Represents an index into a `RawTable` with no key or value in it. pub struct EmptyIndex { priv idx: int, - priv nopod: marker::NoPod, + priv nocopy: marker::NoCopy, } /// Represents an index into a `RawTable` with a key, value, and hash @@ -118,7 +118,7 @@ mod table { pub struct FullIndex { priv idx: int, priv hash: SafeHash, - priv nopod: marker::NoPod, + priv nocopy: marker::NoCopy, } impl FullIndex { @@ -237,19 +237,19 @@ mod table { let idx = index as int; let hash = unsafe { *self.hashes.offset(idx) }; - let nopod = marker::NoPod; + let nocopy = marker::NoCopy; match hash { EMPTY_BUCKET => Empty(EmptyIndex { idx: idx, - nopod: nopod + nocopy: nocopy }), full_hash => Full(FullIndex { idx: idx, hash: SafeHash { hash: full_hash }, - nopod: nopod, + nocopy: nocopy, }) } } @@ -320,7 +320,7 @@ mod table { self.size += 1; - FullIndex { idx: idx, hash: hash, nopod: marker::NoPod } + FullIndex { idx: idx, hash: hash, nocopy: marker::NoCopy } } /// Removes a key and value from the hashtable. @@ -347,7 +347,7 @@ mod table { self.size -= 1; - (EmptyIndex { idx: idx, nopod: marker::NoPod }, k, v) + (EmptyIndex { idx: idx, nocopy: marker::NoCopy }, k, v) } } -- cgit 1.4.1-3-g733a5