diff options
| author | bors <bors@rust-lang.org> | 2019-01-19 15:52:58 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-01-19 15:52:58 +0000 |
| commit | 93234994b85114e3248a216142eaab20c5e2f09e (patch) | |
| tree | eca4e8e2fd328188435bd8911b99a5acc2f75c2b /src/libsyntax_ext | |
| parent | 286ac62939e26d56103dc1d7ddf5113650c5e42f (diff) | |
| parent | 92fecfbd6066c84d6cfbae2db77f8fd0c7235893 (diff) | |
| download | rust-93234994b85114e3248a216142eaab20c5e2f09e.tar.gz rust-93234994b85114e3248a216142eaab20c5e2f09e.zip | |
Auto merge of #57755 - Centril:rollup, r=Centril
Rollup of 7 pull requests Successful merges: - #57486 (Simplify `TokenStream` some more) - #57502 (make trait-aliases work across crates) - #57598 (Add missing unpretty option help message) - #57649 (privacy: Account for associated existential types) - #57659 (Fix release manifest generation) - #57699 (add applicability to remaining suggestions) - #57719 (Tweak `expand_node`) Failed merges: r? @ghost
Diffstat (limited to 'src/libsyntax_ext')
| -rw-r--r-- | src/libsyntax_ext/proc_macro_server.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax_ext/proc_macro_server.rs b/src/libsyntax_ext/proc_macro_server.rs index 158cbc791ef..7de9b9343a8 100644 --- a/src/libsyntax_ext/proc_macro_server.rs +++ b/src/libsyntax_ext/proc_macro_server.rs @@ -269,7 +269,7 @@ impl ToInternal<TokenStream> for TokenTree<Group, Punct, Ident, Literal> { }; let tree = tokenstream::TokenTree::Token(span, token); - TokenStream::Tree(tree, if joint { Joint } else { NonJoint }) + TokenStream::new(vec![(tree, if joint { Joint } else { NonJoint })]) } } |