Skip to content

Commit 48aede0

Browse files
authored
Rollup merge of #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 (#116016), released June 2024. Let's see if crater still finds any issues. Part of #134301. Cc ``@rust-lang/libs-api``
2 parents e1f0920 + 9ac62f9 commit 48aede0

File tree

16 files changed

+10
-678
lines changed

16 files changed

+10
-678
lines changed

compiler/rustc_builtin_macros/src/deriving/debug.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ fn show_substructure(cx: &ExtCtxt<'_>, span: Span, substr: &Substructure<'_>) ->
5656

5757
let (ident, vdata, fields) = match substr.fields {
5858
Struct(vdata, fields) => (substr.type_ident, *vdata, fields),
59-
EnumMatching(_, v, fields) => (v.ident, &v.data, fields),
59+
EnumMatching(v, fields) => (v.ident, &v.data, fields),
6060
AllFieldlessEnum(enum_def) => return show_fieldless_enum(cx, span, enum_def, substr),
6161
EnumDiscr(..) | StaticStruct(..) | StaticEnum(..) => {
6262
cx.dcx().span_bug(span, "nonsensical .fields in `#[derive(Debug)]`")

compiler/rustc_builtin_macros/src/deriving/decodable.rs

-215
This file was deleted.

compiler/rustc_builtin_macros/src/deriving/default.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ pub(crate) fn expand_deriving_default(
4242
StaticStruct(_, fields) => {
4343
default_struct_substructure(cx, trait_span, substr, fields)
4444
}
45-
StaticEnum(enum_def, _) => {
45+
StaticEnum(enum_def) => {
4646
default_enum_substructure(cx, trait_span, enum_def, item.span())
4747
}
4848
_ => cx.dcx().span_bug(trait_span, "method in `derive(Default)`"),

0 commit comments

Comments
 (0)