libsyntax: Fix test and merge fallout.

3 files changed, 4 insertions, 4 deletions

diff --git a/src/libsyntax/parse/mod.rs b/src/libsyntax/parse/mod.rs
index 746e3279f19..5a8444518aa 100644
--- a/src/libsyntax/parse/mod.rs
+++ b/src/libsyntax/parse/mod.rs
@@ -635,7 +635,7 @@ mod test {
     }
 
     #[test] fn parse_ident_pat () {
-        let parser = string_to_parser(@"b");
+        let mut parser = string_to_parser(@"b");
         assert_eq!(parser.parse_pat(),
                    @ast::Pat{id: ast::DUMMY_NODE_ID,
                              node: ast::PatIdent(
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index 80072cc4a4e..2428710087f 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -4442,12 +4442,12 @@ impl Parser {
         }
 
 
-        if *self.token == token::LPAREN {
+        if self.token == token::LPAREN {
             // `extern mod foo (name = "bar"[,vers = "version"]) is obsolete,
             // `extern mod foo = "bar#[version]";` should be used.
             // Parse obsolete options to avoid wired parser errors
             self.parse_optional_meta();
-            self.obsolete(*self.span, ObsoleteExternModAttributesInParens);
+            self.obsolete(self.span, ObsoleteExternModAttributesInParens);
         }
         // extern mod foo;
         self.expect(&token::SEMI);
diff --git a/src/libsyntax/util/parser_testing.rs b/src/libsyntax/util/parser_testing.rs
index 2d13cdb9bbb..01e050c1ffe 100644
--- a/src/libsyntax/util/parser_testing.rs
+++ b/src/libsyntax/util/parser_testing.rs
@@ -55,7 +55,7 @@ pub fn string_to_crate (source_str : @str) -> ast::Crate {
 
 // parse a string, return a crate and the ParseSess
 pub fn string_to_crate_and_sess (source_str : @str) -> (ast::Crate,@mut ParseSess) {
-    let (p,ps) = string_to_parser_and_sess(source_str);
+    let (mut p,ps) = string_to_parser_and_sess(source_str);
     (p.parse_crate_mod(),ps)
 }