diff options
| author | bors <bors@rust-lang.org> | 2015-02-27 23:15:17 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-02-27 23:15:17 +0000 |
| commit | e233987ce1de88a48db2ce612019ba644d3cf5dd (patch) | |
| tree | f776ae018199c9ff2350a29dc569630f64455f87 /src/libsyntax | |
| parent | bd0d8e47e53f25bbd50418a0f117973c366c1b08 (diff) | |
| parent | bde4c1d6fbefcd914a06b5eab6ef6f9a6f26f271 (diff) | |
| download | rust-e233987ce1de88a48db2ce612019ba644d3cf5dd.tar.gz rust-e233987ce1de88a48db2ce612019ba644d3cf5dd.zip | |
Auto merge of #22860 - Manishearth:rollup, r=alexcrichton
Passes check-stage1, check-stage2
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ast_util.rs | 8 | ||||
| -rw-r--r-- | src/libsyntax/ext/tt/macro_rules.rs | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/libsyntax/ast_util.rs b/src/libsyntax/ast_util.rs index 79f0433761d..264e05f5c8d 100644 --- a/src/libsyntax/ast_util.rs +++ b/src/libsyntax/ast_util.rs @@ -760,13 +760,13 @@ mod test { #[test] fn idents_name_eq_test() { assert!(segments_name_eq( &[Ident{name:Name(3),ctxt:4}, Ident{name:Name(78),ctxt:82}] - .iter().map(ident_to_segment).collect::<Vec<PathSegment>>()[], + .iter().map(ident_to_segment).collect::<Vec<PathSegment>>(), &[Ident{name:Name(3),ctxt:104}, Ident{name:Name(78),ctxt:182}] - .iter().map(ident_to_segment).collect::<Vec<PathSegment>>()[])); + .iter().map(ident_to_segment).collect::<Vec<PathSegment>>())); assert!(!segments_name_eq( &[Ident{name:Name(3),ctxt:4}, Ident{name:Name(78),ctxt:82}] - .iter().map(ident_to_segment).collect::<Vec<PathSegment>>()[], + .iter().map(ident_to_segment).collect::<Vec<PathSegment>>(), &[Ident{name:Name(3),ctxt:104}, Ident{name:Name(77),ctxt:182}] - .iter().map(ident_to_segment).collect::<Vec<PathSegment>>()[])); + .iter().map(ident_to_segment).collect::<Vec<PathSegment>>())); } } diff --git a/src/libsyntax/ext/tt/macro_rules.rs b/src/libsyntax/ext/tt/macro_rules.rs index fa6d934a457..67011ad21a6 100644 --- a/src/libsyntax/ext/tt/macro_rules.rs +++ b/src/libsyntax/ext/tt/macro_rules.rs @@ -334,6 +334,10 @@ fn check_matcher<'a, I>(cx: &mut ExtCtxt, matcher: I, follow: &Token) let tok = if let TtToken(_, ref tok) = *token { tok } else { unreachable!() }; // If T' is in the set FOLLOW(NT), continue. Else, reject. match (&next_token, is_in_follow(cx, &next_token, frag_spec.as_str())) { + (_, Err(msg)) => { + cx.span_err(sp, &msg); + continue + } (&Eof, _) => return Some((sp, tok.clone())), (_, Ok(true)) => continue, (next, Ok(false)) => { @@ -343,10 +347,6 @@ fn check_matcher<'a, I>(cx: &mut ExtCtxt, matcher: I, follow: &Token) token_to_string(next))); continue }, - (_, Err(msg)) => { - cx.span_err(sp, &msg); - continue - } } }, TtSequence(sp, ref seq) => { |