Skip to content

Commit 2733d61

Browse files
committed
Auto merge of #146125 - GuillaumeGomez:rollup-ld81n7e, r=GuillaumeGomez
Rollup of 14 pull requests Successful merges: - rust-lang/rust#144066 (stabilize c-style varargs for sysv64, win64, efiapi, aapcs) - rust-lang/rust#145783 (add span to struct pattern rest (..)) - rust-lang/rust#146034 (Update target spec metadata of Arm64EC Windows and Trusty targets) - rust-lang/rust#146064 (Add compiler error when trying to use concat metavar expr in repetitions) - rust-lang/rust#146070 (rustdoc-search: skip loading unneeded fnData) - rust-lang/rust#146088 (constify impl Try for ControlFlow) - rust-lang/rust#146089 (fix a constness ordering bug in rustfmt) - rust-lang/rust#146091 (fix rustdoc `render_call_locations` panicking because of default span `DUMMY_SP` pointing at non local-source file) - rust-lang/rust#146094 (Make `Parser::parse_for_head` public for rustfmt usage) - rust-lang/rust#146102 (Remove dead code stemming from an old effects desugaring) - rust-lang/rust#146115 (Add maintainer for VxWorks) - rust-lang/rust#146116 (Adjust issue-118306.rs test after LLVM change) - rust-lang/rust#146117 (Fix search index generation) - rust-lang/rust#146118 (improve process::abort rendering in Miri backtraces) r? `@ghost` `@rustbot` modify labels: rollup
2 parents cfdca03 + 01cbdf2 commit 2733d61

File tree

1 file changed

+4
-4
lines changed
  • rustc_public/src/unstable/convert/stable

1 file changed

+4
-4
lines changed

rustc_public/src/unstable/convert/stable/ty.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -656,13 +656,13 @@ impl<'tcx> Stable<'tcx> for rustc_middle::ty::GenericParamDefKind {
656656

657657
fn stable(&self, _: &mut Tables<'_, BridgeTys>, _: &CompilerCtxt<'_, BridgeTys>) -> Self::T {
658658
use crate::ty::GenericParamDefKind;
659-
match self {
659+
match *self {
660660
ty::GenericParamDefKind::Lifetime => GenericParamDefKind::Lifetime,
661661
ty::GenericParamDefKind::Type { has_default, synthetic } => {
662-
GenericParamDefKind::Type { has_default: *has_default, synthetic: *synthetic }
662+
GenericParamDefKind::Type { has_default, synthetic }
663663
}
664-
ty::GenericParamDefKind::Const { has_default, synthetic: _ } => {
665-
GenericParamDefKind::Const { has_default: *has_default }
664+
ty::GenericParamDefKind::Const { has_default } => {
665+
GenericParamDefKind::Const { has_default }
666666
}
667667
}
668668
}

0 commit comments

Comments
 (0)