diff options
| author | bors <bors@rust-lang.org> | 2017-03-20 08:31:16 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-03-20 08:31:16 +0000 |
| commit | 244f893ed704a60841d4615445d540a21a8d7722 (patch) | |
| tree | ef03d7fdd32204abf7e236da22fb99f85fe7922e /src/libsyntax | |
| parent | 6738cd4d473668f7af381826d634e573d15e1f11 (diff) | |
| parent | d49f86901cf1128cdc00b7a1b276f6bf266bf937 (diff) | |
| download | rust-244f893ed704a60841d4615445d540a21a8d7722.tar.gz rust-244f893ed704a60841d4615445d540a21a8d7722.zip | |
Auto merge of #40659 - frewsxcv:rollup, r=frewsxcv
Rollup of 9 pull requests - Successful merges: #40241, #40281, #40398, #40521, #40532, #40554, #40566, #40581, #40587 - Failed merges:
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/tokenstream.rs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/libsyntax/tokenstream.rs b/src/libsyntax/tokenstream.rs index 35e4d9eb68a..b75b3efda36 100644 --- a/src/libsyntax/tokenstream.rs +++ b/src/libsyntax/tokenstream.rs @@ -162,6 +162,12 @@ impl From<TokenTree> for TokenStream { } } +impl From<Token> for TokenStream { + fn from(token: Token) -> TokenStream { + TokenTree::Token(DUMMY_SP, token).into() + } +} + impl<T: Into<TokenStream>> iter::FromIterator<T> for TokenStream { fn from_iter<I: IntoIterator<Item = T>>(iter: I) -> Self { TokenStream::concat(iter.into_iter().map(Into::into).collect::<Vec<_>>()) |