bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

fix derive(RustcEncodable, RustcDecodable)

Browse source
This commit is contained in:
Skgland 2021-02-04 22:49:50 +01:00
parent 091ef95f8e
commit 0375022c73
No known key found for this signature in database
GPG key ID: 3BE1A1A3CBC3CF99
2 changed files with 12 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

15
compiler/rustc_builtin_macros/src/deriving/decodable.rs
View file

@ -92,7 +92,7 @@ fn decodable_substructure(
Named(ref fields) => fields.len(), Named(ref fields) => fields.len(),
}; };
let fn_read_struct_field_path: Vec<_> = let fn_read_struct_field_path: Vec<_> =
cx.def_site_path(&[sym::rustc_serialize, sym::Decodable, sym::read_struct_field]); cx.def_site_path(&[sym::rustc_serialize, sym::Decoder, sym::read_struct_field]);
let path = cx.path_ident(trait_span, substr.type_ident); let path = cx.path_ident(trait_span, substr.type_ident);
let result = let result =
@ -113,7 +113,7 @@ fn decodable_substructure(
}); });
let result = cx.expr_ok(trait_span, result); let result = cx.expr_ok(trait_span, result);
let fn_read_struct_path: Vec<_> = let fn_read_struct_path: Vec<_> =
cx.def_site_path(&[sym::rustc_serialize, sym::Decodable, sym::read_struct]); cx.def_site_path(&[sym::rustc_serialize, sym::Decoder, sym::read_struct]);
cx.expr_call_global( cx.expr_call_global(
trait_span, trait_span,
@ -132,11 +132,8 @@ fn decodable_substructure(
let mut arms = Vec::with_capacity(fields.len() + 1); let mut arms = Vec::with_capacity(fields.len() + 1);
let mut variants = Vec::with_capacity(fields.len()); let mut variants = Vec::with_capacity(fields.len());
let fn_read_enum_variant_arg_path: Vec<_> = cx.def_site_path(&[ let fn_read_enum_variant_arg_path: Vec<_> =
sym::rustc_serialize, cx.def_site_path(&[sym::rustc_serialize, sym::Decoder, sym::read_enum_variant_arg]);
sym::Decodable,
sym::read_enum_variant_arg,
]);
for (i, &(ident, v_span, ref parts)) in fields.iter().enumerate() { for (i, &(ident, v_span, ref parts)) in fields.iter().enumerate() {
variants.push(cx.expr_str(v_span, ident.name)); variants.push(cx.expr_str(v_span, ident.name));
@ -168,14 +165,14 @@ fn decodable_substructure(
let variant_vec = cx.expr_vec(trait_span, variants); let variant_vec = cx.expr_vec(trait_span, variants);
let variant_vec = cx.expr_addr_of(trait_span, variant_vec); let variant_vec = cx.expr_addr_of(trait_span, variant_vec);
let fn_read_enum_variant_path: Vec<_> = let fn_read_enum_variant_path: Vec<_> =
cx.def_site_path(&[sym::rustc_serialize, sym::Decodable, sym::read_enum_variant]); cx.def_site_path(&[sym::rustc_serialize, sym::Decoder, sym::read_enum_variant]);
let result = cx.expr_call_global( let result = cx.expr_call_global(
trait_span, trait_span,
fn_read_enum_variant_path, fn_read_enum_variant_path,
vec![blkdecoder, variant_vec, lambda], vec![blkdecoder, variant_vec, lambda],
); );
let fn_read_enum_path: Vec<_> = let fn_read_enum_path: Vec<_> =
cx.def_site_path(&[sym::rustc_serialize, sym::Decodable, sym::read_enum]); cx.def_site_path(&[sym::rustc_serialize, sym::Decoder, sym::read_enum]);
cx.expr_call_global( cx.expr_call_global(
trait_span, trait_span,

15
compiler/rustc_builtin_macros/src/deriving/encodable.rs
View file

@ -180,7 +180,7 @@ fn encodable_substructure(
match *substr.fields { match *substr.fields {
Struct(_, ref fields) => { Struct(_, ref fields) => {
let fn_emit_struct_field_path = let fn_emit_struct_field_path =
cx.def_site_path(&[sym::rustc_serialize, sym::Encodable, sym::emit_struct_field]); cx.def_site_path(&[sym::rustc_serialize, sym::Encoder, sym::emit_struct_field]);
let mut stmts = Vec::new(); let mut stmts = Vec::new();
for (i, &FieldInfo { name, ref self_, span, .. }) in fields.iter().enumerate() { for (i, &FieldInfo { name, ref self_, span, .. }) in fields.iter().enumerate() {
let name = match name { let name = match name {
@ -222,7 +222,7 @@ fn encodable_substructure(
}; };
let fn_emit_struct_path = let fn_emit_struct_path =
cx.def_site_path(&[sym::rustc_serialize, sym::Encodable, sym::emit_struct]); cx.def_site_path(&[sym::rustc_serialize, sym::Encoder, sym::emit_struct]);
cx.expr_call_global( cx.expr_call_global(
trait_span, trait_span,
@ -244,11 +244,8 @@ fn encodable_substructure(
let me = cx.stmt_let(trait_span, false, blkarg, encoder); let me = cx.stmt_let(trait_span, false, blkarg, encoder);
let encoder = cx.expr_ident(trait_span, blkarg); let encoder = cx.expr_ident(trait_span, blkarg);
let fn_emit_enum_variant_arg_path: Vec<_> = cx.def_site_path(&[ let fn_emit_enum_variant_arg_path: Vec<_> =
sym::rustc_serialize, cx.def_site_path(&[sym::rustc_serialize, sym::Encoder, sym::emit_enum_variant_arg]);
sym::Encodable,
sym::emit_enum_variant_arg,
]);
let mut stmts = Vec::new(); let mut stmts = Vec::new();
if !fields.is_empty() { if !fields.is_empty() {
@ -281,7 +278,7 @@ fn encodable_substructure(
let name = cx.expr_str(trait_span, variant.ident.name); let name = cx.expr_str(trait_span, variant.ident.name);
let fn_emit_enum_variant_path: Vec<_> = let fn_emit_enum_variant_path: Vec<_> =
cx.def_site_path(&[sym::rustc_serialize, sym::Encodable, sym::emit_enum_variant]); cx.def_site_path(&[sym::rustc_serialize, sym::Encoder, sym::emit_enum_variant]);
let call = cx.expr_call_global( let call = cx.expr_call_global(
trait_span, trait_span,
@ -297,7 +294,7 @@ fn encodable_substructure(
let blk = cx.lambda1(trait_span, call, blkarg); let blk = cx.lambda1(trait_span, call, blkarg);
let fn_emit_enum_path: Vec<_> = let fn_emit_enum_path: Vec<_> =
cx.def_site_path(&[sym::rustc_serialize, sym::Encodable, sym::emit_enum]); cx.def_site_path(&[sym::rustc_serialize, sym::Encoder, sym::emit_enum]);
let ret = cx.expr_call_global( let ret = cx.expr_call_global(
trait_span, trait_span,
fn_emit_enum_path, fn_emit_enum_path,