diff options
| author | bors <bors@rust-lang.org> | 2022-08-16 18:07:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-08-16 18:07:02 +0000 |
| commit | 5746c752f4e3f294cd252f7dd611a1908b12dd8e (patch) | |
| tree | 4165b48259f23bcc95afeffef17655138dfd2e44 /compiler/rustc_builtin_macros/src | |
| parent | a39bdb1d6b9eaf23f2636baee0949d67890abcd8 (diff) | |
| parent | 35bd1d64cfe8efe8c99cb1d413d88603d1fbd56c (diff) | |
| download | rust-5746c752f4e3f294cd252f7dd611a1908b12dd8e.tar.gz rust-5746c752f4e3f294cd252f7dd611a1908b12dd8e.zip | |
Auto merge of #100626 - Dylan-DPC:rollup-mwbm7kj, r=Dylan-DPC
Rollup of 6 pull requests Successful merges: - #99942 (Fix nonsense non-tupled `Fn` trait error) - #100609 (Extend invalid floating point literal suffix suggestion) - #100610 (Ast and parser tweaks) - #100613 (compiletest: fix typo in runtest.rs) - #100616 (:arrow_up: rust-analyzer) - #100622 (Support 128-bit atomics on all aarch64 targets) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_builtin_macros/src')
| -rw-r--r-- | compiler/rustc_builtin_macros/src/deriving/generic/mod.rs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/compiler/rustc_builtin_macros/src/deriving/generic/mod.rs b/compiler/rustc_builtin_macros/src/deriving/generic/mod.rs index ef64f52d40b..9f3a80ea7cb 100644 --- a/compiler/rustc_builtin_macros/src/deriving/generic/mod.rs +++ b/compiler/rustc_builtin_macros/src/deriving/generic/mod.rs @@ -640,11 +640,7 @@ impl<'a> TraitDef<'a> { } ast::WherePredicate::EqPredicate(we) => { let span = we.span.with_ctxt(ctxt); - ast::WherePredicate::EqPredicate(ast::WhereEqPredicate { - id: ast::DUMMY_NODE_ID, - span, - ..we.clone() - }) + ast::WherePredicate::EqPredicate(ast::WhereEqPredicate { span, ..we.clone() }) } } })); |
