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
|
|
@ -292,7 +292,7 @@ crate fn load_call_locations(
|
|||
for path in with_examples {
|
||||
let bytes = fs::read(&path).map_err(|e| format!("{} (for path {})", e, path))?;
|
||||
let mut decoder = Decoder::new(&bytes, 0);
|
||||
let calls = AllCallLocations::decode(&mut decoder)?;
|
||||
let calls = AllCallLocations::decode(&mut decoder);
|
||||
|
||||
for (function, fn_calls) in calls.into_iter() {
|
||||
all_calls.entry(function).or_default().extend(fn_calls.into_iter());
|
||||
|
|
|
|||
|
|
@ -18,6 +18,6 @@ struct A {
|
|||
fn main() {
|
||||
let obj = A { foo: Box::new([true, false]) };
|
||||
let s = json::encode(&obj).unwrap();
|
||||
let obj2: A = json::decode(&s).unwrap();
|
||||
let obj2: A = json::decode(&s);
|
||||
assert_eq!(obj.foo, obj2.foo);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ struct B {
|
|||
fn main() {
|
||||
let obj = B { foo: Cell::new(true), bar: RefCell::new(A { baz: 2 }) };
|
||||
let s = json::encode(&obj).unwrap();
|
||||
let obj2: B = json::decode(&s).unwrap();
|
||||
let obj2: B = json::decode(&s);
|
||||
assert_eq!(obj.foo.get(), obj2.foo.get());
|
||||
assert_eq!(obj.bar.borrow().baz, obj2.bar.borrow().baz);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ pub fn main() {
|
|||
|
||||
let json_object = json::from_str(&json_str);
|
||||
let mut decoder = json::Decoder::new(json_object.unwrap());
|
||||
let mut decoded_obj: UnitLikeStruct = Decodable::decode(&mut decoder).unwrap();
|
||||
let mut decoded_obj: UnitLikeStruct = Decodable::decode(&mut decoder);
|
||||
|
||||
assert_eq!(obj, decoded_obj);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ trait JD: Decodable<json::Decoder> {}
|
|||
fn exec<T: JD>() {
|
||||
let doc = json::from_str("").unwrap();
|
||||
let mut decoder = json::Decoder::new(doc);
|
||||
let _v: T = Decodable::decode(&mut decoder).unwrap();
|
||||
let _v: T = Decodable::decode(&mut decoder);
|
||||
panic!()
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -13,5 +13,5 @@ use rustc_serialize::{json, Decodable};
|
|||
pub fn main() {
|
||||
let json = json::from_str("[1]").unwrap();
|
||||
let mut decoder = json::Decoder::new(json);
|
||||
let _x: Vec<isize> = Decodable::decode(&mut decoder).unwrap();
|
||||
let _x: Vec<isize> = Decodable::decode(&mut decoder);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue