nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-06-04 19:29:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Delete Decoder::read_option

Browse Source
This commit is contained in:
Mark Rousskov 2022-02-09 17:42:38 -05:00
parent 24dc052132
commit 38e6dad1d3
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
compiler/rustc_serialize/src/serialize.rs
View File

@ -210,18 +210,6 @@ pub trait Decoder {
f(self, disr) f(self, disr)
} }
// Specialized types:
fn read_option<T, F>(&mut self, mut f: F) -> T
where
F: FnMut(&mut Self, bool) -> T,
{
self.read_enum_variant(move |this, idx| match idx {
0 => f(this, false),
1 => f(this, true),
_ => panic!("read_option: expected 0 for None or 1 for Some"),
})
}
fn read_seq<T, F>(&mut self, f: F) -> T fn read_seq<T, F>(&mut self, f: F) -> T
where where
F: FnOnce(&mut Self, usize) -> T, F: FnOnce(&mut Self, usize) -> T,
@ -501,7 +489,11 @@ impl<S: Encoder, T: Encodable<S>> Encodable<S> for Option<T> {
impl<D: Decoder, T: Decodable<D>> Decodable<D> for Option<T> { impl<D: Decoder, T: Decodable<D>> Decodable<D> for Option<T> {
fn decode(d: &mut D) -> Option<T> { fn decode(d: &mut D) -> Option<T> {
d.read_option(|d, b| if b { Some(Decodable::decode(d)) } else { None }) d.read_enum_variant(move |this, idx| match idx {
0 => None,
1 => Some(Decodable::decode(this)),
_ => panic!("Encountered invalid discriminant while decoding `Option`."),
})
} }
} }