diff options
| author | Patrick Walton <pcwalton@mimiga.net> | 2012-12-04 21:13:02 -0800 |
|---|---|---|
| committer | Patrick Walton <pcwalton@mimiga.net> | 2012-12-04 21:13:02 -0800 |
| commit | b8cfd5c4142c28dde844678f2d506ccaf058dc78 (patch) | |
| tree | 9f947bc89c7faa03d1f5455f52c9dee5a69e6580 /src/libsyntax/ext/tt | |
| parent | 01cd53baf0ea241b17132e857ba356b9b9a14908 (diff) | |
| download | rust-b8cfd5c4142c28dde844678f2d506ccaf058dc78.tar.gz rust-b8cfd5c4142c28dde844678f2d506ccaf058dc78.zip | |
librustc: Long lines. rs=rustbot
Diffstat (limited to 'src/libsyntax/ext/tt')
| -rw-r--r-- | src/libsyntax/ext/tt/macro_parser.rs | 4 | ||||
| -rw-r--r-- | src/libsyntax/ext/tt/macro_rules.rs | 4 | ||||
| -rw-r--r-- | src/libsyntax/ext/tt/transcribe.rs | 13 |
3 files changed, 15 insertions, 6 deletions
diff --git a/src/libsyntax/ext/tt/macro_parser.rs b/src/libsyntax/ext/tt/macro_parser.rs index e782a183430..ad4677942ac 100644 --- a/src/libsyntax/ext/tt/macro_parser.rs +++ b/src/libsyntax/ext/tt/macro_parser.rs @@ -185,7 +185,9 @@ fn nameize(p_s: parse_sess, ms: ~[matcher], res: ~[@named_match]) match m { {node: match_tok(_), span: _} => (), {node: match_seq(ref more_ms, _, _, _, _), span: _} => { - for (*more_ms).each() |next_m| { n_rec(p_s, *next_m, res, ret_val) }; + for (*more_ms).each() |next_m| { + n_rec(p_s, *next_m, res, ret_val) + }; } {node: match_nonterminal(bind_name, _, idx), span: sp} => { if ret_val.contains_key(bind_name) { diff --git a/src/libsyntax/ext/tt/macro_rules.rs b/src/libsyntax/ext/tt/macro_rules.rs index 09415703260..f33c8b80204 100644 --- a/src/libsyntax/ext/tt/macro_rules.rs +++ b/src/libsyntax/ext/tt/macro_rules.rs @@ -94,7 +94,9 @@ fn add_new_extension(cx: ext_ctxt, sp: span, name: ident, @matched_nonterminal(nt_tt(@ref tt)) => { match (*tt) { // cut off delimiters; don't parse 'em - tt_delim(ref tts) => (*tts).slice(1u,(*tts).len()-1u), + tt_delim(ref tts) => { + (*tts).slice(1u,(*tts).len()-1u) + } _ => cx.span_fatal( sp, ~"macro rhs must be delimited") } diff --git a/src/libsyntax/ext/tt/transcribe.rs b/src/libsyntax/ext/tt/transcribe.rs index 3d901039188..19b5975c147 100644 --- a/src/libsyntax/ext/tt/transcribe.rs +++ b/src/libsyntax/ext/tt/transcribe.rs @@ -199,8 +199,8 @@ fn tt_next_token(&&r: tt_reader) -> {tok: Token, sp: span} { ~"attempted to repeat an expression containing no syntax \ variables matched as repeating at this depth"); } - lis_contradiction(ref msg) => { /* FIXME #2887 blame macro invoker - instead*/ + lis_contradiction(ref msg) => { + /* FIXME #2887 blame macro invoker instead*/ r.sp_diag.span_fatal(sp, (*msg)); } lis_constraint(len, _) => { @@ -217,8 +217,13 @@ fn tt_next_token(&&r: tt_reader) -> {tok: Token, sp: span} { } else { r.repeat_len.push(len); r.repeat_idx.push(0u); - r.cur = @{readme: (*tts), mut idx: 0u, dotdotdoted: true, - sep: (*sep), up: tt_frame_up(option::Some(r.cur))}; + r.cur = @{ + readme: (*tts), + mut idx: 0u, + dotdotdoted: true, + sep: (*sep), + up: tt_frame_up(option::Some(r.cur)) + }; } } } |
