diff options
| author | Nicholas Nethercote <nnethercote@mozilla.com> | 2018-12-12 10:01:08 +1100 |
|---|---|---|
| committer | Nicholas Nethercote <nnethercote@mozilla.com> | 2018-12-12 20:36:00 +1100 |
| commit | e80c7ddb05ee584c12131a4713173a3eafc49f4a (patch) | |
| tree | 20bcd4aa3ddb48334f1d872e1a1e8c26afcc7398 /src/libsyntax/attr | |
| parent | 07c12fa89e297bf5940f903dea8186a0a33f9d82 (diff) | |
| download | rust-e80c7ddb05ee584c12131a4713173a3eafc49f4a.tar.gz rust-e80c7ddb05ee584c12131a4713173a3eafc49f4a.zip | |
Rename `TokenStream::concat` and remove `TokenStream::concat_rc_vec`.
`TokenStream::new` is a better name for the former, and the latter is now just equivalent to `TokenStream::Stream`.
Diffstat (limited to 'src/libsyntax/attr')
| -rw-r--r-- | src/libsyntax/attr/mod.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libsyntax/attr/mod.rs b/src/libsyntax/attr/mod.rs index 7723c15a266..73cbe49f43b 100644 --- a/src/libsyntax/attr/mod.rs +++ b/src/libsyntax/attr/mod.rs @@ -483,7 +483,7 @@ impl MetaItem { last_pos = segment.ident.span.hi(); } idents.push(self.node.tokens(self.span)); - TokenStream::concat(idents) + TokenStream::new(idents) } fn from_tokens<I>(tokens: &mut iter::Peekable<I>) -> Option<MetaItem> @@ -539,7 +539,7 @@ impl MetaItemKind { match *self { MetaItemKind::Word => TokenStream::empty(), MetaItemKind::NameValue(ref lit) => { - TokenStream::concat(vec![TokenTree::Token(span, Token::Eq).into(), lit.tokens()]) + TokenStream::new(vec![TokenTree::Token(span, Token::Eq).into(), lit.tokens()]) } MetaItemKind::List(ref list) => { let mut tokens = Vec::new(); @@ -552,7 +552,7 @@ impl MetaItemKind { TokenTree::Delimited( DelimSpan::from_single(span), token::Paren, - TokenStream::concat(tokens).into(), + TokenStream::new(tokens).into(), ).into() } } |
