Make Decodable
and Decoder
infallible.
`Decoder` has two impls: - opaque: this impl is already partly infallible, i.e. in some places it currently panics on failure (e.g. if the input is too short, or on a bad `Result` discriminant), and in some places it returns an error (e.g. on a bad `Option` discriminant). The number of places where either happens is surprisingly small, just because the binary representation has very little redundancy and a lot of input reading can occur even on malformed data. - json: this impl is fully fallible, but it's only used (a) for the `.rlink` file production, and there's a `FIXME` comment suggesting it should change to a binary format, and (b) in a few tests in non-fundamental ways. Indeed #85993 is open to remove it entirely. And the top-level places in the compiler that call into decoding just abort on error anyway. So the fallibility is providing little value, and getting rid of it leads to some non-trivial performance improvements. Much of this commit is pretty boring and mechanical. Some notes about a few interesting parts: - The commit removes `Decoder::{Error,error}`. - `InternIteratorElement::intern_with`: the impl for `T` now has the same optimization for small counts that the impl for `Result<T, E>` has, because it's now much hotter. - Decodable impls for SmallVec, LinkedList, VecDeque now all use `collect`, which is nice; the one for `Vec` uses unsafe code, because that gave better perf on some benchmarks.
This commit is contained in:
parent
88600a6d7f
commit
416399dc10
39 changed files with 726 additions and 781 deletions
|
@ -47,7 +47,7 @@ fn decodable_body(
|
|||
quote! {
|
||||
::rustc_serialize::Decoder::read_struct(
|
||||
__decoder,
|
||||
|__decoder| { ::std::result::Result::Ok(#construct) },
|
||||
|__decoder| { #construct },
|
||||
)
|
||||
}
|
||||
}
|
||||
|
@ -57,7 +57,7 @@ fn decodable_body(
|
|||
.enumerate()
|
||||
.map(|(idx, vi)| {
|
||||
let construct = vi.construct(|field, index| decode_field(field, index, false));
|
||||
quote! { #idx => { ::std::result::Result::Ok(#construct) } }
|
||||
quote! { #idx => { #construct } }
|
||||
})
|
||||
.collect();
|
||||
let names: TokenStream = variants
|
||||
|
@ -82,8 +82,7 @@ fn decodable_body(
|
|||
|__decoder, __variant_idx| {
|
||||
match __variant_idx {
|
||||
#match_inner
|
||||
_ => return ::std::result::Result::Err(
|
||||
::rustc_serialize::Decoder::error(__decoder, #message)),
|
||||
_ => panic!(#message),
|
||||
}
|
||||
})
|
||||
}
|
||||
|
@ -95,9 +94,7 @@ fn decodable_body(
|
|||
s.bound_impl(
|
||||
quote!(::rustc_serialize::Decodable<#decoder_ty>),
|
||||
quote! {
|
||||
fn decode(
|
||||
__decoder: &mut #decoder_ty,
|
||||
) -> ::std::result::Result<Self, <#decoder_ty as ::rustc_serialize::Decoder>::Error> {
|
||||
fn decode(__decoder: &mut #decoder_ty) -> Self {
|
||||
#decode_body
|
||||
}
|
||||
},
|
||||
|
@ -127,12 +124,7 @@ fn decode_field(field: &syn::Field, index: usize, is_struct: bool) -> proc_macro
|
|||
#__decoder, #opt_field_name #decode_inner_method)
|
||||
};
|
||||
|
||||
quote! {
|
||||
match #decode_call {
|
||||
::std::result::Result::Ok(__res) => __res,
|
||||
::std::result::Result::Err(__err) => return ::std::result::Result::Err(__err),
|
||||
}
|
||||
}
|
||||
quote! { #decode_call }
|
||||
}
|
||||
|
||||
pub fn type_encodable_derive(mut s: synstructure::Structure<'_>) -> proc_macro2::TokenStream {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue