auto merge of #12016 : FlaPer87/rust/remove-non-copyable, r=alexcrichton

cc #10834

1 files changed, 3 insertions, 2 deletions

diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index dd7cc3a2314..b80c222d4dc 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -81,6 +81,7 @@ use opt_vec::OptVec;
 
 use std::cell::Cell;
 use std::hashmap::HashSet;
+use std::kinds::marker;
 use std::util;
 use std::vec;
 
@@ -317,7 +318,7 @@ pub fn Parser(sess: @ParseSess, cfg: ast::CrateConfig, rdr: @Reader)
         obsolete_set: HashSet::new(),
         mod_path_stack: ~[],
         open_braces: ~[],
-        non_copyable: util::NonCopyable
+        nopod: marker::NoPod
     }
 }
 
@@ -348,7 +349,7 @@ pub struct Parser {
     /// Stack of spans of open delimiters. Used for error message.
     open_braces: ~[Span],
     /* do not copy the parser; its state is tied to outside state */
-    priv non_copyable: util::NonCopyable
+    priv nopod: marker::NoPod
 }
 
 fn is_plain_ident_or_underscore(t: &token::Token) -> bool {