diff options
| author | bors <bors@rust-lang.org> | 2019-08-06 08:21:32 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-08-06 08:21:32 +0000 |
| commit | 8996328ebf34aa73e83a1db326767c11041f811d (patch) | |
| tree | ace3a569927dac51b06712b6c2b71dada6a6e211 /src/libsyntax_ext | |
| parent | 766b10a8d544550712fd6352863457a86f46db3c (diff) | |
| parent | c27405f829f6b57b2695478c41096729236831f2 (diff) | |
| download | rust-8996328ebf34aa73e83a1db326767c11041f811d.tar.gz rust-8996328ebf34aa73e83a1db326767c11041f811d.zip | |
Auto merge of #63319 - Centril:rollup-d89rmey, r=Centril
Rollup of 14 pull requests
Successful merges:
- #61457 (Implement DoubleEndedIterator for iter::{StepBy, Peekable, Take})
- #63017 (Remove special code-path for handing unknown tokens)
- #63184 (Explaining the reason why validation is performed in to_str of path.rs)
- #63230 (Make use of possibly uninitialized data [E0381] a hard error)
- #63260 (fix UB in a test)
- #63264 (Revert "Rollup merge of #62696 - chocol4te:fix_#62194, r=estebank")
- #63272 (Some more libsyntax::attr cleanup)
- #63285 (Remove leftover AwaitOrigin)
- #63287 (Don't store &Span)
- #63293 (Clarify align_to's requirements and obligations)
- #63295 (improve align_offset docs)
- #63299 (Make qualify consts in_projection use PlaceRef)
- #63312 (doc: fix broken sentence)
- #63315 (Fix #63313)
Failed merges:
r? @ghost
Diffstat (limited to 'src/libsyntax_ext')
| -rw-r--r-- | src/libsyntax_ext/test_harness.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libsyntax_ext/test_harness.rs b/src/libsyntax_ext/test_harness.rs index 4b3903c7ad7..eec8a3f8023 100644 --- a/src/libsyntax_ext/test_harness.rs +++ b/src/libsyntax_ext/test_harness.rs @@ -157,8 +157,7 @@ impl MutVisitor for EntryPointCleaner { item.map(|ast::Item {id, ident, attrs, node, vis, span, tokens}| { let allow_ident = Ident::with_empty_ctxt(sym::allow); let dc_nested = attr::mk_nested_word_item(Ident::from_str("dead_code")); - let allow_dead_code_item = attr::mk_list_item(DUMMY_SP, allow_ident, - vec![dc_nested]); + let allow_dead_code_item = attr::mk_list_item(allow_ident, vec![dc_nested]); let allow_dead_code = attr::mk_attr_outer(allow_dead_code_item); ast::Item { |