Skip to content

Commit f3eee0e

Browse files
committed
libsyntax: Fix test and merge fallout.
1 parent 8b088d4 commit f3eee0e

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

Diff for: src/libsyntax/parse/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,7 @@ mod test {
635635
}
636636
637637
#[test] fn parse_ident_pat () {
638-
let parser = string_to_parser(@"b");
638+
let mut parser = string_to_parser(@"b");
639639
assert_eq!(parser.parse_pat(),
640640
@ast::Pat{id: ast::DUMMY_NODE_ID,
641641
node: ast::PatIdent(

Diff for: src/libsyntax/parse/parser.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -4442,12 +4442,12 @@ impl Parser {
44424442
}
44434443

44444444

4445-
if *self.token == token::LPAREN {
4445+
if self.token == token::LPAREN {
44464446
// `extern mod foo (name = "bar"[,vers = "version"]) is obsolete,
44474447
// `extern mod foo = "bar#[version]";` should be used.
44484448
// Parse obsolete options to avoid wired parser errors
44494449
self.parse_optional_meta();
4450-
self.obsolete(*self.span, ObsoleteExternModAttributesInParens);
4450+
self.obsolete(self.span, ObsoleteExternModAttributesInParens);
44514451
}
44524452
// extern mod foo;
44534453
self.expect(&token::SEMI);

Diff for: src/libsyntax/util/parser_testing.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ pub fn string_to_crate (source_str : @str) -> ast::Crate {
5555

5656
// parse a string, return a crate and the ParseSess
5757
pub fn string_to_crate_and_sess (source_str : @str) -> (ast::Crate,@mut ParseSess) {
58-
let (p,ps) = string_to_parser_and_sess(source_str);
58+
let (mut p,ps) = string_to_parser_and_sess(source_str);
5959
(p.parse_crate_mod(),ps)
6060
}
6161

0 commit comments

Comments
 (0)