diff options
| author | bors <bors@rust-lang.org> | 2020-02-28 02:19:31 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-02-28 02:19:31 +0000 |
| commit | 7497d93ef17d2b87fa8efb5c5de33f0bdc4155af (patch) | |
| tree | 8d57b787b10803b869d56281c9aab8f7350525aa /src/libsyntax | |
| parent | fbc46b7d71d0fe93066d7c026eccd01c16185cd4 (diff) | |
| parent | 02b96b3ecc48dc5245e425fc248163cfaae9643e (diff) | |
| download | rust-7497d93ef17d2b87fa8efb5c5de33f0bdc4155af.tar.gz rust-7497d93ef17d2b87fa8efb5c5de33f0bdc4155af.zip | |
Auto merge of #69534 - Dylan-DPC:rollup-fwa2lip, r=Dylan-DPC
Rollup of 9 pull requests Successful merges: - #69379 (Fail on multiple declarations of `main`.) - #69430 (librustc_typeck: remove loop that never actually loops) - #69449 (Do not ping PR reviewers in toolstate breakage) - #69491 (rustc_span: Add `Symbol::to_ident_string` for use in diagnostic messages) - #69495 (don't take redundant references to operands) - #69496 (use find(x) instead of filter(x).next()) - #69501 (note that find(f) is equivalent to filter(f).next() in the docs.) - #69527 (Ignore untracked paths when running `rustfmt` on repository.) - #69529 (don't use .into() to convert types into identical types.) Failed merges: r? @ghost
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/attr/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/attr/mod.rs b/src/libsyntax/attr/mod.rs index cd485e71378..bc5c86b02b3 100644 --- a/src/libsyntax/attr/mod.rs +++ b/src/libsyntax/attr/mod.rs @@ -529,7 +529,7 @@ impl MetaItemKind { TokenTree::Delimited( DelimSpan::from_single(span), token::Paren, - TokenStream::new(tokens).into(), + TokenStream::new(tokens), ) .into(), ] |