about summary refs log tree commit diff
path: root/src/libsyntax/attr
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-01-19 15:52:58 +0000
committerbors <bors@rust-lang.org>2019-01-19 15:52:58 +0000
commit93234994b85114e3248a216142eaab20c5e2f09e (patch)
treeeca4e8e2fd328188435bd8911b99a5acc2f75c2b /src/libsyntax/attr
parent286ac62939e26d56103dc1d7ddf5113650c5e42f (diff)
parent92fecfbd6066c84d6cfbae2db77f8fd0c7235893 (diff)
downloadrust-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/attr')
-rw-r--r--src/libsyntax/attr/mod.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/attr/mod.rs b/src/libsyntax/attr/mod.rs
index f83c1ec1455..f6d7590a794 100644
--- a/src/libsyntax/attr/mod.rs
+++ b/src/libsyntax/attr/mod.rs
@@ -570,7 +570,7 @@ impl MetaItemKind {
             }
             Some(TokenTree::Delimited(_, delim, ref tts)) if delim == token::Paren => {
                 tokens.next();
-                tts.stream()
+                tts.clone()
             }
             _ => return Some(MetaItemKind::Word),
         };