about summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-03-28 06:26:47 -0700
committerbors <bors@rust-lang.org>2014-03-28 06:26:47 -0700
commitb8601a3d8b91ad3b653d143307611f2f5c75617e (patch)
tree17e14596adb1325c47af6e5d0e027b1ae2ec7fe7 /src/libsyntax
parent794ee03390af915898029411682357ad64662ff4 (diff)
parent81ec1f3c186cd64450d8141aab467f0a1f3a7ebd (diff)
downloadrust-b8601a3d8b91ad3b653d143307611f2f5c75617e.tar.gz
rust-b8601a3d8b91ad3b653d143307611f2f5c75617e.zip
auto merge of #13160 : FlaPer87/rust/rename-pod, r=thestinger
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

r? @nikomatsakis 
Diffstat (limited to 'src/libsyntax')
-rw-r--r--src/libsyntax/ast_map.rs2
-rw-r--r--src/libsyntax/parse/parser.rs4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libsyntax/ast_map.rs b/src/libsyntax/ast_map.rs
index 90c23a54426..5db353b7262 100644
--- a/src/libsyntax/ast_map.rs
+++ b/src/libsyntax/ast_map.rs
@@ -68,7 +68,7 @@ impl<'a> Iterator<PathElem> for LinkedPath<'a> {
 #[deriving(Clone)]
 pub struct Values<'a, T>(slice::Items<'a, T>);
 
-impl<'a, T: Pod> Iterator<T> for Values<'a, T> {
+impl<'a, T: Copy> Iterator<T> for Values<'a, T> {
     fn next(&mut self) -> Option<T> {
         let &Values(ref mut items) = self;
         items.next().map(|&x| x)
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index d6ccea7331d..0ae43db8315 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -306,7 +306,7 @@ pub fn Parser<'a>(sess: &'a ParseSess, cfg: ast::CrateConfig, rdr: ~Reader:)
         obsolete_set: HashSet::new(),
         mod_path_stack: Vec::new(),
         open_braces: Vec::new(),
-        nopod: marker::NoPod
+        nocopy: marker::NoCopy
     }
 }
 
@@ -337,7 +337,7 @@ pub struct Parser<'a> {
     /// Stack of spans of open delimiters. Used for error message.
     open_braces: Vec<Span> ,
     /* do not copy the parser; its state is tied to outside state */
-    priv nopod: marker::NoPod
+    priv nocopy: marker::NoCopy
 }
 
 fn is_plain_ident_or_underscore(t: &token::Token) -> bool {