Skip to content

Commit bc2f5e2

Browse files
frewsxcvfrewsxcv
committed
Use associated functions for libsyntax SepSeq constructors.
1 parent c8fc481 commit bc2f5e2

File tree

3 files changed

+36
-34
lines changed

3 files changed

+36
-34
lines changed

‎src/libsyntax/parse/attr.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
use attr;
1212
use ast;
1313
use codemap::{spanned, Spanned, mk_sp, Span};
14-
use parse::common::*; //resolve bug?
14+
use parse::common::SeqSep;
1515
use parse::PResult;
1616
use parse::token;
1717
use parse::parser::{Parser, TokenType};
@@ -200,7 +200,7 @@ impl<'a> Parser<'a> {
200200
fn parse_meta_seq(&mut self) -> PResult<'a, Vec<P<ast::MetaItem>>> {
201201
self.parse_unspanned_seq(&token::OpenDelim(token::Paren),
202202
&token::CloseDelim(token::Paren),
203-
seq_sep_trailing_allowed(token::Comma),
203+
SeqSep::trailing_allowed(token::Comma),
204204
|p: &mut Parser<'a>| p.parse_meta_item())
205205
}
206206
}

‎src/libsyntax/parse/common.rs

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,18 @@ pub struct SeqSep {
1919
pub trailing_sep_allowed: bool,
2020
}
2121

22-
pub fn seq_sep_trailing_allowed(t: token::Token) -> SeqSep {
23-
SeqSep {
24-
sep: Some(t),
25-
trailing_sep_allowed: true,
22+
impl SeqSep {
23+
pub fn trailing_allowed(t: token::Token) -> SeqSep {
24+
SeqSep {
25+
sep: Some(t),
26+
trailing_sep_allowed: true,
27+
}
2628
}
27-
}
2829

29-
pub fn seq_sep_none() -> SeqSep {
30-
SeqSep {
31-
sep: None,
32-
trailing_sep_allowed: false,
30+
pub fn none() -> SeqSep {
31+
SeqSep {
32+
sep: None,
33+
trailing_sep_allowed: false,
34+
}
3335
}
3436
}

‎src/libsyntax/parse/parser.rs

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ use errors::{self, DiagnosticBuilder};
5050
use ext::tt::macro_parser;
5151
use parse;
5252
use parse::classify;
53-
use parse::common::{SeqSep, seq_sep_none, seq_sep_trailing_allowed};
53+
use parse::common::SeqSep;
5454
use parse::lexer::{Reader, TokenAndSpan};
5555
use parse::obsolete::{ParserObsoleteMethods, ObsoleteSyntax};
5656
use parse::token::{self, intern, MatchNt, SubstNt, SpecialVarNt, InternedString};
@@ -851,7 +851,7 @@ impl<'a> Parser<'a> {
851851
/// passes through any errors encountered. Used for error recovery.
852852
pub fn eat_to_tokens(&mut self, kets: &[&token::Token]) {
853853
self.parse_seq_to_before_tokens(kets,
854-
seq_sep_none(),
854+
SeqSep::none(),
855855
|p| p.parse_token_tree(),
856856
|mut e| e.cancel());
857857
}
@@ -1235,7 +1235,7 @@ impl<'a> Parser<'a> {
12351235
self.parse_unspanned_seq(
12361236
&token::OpenDelim(token::Brace),
12371237
&token::CloseDelim(token::Brace),
1238-
seq_sep_none(),
1238+
SeqSep::none(),
12391239
|p| -> PResult<'a, TraitItem> {
12401240
maybe_whole!(no_clone_from_p p, NtTraitItem);
12411241
let mut attrs = try!(p.parse_outer_attributes());
@@ -1460,7 +1460,7 @@ impl<'a> Parser<'a> {
14601460
self.bump();
14611461
let delim = try!(self.expect_open_delim());
14621462
let tts = try!(self.parse_seq_to_end(&token::CloseDelim(delim),
1463-
seq_sep_none(),
1463+
SeqSep::none(),
14641464
|p| p.parse_token_tree()));
14651465
let hi = self.span.hi;
14661466
TyKind::Mac(spanned(lo, hi, Mac_ { path: path, tts: tts, ctxt: EMPTY_CTXT }))
@@ -1800,7 +1800,7 @@ impl<'a> Parser<'a> {
18001800

18011801
let inputs = try!(self.parse_seq_to_end(
18021802
&token::CloseDelim(token::Paren),
1803-
seq_sep_trailing_allowed(token::Comma),
1803+
SeqSep::trailing_allowed(token::Comma),
18041804
|p| p.parse_ty_sum()));
18051805

18061806
let output_ty = if self.eat(&token::RArrow) {
@@ -2206,7 +2206,7 @@ impl<'a> Parser<'a> {
22062206
self.bump();
22072207
let remaining_exprs = try!(self.parse_seq_to_end(
22082208
&token::CloseDelim(token::Bracket),
2209-
seq_sep_trailing_allowed(token::Comma),
2209+
SeqSep::trailing_allowed(token::Comma),
22102210
|p| Ok(try!(p.parse_expr()))
22112211
));
22122212
let mut exprs = vec!(first_expr);
@@ -2325,7 +2325,7 @@ impl<'a> Parser<'a> {
23252325
let delim = try!(self.expect_open_delim());
23262326
let tts = try!(self.parse_seq_to_end(
23272327
&token::CloseDelim(delim),
2328-
seq_sep_none(),
2328+
SeqSep::none(),
23292329
|p| p.parse_token_tree()));
23302330
let hi = self.last_span.hi;
23312331

@@ -2498,7 +2498,7 @@ impl<'a> Parser<'a> {
24982498
let mut es = try!(self.parse_unspanned_seq(
24992499
&token::OpenDelim(token::Paren),
25002500
&token::CloseDelim(token::Paren),
2501-
seq_sep_trailing_allowed(token::Comma),
2501+
SeqSep::trailing_allowed(token::Comma),
25022502
|p| Ok(try!(p.parse_expr()))
25032503
));
25042504
let hi = self.last_span.hi;
@@ -2600,7 +2600,7 @@ impl<'a> Parser<'a> {
26002600
let es = try!(self.parse_unspanned_seq(
26012601
&token::OpenDelim(token::Paren),
26022602
&token::CloseDelim(token::Paren),
2603-
seq_sep_trailing_allowed(token::Comma),
2603+
SeqSep::trailing_allowed(token::Comma),
26042604
|p| Ok(try!(p.parse_expr()))
26052605
));
26062606
hi = self.last_span.hi;
@@ -2636,7 +2636,7 @@ impl<'a> Parser<'a> {
26362636
let Spanned { node: seq, span: seq_span } = try!(self.parse_seq(
26372637
&token::OpenDelim(token::Paren),
26382638
&token::CloseDelim(token::Paren),
2639-
seq_sep_none(),
2639+
SeqSep::none(),
26402640
|p| p.parse_token_tree()
26412641
));
26422642
let (sep, repeat) = try!(self.parse_sep_and_kleene_op());
@@ -2749,7 +2749,7 @@ impl<'a> Parser<'a> {
27492749

27502750
// Parse the token trees within the delimiters
27512751
let tts = self.parse_seq_to_before_end(&token::CloseDelim(delim),
2752-
seq_sep_none(),
2752+
SeqSep::none(),
27532753
|p| p.parse_token_tree());
27542754

27552755
// Parse the close delimiter.
@@ -3579,7 +3579,7 @@ impl<'a> Parser<'a> {
35793579
self.bump();
35803580
let delim = try!(self.expect_open_delim());
35813581
let tts = try!(self.parse_seq_to_end(&token::CloseDelim(delim),
3582-
seq_sep_none(), |p| p.parse_token_tree()));
3582+
SeqSep::none(), |p| p.parse_token_tree()));
35833583
let mac = Mac_ { path: path, tts: tts, ctxt: EMPTY_CTXT };
35843584
pat = PatKind::Mac(codemap::Spanned {node: mac,
35853585
span: mk_sp(lo, self.last_span.hi)});
@@ -3638,7 +3638,7 @@ impl<'a> Parser<'a> {
36383638
let args = try!(self.parse_enum_variant_seq(
36393639
&token::OpenDelim(token::Paren),
36403640
&token::CloseDelim(token::Paren),
3641-
seq_sep_trailing_allowed(token::Comma),
3641+
SeqSep::trailing_allowed(token::Comma),
36423642
|p| p.parse_pat()));
36433643
pat = PatKind::TupleStruct(path, Some(args));
36443644
}
@@ -3888,7 +3888,7 @@ impl<'a> Parser<'a> {
38883888
let tts = try!(self.parse_unspanned_seq(
38893889
&token::OpenDelim(delim),
38903890
&token::CloseDelim(delim),
3891-
seq_sep_none(),
3891+
SeqSep::none(),
38923892
|p| p.parse_token_tree()
38933893
));
38943894
let hi = self.last_span.hi;
@@ -4472,7 +4472,7 @@ impl<'a> Parser<'a> {
44724472
try!(self.parse_unspanned_seq(
44734473
&token::OpenDelim(token::Paren),
44744474
&token::CloseDelim(token::Paren),
4475-
seq_sep_trailing_allowed(token::Comma),
4475+
SeqSep::trailing_allowed(token::Comma),
44764476
|p| {
44774477
if p.token == token::DotDotDot {
44784478
p.bump();
@@ -4684,7 +4684,7 @@ impl<'a> Parser<'a> {
46844684
match self.token {
46854685
token::Comma => {
46864686
self.bump();
4687-
let sep = seq_sep_trailing_allowed(token::Comma);
4687+
let sep = SeqSep::trailing_allowed(token::Comma);
46884688
let mut fn_inputs = self.parse_seq_to_before_end(
46894689
&token::CloseDelim(token::Paren),
46904690
sep,
@@ -4707,7 +4707,7 @@ impl<'a> Parser<'a> {
47074707

47084708
let fn_inputs = match explicit_self {
47094709
SelfKind::Static => {
4710-
let sep = seq_sep_trailing_allowed(token::Comma);
4710+
let sep = SeqSep::trailing_allowed(token::Comma);
47114711
self.parse_seq_to_before_end(&token::CloseDelim(token::Paren), sep, parse_arg_fn)
47124712
}
47134713
SelfKind::Value(id) => parse_remaining_arguments!(id),
@@ -4741,7 +4741,7 @@ impl<'a> Parser<'a> {
47414741
try!(self.parse_obsolete_closure_kind());
47424742
let args = self.parse_seq_to_before_end(
47434743
&token::BinOp(token::Or),
4744-
seq_sep_trailing_allowed(token::Comma),
4744+
SeqSep::trailing_allowed(token::Comma),
47454745
|p| p.parse_fn_block_arg()
47464746
);
47474747
self.bump();
@@ -4905,7 +4905,7 @@ impl<'a> Parser<'a> {
49054905
// eat a matched-delimiter token tree:
49064906
let delim = try!(self.expect_open_delim());
49074907
let tts = try!(self.parse_seq_to_end(&token::CloseDelim(delim),
4908-
seq_sep_none(),
4908+
SeqSep::none(),
49094909
|p| p.parse_token_tree()));
49104910
let m_ = Mac_ { path: pth, tts: tts, ctxt: EMPTY_CTXT };
49114911
let m: ast::Mac = codemap::Spanned { node: m_,
@@ -5142,7 +5142,7 @@ impl<'a> Parser<'a> {
51425142
let fields = try!(self.parse_unspanned_seq(
51435143
&token::OpenDelim(token::Paren),
51445144
&token::CloseDelim(token::Paren),
5145-
seq_sep_trailing_allowed(token::Comma),
5145+
SeqSep::trailing_allowed(token::Comma),
51465146
|p| {
51475147
let attrs = try!(p.parse_outer_attributes());
51485148
let lo = p.span.lo;
@@ -5972,7 +5972,7 @@ impl<'a> Parser<'a> {
59725972
// eat a matched-delimiter token tree:
59735973
let delim = try!(self.expect_open_delim());
59745974
let tts = try!(self.parse_seq_to_end(&token::CloseDelim(delim),
5975-
seq_sep_none(),
5975+
SeqSep::none(),
59765976
|p| p.parse_token_tree()));
59775977
// single-variant-enum... :
59785978
let m = Mac_ { path: pth, tts: tts, ctxt: EMPTY_CTXT };
@@ -6039,7 +6039,7 @@ impl<'a> Parser<'a> {
60396039
let idents = try!(self.parse_unspanned_seq(
60406040
&token::OpenDelim(token::Brace),
60416041
&token::CloseDelim(token::Brace),
6042-
seq_sep_trailing_allowed(token::Comma),
6042+
SeqSep::trailing_allowed(token::Comma),
60436043
|p| p.parse_path_list_item()));
60446044
let path = ast::Path {
60456045
span: mk_sp(lo, self.span.hi),
@@ -6067,7 +6067,7 @@ impl<'a> Parser<'a> {
60676067
let idents = try!(self.parse_unspanned_seq(
60686068
&token::OpenDelim(token::Brace),
60696069
&token::CloseDelim(token::Brace),
6070-
seq_sep_trailing_allowed(token::Comma),
6070+
SeqSep::trailing_allowed(token::Comma),
60716071
|p| p.parse_path_list_item()
60726072
));
60736073
let path = ast::Path {

0 commit comments

Comments
 (0)