bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #94732 - nnethercote:infallible-encoder, r=bjorn3

Browse source 
Make `Encodable` and `Encoder` infallible.

A follow-up to #93066.

r? `@ghost`
This commit is contained in:
bors 2022-06-08 10:24:12 +00:00
commit 1a97162cb2
48 changed files with 706 additions and 856 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_macros/src/newtype.rs
View file

@ -137,8 +137,8 @@ impl Parse for Newtype {
}
}
impl<E: ::rustc_serialize::Encoder> ::rustc_serialize::Encodable<E> for #name {
fn encode(&self, e: &mut E) -> Result<(), E::Error> {
e.emit_u32(self.private)
fn encode(&self, e: &mut E) {
e.emit_u32(self.private);
}
}
}

22
compiler/rustc_macros/src/serialize.rs
View file

@ -146,21 +146,17 @@ fn encodable_body(
.map(|binding| {
let bind_ident = &binding.binding;
let result = quote! {
match ::rustc_serialize::Encodable::<#encoder_ty>::encode(
::rustc_serialize::Encodable::<#encoder_ty>::encode(
#bind_ident,
__encoder,
) {
::std::result::Result::Ok(()) => (),
::std::result::Result::Err(__err)
=> return ::std::result::Result::Err(__err),
}
);
};
result
})
.collect::<TokenStream>()
});
quote! {
::std::result::Result::Ok(match *self { #encode_inner })
match *self { #encode_inner }
}
}
_ => {
@ -172,14 +168,10 @@ fn encodable_body(
.map(|binding| {
let bind_ident = &binding.binding;
let result = quote! {
match ::rustc_serialize::Encodable::<#encoder_ty>::encode(
::rustc_serialize::Encodable::<#encoder_ty>::encode(
#bind_ident,
__encoder,
) {
::std::result::Result::Ok(()) => (),
::std::result::Result::Err(__err)
=> return ::std::result::Result::Err(__err),
}
);
};
result
})
@ -190,7 +182,7 @@ fn encodable_body(
::rustc_serialize::Encoder::emit_enum_variant(
__encoder,
#variant_idx,
|__encoder| { ::std::result::Result::Ok({ #encode_fields }) }
|__encoder| { #encode_fields }
)
}
} else {
@ -223,7 +215,7 @@ fn encodable_body(
fn encode(
&self,
__encoder: &mut #encoder_ty,
) -> ::std::result::Result<(), <#encoder_ty as ::rustc_serialize::Encoder>::Error> {
) {
#lints
#encode_body
}