Skip to content

Commit

Permalink
Unrolled build for rust-lang#134272
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#134272 - RalfJung:destabilize-rustc_encodable_decodable, r=oli-obk

Remove rustc_encodable_decodable feature

This has been shown in future-compat reports since Rust 1.79 (rust-lang#116016), released June 2024. Let's see if crater still finds any issues.

Part of rust-lang#134301.

Cc ``@rust-lang/libs-api``
  • Loading branch information
rust-timer authored Feb 2, 2025
2 parents 6c0de7f + 9ac62f9 commit 84bd933
Show file tree
Hide file tree
Showing 16 changed files with 10 additions and 678 deletions.
2 changes: 1 addition & 1 deletion compiler/rustc_builtin_macros/src/deriving/debug.rs
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ fn show_substructure(cx: &ExtCtxt<'_>, span: Span, substr: &Substructure<'_>) ->

let (ident, vdata, fields) = match substr.fields {
Struct(vdata, fields) => (substr.type_ident, *vdata, fields),
EnumMatching(_, v, fields) => (v.ident, &v.data, fields),
EnumMatching(v, fields) => (v.ident, &v.data, fields),
AllFieldlessEnum(enum_def) => return show_fieldless_enum(cx, span, enum_def, substr),
EnumDiscr(..) | StaticStruct(..) | StaticEnum(..) => {
cx.dcx().span_bug(span, "nonsensical .fields in `#[derive(Debug)]`")
Expand Down
215 changes: 0 additions & 215 deletions compiler/rustc_builtin_macros/src/deriving/decodable.rs

This file was deleted.

2 changes: 1 addition & 1 deletion compiler/rustc_builtin_macros/src/deriving/default.rs
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ pub(crate) fn expand_deriving_default(
StaticStruct(_, fields) => {
default_struct_substructure(cx, trait_span, substr, fields)
}
StaticEnum(enum_def, _) => {
StaticEnum(enum_def) => {
default_enum_substructure(cx, trait_span, enum_def, item.span())
}
_ => cx.dcx().span_bug(trait_span, "method in `derive(Default)`"),
Expand Down
Loading

0 comments on commit 84bd933

Please sign in to comment.