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,8 +47,8 @@ impl<E: Encoder> Encodable<E> for CrateNum {
|
|||
}
|
||||
|
||||
impl<D: Decoder> Decodable<D> for CrateNum {
|
||||
default fn decode(d: &mut D) -> Result<CrateNum, D::Error> {
|
||||
Ok(CrateNum::from_u32(d.read_u32()?))
|
||||
default fn decode(d: &mut D) -> CrateNum {
|
||||
CrateNum::from_u32(d.read_u32())
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -209,7 +209,7 @@ impl<E: Encoder> Encodable<E> for DefIndex {
|
|||
}
|
||||
|
||||
impl<D: Decoder> Decodable<D> for DefIndex {
|
||||
default fn decode(_: &mut D) -> Result<DefIndex, D::Error> {
|
||||
default fn decode(_: &mut D) -> DefIndex {
|
||||
panic!("cannot decode `DefIndex` with `{}`", std::any::type_name::<D>());
|
||||
}
|
||||
}
|
||||
|
@ -298,12 +298,10 @@ impl<E: Encoder> Encodable<E> for DefId {
|
|||
}
|
||||
|
||||
impl<D: Decoder> Decodable<D> for DefId {
|
||||
default fn decode(d: &mut D) -> Result<DefId, D::Error> {
|
||||
d.read_struct(|d| {
|
||||
Ok(DefId {
|
||||
krate: d.read_struct_field("krate", Decodable::decode)?,
|
||||
index: d.read_struct_field("index", Decodable::decode)?,
|
||||
})
|
||||
default fn decode(d: &mut D) -> DefId {
|
||||
d.read_struct(|d| DefId {
|
||||
krate: d.read_struct_field("krate", Decodable::decode),
|
||||
index: d.read_struct_field("index", Decodable::decode),
|
||||
})
|
||||
}
|
||||
}
|
||||
|
@ -378,8 +376,8 @@ impl<E: Encoder> Encodable<E> for LocalDefId {
|
|||
}
|
||||
|
||||
impl<D: Decoder> Decodable<D> for LocalDefId {
|
||||
fn decode(d: &mut D) -> Result<LocalDefId, D::Error> {
|
||||
DefId::decode(d).map(|d| d.expect_local())
|
||||
fn decode(d: &mut D) -> LocalDefId {
|
||||
DefId::decode(d).expect_local()
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue