auto merge of #5488 : pcwalton/rust/depure, r=pcwalton

2013-03-22 13:00:56 -07:00
parent b6f9aa1fd7 3eda11a4f7
commit e9b077c0e9
212 changed files with 2514 additions and 2550 deletions
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -196,8 +196,8 @@ macro_rules! maybe_whole (
 )


-pure fn maybe_append(+lhs: ~[attribute], rhs: Option<~[attribute]>)
-                  -> ~[attribute] {
+fn maybe_append(+lhs: ~[attribute], rhs: Option<~[attribute]>)
+             -> ~[attribute] {
    match rhs {
        None => lhs,
        Some(ref attrs) => vec::append(lhs, (*attrs))
@@ -331,7 +331,7 @@ pub impl Parser {
    }
    fn get_id(&self) -> node_id { next_node_id(self.sess) }

-    pure fn id_to_str(&self, id: ident) -> @~str {
+    fn id_to_str(&self, id: ident) -> @~str {
        self.sess.interner.get(id)
    }