bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Remove inline attribute on generic functions

Browse source
This commit is contained in:
BurntPizza 2018-08-17 02:59:55 -04:00
parent bc900f5323
commit 1540e8cac0
2 changed files with 18 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/libserialize/collection_impls.rs
View file

@ -17,10 +17,7 @@ use std::collections::{LinkedList, VecDeque, BTreeMap, BTreeSet, HashMap, HashSe
use std::rc::Rc; use std::rc::Rc;
use std::sync::Arc; use std::sync::Arc;
impl< impl<T: Encodable> Encodable for LinkedList<T> {
T: Encodable
> Encodable for LinkedList<T> {
#[inline]
fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> { fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
s.emit_seq(self.len(), |s| { s.emit_seq(self.len(), |s| {
for (i, e) in self.iter().enumerate() { for (i, e) in self.iter().enumerate() {
@ -32,7 +29,6 @@ impl<
} }
impl<T:Decodable> Decodable for LinkedList<T> { impl<T:Decodable> Decodable for LinkedList<T> {
#[inline]
fn decode<D: Decoder>(d: &mut D) -> Result<LinkedList<T>, D::Error> { fn decode<D: Decoder>(d: &mut D) -> Result<LinkedList<T>, D::Error> {
d.read_seq(|d, len| { d.read_seq(|d, len| {
let mut list = LinkedList::new(); let mut list = LinkedList::new();
@ -45,7 +41,6 @@ impl<T:Decodable> Decodable for LinkedList<T> {
} }
impl<T: Encodable> Encodable for VecDeque<T> { impl<T: Encodable> Encodable for VecDeque<T> {
#[inline]
fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> { fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
s.emit_seq(self.len(), |s| { s.emit_seq(self.len(), |s| {
for (i, e) in self.iter().enumerate() { for (i, e) in self.iter().enumerate() {
@ -57,7 +52,6 @@ impl<T: Encodable> Encodable for VecDeque<T> {
} }
impl<T:Decodable> Decodable for VecDeque<T> { impl<T:Decodable> Decodable for VecDeque<T> {
#[inline]
fn decode<D: Decoder>(d: &mut D) -> Result<VecDeque<T>, D::Error> { fn decode<D: Decoder>(d: &mut D) -> Result<VecDeque<T>, D::Error> {
d.read_seq(|d, len| { d.read_seq(|d, len| {
let mut deque: VecDeque<T> = VecDeque::new(); let mut deque: VecDeque<T> = VecDeque::new();
@ -69,11 +63,10 @@ impl<T:Decodable> Decodable for VecDeque<T> {
} }
} }
impl< impl<K, V> Encodable for BTreeMap<K, V>
K: Encodable + PartialEq + Ord, where K: Encodable + PartialEq + Ord,
V: Encodable V: Encodable
> Encodable for BTreeMap<K, V> { {
#[inline]
fn encode<S: Encoder>(&self, e: &mut S) -> Result<(), S::Error> { fn encode<S: Encoder>(&self, e: &mut S) -> Result<(), S::Error> {
e.emit_map(self.len(), |e| { e.emit_map(self.len(), |e| {
let mut i = 0; let mut i = 0;
@ -87,11 +80,10 @@ impl<
} }
} }
impl< impl<K, V> Decodable for BTreeMap<K, V>
K: Decodable + PartialEq + Ord, where K: Decodable + PartialEq + Ord,
V: Decodable V: Decodable
> Decodable for BTreeMap<K, V> { {
#[inline]
fn decode<D: Decoder>(d: &mut D) -> Result<BTreeMap<K, V>, D::Error> { fn decode<D: Decoder>(d: &mut D) -> Result<BTreeMap<K, V>, D::Error> {
d.read_map(|d, len| { d.read_map(|d, len| {
let mut map = BTreeMap::new(); let mut map = BTreeMap::new();
@ -105,10 +97,9 @@ impl<
} }
} }
impl< impl<T> Encodable for BTreeSet<T>
T: Encodable + PartialEq + Ord where T: Encodable + PartialEq + Ord
> Encodable for BTreeSet<T> { {
#[inline]
fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> { fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
s.emit_seq(self.len(), |s| { s.emit_seq(self.len(), |s| {
let mut i = 0; let mut i = 0;
@ -121,10 +112,9 @@ impl<
} }
} }
impl< impl<T> Decodable for BTreeSet<T>
T: Decodable + PartialEq + Ord where T: Decodable + PartialEq + Ord
> Decodable for BTreeSet<T> { {
#[inline]
fn decode<D: Decoder>(d: &mut D) -> Result<BTreeSet<T>, D::Error> { fn decode<D: Decoder>(d: &mut D) -> Result<BTreeSet<T>, D::Error> {
d.read_seq(|d, len| { d.read_seq(|d, len| {
let mut set = BTreeSet::new(); let mut set = BTreeSet::new();
@ -141,7 +131,6 @@ impl<K, V, S> Encodable for HashMap<K, V, S>
V: Encodable, V: Encodable,
S: BuildHasher, S: BuildHasher,
{ {
#[inline]
fn encode<E: Encoder>(&self, e: &mut E) -> Result<(), E::Error> { fn encode<E: Encoder>(&self, e: &mut E) -> Result<(), E::Error> {
e.emit_map(self.len(), |e| { e.emit_map(self.len(), |e| {
let mut i = 0; let mut i = 0;
@ -160,7 +149,6 @@ impl<K, V, S> Decodable for HashMap<K, V, S>
V: Decodable, V: Decodable,
S: BuildHasher + Default, S: BuildHasher + Default,
{ {
#[inline]
fn decode<D: Decoder>(d: &mut D) -> Result<HashMap<K, V, S>, D::Error> { fn decode<D: Decoder>(d: &mut D) -> Result<HashMap<K, V, S>, D::Error> {
d.read_map(|d, len| { d.read_map(|d, len| {
let state = Default::default(); let state = Default::default();
@ -179,7 +167,6 @@ impl<T, S> Encodable for HashSet<T, S>
where T: Encodable + Hash + Eq, where T: Encodable + Hash + Eq,
S: BuildHasher, S: BuildHasher,
{ {
#[inline]
fn encode<E: Encoder>(&self, s: &mut E) -> Result<(), E::Error> { fn encode<E: Encoder>(&self, s: &mut E) -> Result<(), E::Error> {
s.emit_seq(self.len(), |s| { s.emit_seq(self.len(), |s| {
let mut i = 0; let mut i = 0;
@ -196,7 +183,6 @@ impl<T, S> Decodable for HashSet<T, S>
where T: Decodable + Hash + Eq, where T: Decodable + Hash + Eq,
S: BuildHasher + Default, S: BuildHasher + Default,
{ {
#[inline]
fn decode<D: Decoder>(d: &mut D) -> Result<HashSet<T, S>, D::Error> { fn decode<D: Decoder>(d: &mut D) -> Result<HashSet<T, S>, D::Error> {
d.read_seq(|d, len| { d.read_seq(|d, len| {
let state = Default::default(); let state = Default::default();
@ -210,7 +196,6 @@ impl<T, S> Decodable for HashSet<T, S>
} }
impl<T: Encodable> Encodable for Rc<[T]> { impl<T: Encodable> Encodable for Rc<[T]> {
#[inline]
fn encode<E: Encoder>(&self, s: &mut E) -> Result<(), E::Error> { fn encode<E: Encoder>(&self, s: &mut E) -> Result<(), E::Error> {
s.emit_seq(self.len(), |s| { s.emit_seq(self.len(), |s| {
for (index, e) in self.iter().enumerate() { for (index, e) in self.iter().enumerate() {
@ -222,7 +207,6 @@ impl<T: Encodable> Encodable for Rc<[T]> {
} }
impl<T: Decodable> Decodable for Rc<[T]> { impl<T: Decodable> Decodable for Rc<[T]> {
#[inline]
fn decode<D: Decoder>(d: &mut D) -> Result<Rc<[T]>, D::Error> { fn decode<D: Decoder>(d: &mut D) -> Result<Rc<[T]>, D::Error> {
d.read_seq(|d, len| { d.read_seq(|d, len| {
let mut vec = Vec::with_capacity(len); let mut vec = Vec::with_capacity(len);
@ -235,7 +219,6 @@ impl<T: Decodable> Decodable for Rc<[T]> {
} }
impl<T: Encodable> Encodable for Arc<[T]> { impl<T: Encodable> Encodable for Arc<[T]> {
#[inline]
fn encode<E: Encoder>(&self, s: &mut E) -> Result<(), E::Error> { fn encode<E: Encoder>(&self, s: &mut E) -> Result<(), E::Error> {
s.emit_seq(self.len(), |s| { s.emit_seq(self.len(), |s| {
for (index, e) in self.iter().enumerate() { for (index, e) in self.iter().enumerate() {
@ -247,7 +230,6 @@ impl<T: Encodable> Encodable for Arc<[T]> {
} }
impl<T: Decodable> Decodable for Arc<[T]> { impl<T: Decodable> Decodable for Arc<[T]> {
#[inline]
fn decode<D: Decoder>(d: &mut D) -> Result<Arc<[T]>, D::Error> { fn decode<D: Decoder>(d: &mut D) -> Result<Arc<[T]>, D::Error> {
d.read_seq(|d, len| { d.read_seq(|d, len| {
let mut vec = Vec::with_capacity(len); let mut vec = Vec::with_capacity(len);

108
src/libserialize/serialize.rs
View file

@ -45,14 +45,12 @@ pub trait Encoder {
fn emit_str(&mut self, v: &str) -> Result<(), Self::Error>; fn emit_str(&mut self, v: &str) -> Result<(), Self::Error>;
// Compound types: // Compound types:
#[inline]
fn emit_enum<F>(&mut self, _name: &str, f: F) -> Result<(), Self::Error> fn emit_enum<F>(&mut self, _name: &str, f: F) -> Result<(), Self::Error>
where F: FnOnce(&mut Self) -> Result<(), Self::Error> where F: FnOnce(&mut Self) -> Result<(), Self::Error>
{ {
f(self) f(self)
} }
#[inline]
fn emit_enum_variant<F>(&mut self, _v_name: &str, v_id: usize, _len: usize, f: F) fn emit_enum_variant<F>(&mut self, _v_name: &str, v_id: usize, _len: usize, f: F)
-> Result<(), Self::Error> where F: FnOnce(&mut Self) -> Result<(), Self::Error> -> Result<(), Self::Error> where F: FnOnce(&mut Self) -> Result<(), Self::Error>
{ {
@ -60,63 +58,54 @@ pub trait Encoder {
f(self) f(self)
} }
#[inline]
fn emit_enum_variant_arg<F>(&mut self, _a_idx: usize, f: F) -> Result<(), Self::Error> fn emit_enum_variant_arg<F>(&mut self, _a_idx: usize, f: F) -> Result<(), Self::Error>
where F: FnOnce(&mut Self) -> Result<(), Self::Error> where F: FnOnce(&mut Self) -> Result<(), Self::Error>
{ {
f(self) f(self)
} }
#[inline]
fn emit_enum_struct_variant<F>(&mut self, v_name: &str, v_id: usize, len: usize, f: F) fn emit_enum_struct_variant<F>(&mut self, v_name: &str, v_id: usize, len: usize, f: F)
-> Result<(), Self::Error> where F: FnOnce(&mut Self) -> Result<(), Self::Error> -> Result<(), Self::Error> where F: FnOnce(&mut Self) -> Result<(), Self::Error>
{ {
self.emit_enum_variant(v_name, v_id, len, f) self.emit_enum_variant(v_name, v_id, len, f)
} }
#[inline]
fn emit_enum_struct_variant_field<F>(&mut self, _f_name: &str, f_idx: usize, f: F) fn emit_enum_struct_variant_field<F>(&mut self, _f_name: &str, f_idx: usize, f: F)
-> Result<(), Self::Error> where F: FnOnce(&mut Self) -> Result<(), Self::Error> -> Result<(), Self::Error> where F: FnOnce(&mut Self) -> Result<(), Self::Error>
{ {
self.emit_enum_variant_arg(f_idx, f) self.emit_enum_variant_arg(f_idx, f)
} }
#[inline]
fn emit_struct<F>(&mut self, _name: &str, _len: usize, f: F) -> Result<(), Self::Error> fn emit_struct<F>(&mut self, _name: &str, _len: usize, f: F) -> Result<(), Self::Error>
where F: FnOnce(&mut Self) -> Result<(), Self::Error> where F: FnOnce(&mut Self) -> Result<(), Self::Error>
{ {
f(self) f(self)
} }
#[inline]
fn emit_struct_field<F>(&mut self, _f_name: &str, _f_idx: usize, f: F) fn emit_struct_field<F>(&mut self, _f_name: &str, _f_idx: usize, f: F)
-> Result<(), Self::Error> where F: FnOnce(&mut Self) -> Result<(), Self::Error> -> Result<(), Self::Error> where F: FnOnce(&mut Self) -> Result<(), Self::Error>
{ {
f(self) f(self)
} }
#[inline]
fn emit_tuple<F>(&mut self, _len: usize, f: F) -> Result<(), Self::Error> fn emit_tuple<F>(&mut self, _len: usize, f: F) -> Result<(), Self::Error>
where F: FnOnce(&mut Self) -> Result<(), Self::Error> where F: FnOnce(&mut Self) -> Result<(), Self::Error>
{ {
f(self) f(self)
} }
#[inline]
fn emit_tuple_arg<F>(&mut self, _idx: usize, f: F) -> Result<(), Self::Error> fn emit_tuple_arg<F>(&mut self, _idx: usize, f: F) -> Result<(), Self::Error>
where F: FnOnce(&mut Self) -> Result<(), Self::Error> where F: FnOnce(&mut Self) -> Result<(), Self::Error>
{ {
f(self) f(self)
} }
#[inline]
fn emit_tuple_struct<F>(&mut self, _name: &str, len: usize, f: F) -> Result<(), Self::Error> fn emit_tuple_struct<F>(&mut self, _name: &str, len: usize, f: F) -> Result<(), Self::Error>
where F: FnOnce(&mut Self) -> Result<(), Self::Error> where F: FnOnce(&mut Self) -> Result<(), Self::Error>
{ {
self.emit_tuple(len, f) self.emit_tuple(len, f)
} }
#[inline]
fn emit_tuple_struct_arg<F>(&mut self, f_idx: usize, f: F) -> Result<(), Self::Error> fn emit_tuple_struct_arg<F>(&mut self, f_idx: usize, f: F) -> Result<(), Self::Error>
where F: FnOnce(&mut Self) -> Result<(), Self::Error> where F: FnOnce(&mut Self) -> Result<(), Self::Error>
{ {
@ -124,7 +113,6 @@ pub trait Encoder {
} }
// Specialized types: // Specialized types:
#[inline]
fn emit_option<F>(&mut self, f: F) -> Result<(), Self::Error> fn emit_option<F>(&mut self, f: F) -> Result<(), Self::Error>
where F: FnOnce(&mut Self) -> Result<(), Self::Error> where F: FnOnce(&mut Self) -> Result<(), Self::Error>
{ {
@ -136,14 +124,12 @@ pub trait Encoder {
self.emit_enum_variant("None", 0, 0, |_| Ok(())) self.emit_enum_variant("None", 0, 0, |_| Ok(()))
} }
#[inline]
fn emit_option_some<F>(&mut self, f: F) -> Result<(), Self::Error> fn emit_option_some<F>(&mut self, f: F) -> Result<(), Self::Error>
where F: FnOnce(&mut Self) -> Result<(), Self::Error> where F: FnOnce(&mut Self) -> Result<(), Self::Error>
{ {
self.emit_enum_variant("Some", 1, 1, f) self.emit_enum_variant("Some", 1, 1, f)
} }
#[inline]
fn emit_seq<F>(&mut self, len: usize, f: F) -> Result<(), Self::Error> fn emit_seq<F>(&mut self, len: usize, f: F) -> Result<(), Self::Error>
where F: FnOnce(&mut Self) -> Result<(), Self::Error> where F: FnOnce(&mut Self) -> Result<(), Self::Error>
{ {
@ -151,14 +137,12 @@ pub trait Encoder {
f(self) f(self)
} }
#[inline]
fn emit_seq_elt<F>(&mut self, _idx: usize, f: F) -> Result<(), Self::Error> fn emit_seq_elt<F>(&mut self, _idx: usize, f: F) -> Result<(), Self::Error>
where F: FnOnce(&mut Self) -> Result<(), Self::Error> where F: FnOnce(&mut Self) -> Result<(), Self::Error>
{ {
f(self) f(self)
} }
#[inline]
fn emit_map<F>(&mut self, len: usize, f: F) -> Result<(), Self::Error> fn emit_map<F>(&mut self, len: usize, f: F) -> Result<(), Self::Error>
where F: FnOnce(&mut Self) -> Result<(), Self::Error> where F: FnOnce(&mut Self) -> Result<(), Self::Error>
{ {
@ -166,14 +150,12 @@ pub trait Encoder {
f(self) f(self)
} }
#[inline]
fn emit_map_elt_key<F>(&mut self, _idx: usize, f: F) -> Result<(), Self::Error> fn emit_map_elt_key<F>(&mut self, _idx: usize, f: F) -> Result<(), Self::Error>
where F: FnOnce(&mut Self) -> Result<(), Self::Error> where F: FnOnce(&mut Self) -> Result<(), Self::Error>
{ {
f(self) f(self)
} }
#[inline]
fn emit_map_elt_val<F>(&mut self, _idx: usize, f: F) -> Result<(), Self::Error> fn emit_map_elt_val<F>(&mut self, _idx: usize, f: F) -> Result<(), Self::Error>
where F: FnOnce(&mut Self) -> Result<(), Self::Error> where F: FnOnce(&mut Self) -> Result<(), Self::Error>
{ {
@ -205,14 +187,12 @@ pub trait Decoder {
fn read_str(&mut self) -> Result<Cow<str>, Self::Error>; fn read_str(&mut self) -> Result<Cow<str>, Self::Error>;
// Compound types: // Compound types:
#[inline]
fn read_enum<T, F>(&mut self, _name: &str, f: F) -> Result<T, Self::Error> fn read_enum<T, F>(&mut self, _name: &str, f: F) -> Result<T, Self::Error>
where F: FnOnce(&mut Self) -> Result<T, Self::Error> where F: FnOnce(&mut Self) -> Result<T, Self::Error>
{ {
f(self) f(self)
} }
#[inline]
fn read_enum_variant<T, F>(&mut self, _names: &[&str], mut f: F) -> Result<T, Self::Error> fn read_enum_variant<T, F>(&mut self, _names: &[&str], mut f: F) -> Result<T, Self::Error>
where F: FnMut(&mut Self, usize) -> Result<T, Self::Error> where F: FnMut(&mut Self, usize) -> Result<T, Self::Error>
{ {
@ -220,63 +200,54 @@ pub trait Decoder {
f(self, disr) f(self, disr)
} }
#[inline]
fn read_enum_variant_arg<T, F>(&mut self, _a_idx: usize, f: F) -> Result<T, Self::Error> fn read_enum_variant_arg<T, F>(&mut self, _a_idx: usize, f: F) -> Result<T, Self::Error>
where F: FnOnce(&mut Self) -> Result<T, Self::Error> where F: FnOnce(&mut Self) -> Result<T, Self::Error>
{ {
f(self) f(self)
} }
#[inline]
fn read_enum_struct_variant<T, F>(&mut self, names: &[&str], f: F) -> Result<T, Self::Error> fn read_enum_struct_variant<T, F>(&mut self, names: &[&str], f: F) -> Result<T, Self::Error>
where F: FnMut(&mut Self, usize) -> Result<T, Self::Error> where F: FnMut(&mut Self, usize) -> Result<T, Self::Error>
{ {
self.read_enum_variant(names, f) self.read_enum_variant(names, f)
} }
#[inline]
fn read_enum_struct_variant_field<T, F>(&mut self, _f_name: &str, f_idx: usize, f: F) fn read_enum_struct_variant_field<T, F>(&mut self, _f_name: &str, f_idx: usize, f: F)
-> Result<T, Self::Error> where F: FnOnce(&mut Self) -> Result<T, Self::Error> -> Result<T, Self::Error> where F: FnOnce(&mut Self) -> Result<T, Self::Error>
{ {
self.read_enum_variant_arg(f_idx, f) self.read_enum_variant_arg(f_idx, f)
} }
#[inline]
fn read_struct<T, F>(&mut self, _s_name: &str, _len: usize, f: F) -> Result<T, Self::Error> fn read_struct<T, F>(&mut self, _s_name: &str, _len: usize, f: F) -> Result<T, Self::Error>
where F: FnOnce(&mut Self) -> Result<T, Self::Error> where F: FnOnce(&mut Self) -> Result<T, Self::Error>
{ {
f(self) f(self)
} }
#[inline]
fn read_struct_field<T, F>(&mut self, _f_name: &str, _f_idx: usize, f: F) fn read_struct_field<T, F>(&mut self, _f_name: &str, _f_idx: usize, f: F)
-> Result<T, Self::Error> where F: FnOnce(&mut Self) -> Result<T, Self::Error> -> Result<T, Self::Error> where F: FnOnce(&mut Self) -> Result<T, Self::Error>
{ {
f(self) f(self)
} }
#[inline]
fn read_tuple<T, F>(&mut self, _len: usize, f: F) -> Result<T, Self::Error> fn read_tuple<T, F>(&mut self, _len: usize, f: F) -> Result<T, Self::Error>
where F: FnOnce(&mut Self) -> Result<T, Self::Error> where F: FnOnce(&mut Self) -> Result<T, Self::Error>
{ {
f(self) f(self)
} }
#[inline]
fn read_tuple_arg<T, F>(&mut self, _a_idx: usize, f: F) -> Result<T, Self::Error> fn read_tuple_arg<T, F>(&mut self, _a_idx: usize, f: F) -> Result<T, Self::Error>
where F: FnOnce(&mut Self) -> Result<T, Self::Error> where F: FnOnce(&mut Self) -> Result<T, Self::Error>
{ {
f(self) f(self)
} }
#[inline]
fn read_tuple_struct<T, F>(&mut self, _s_name: &str, len: usize, f: F) -> Result<T, Self::Error> fn read_tuple_struct<T, F>(&mut self, _s_name: &str, len: usize, f: F) -> Result<T, Self::Error>
where F: FnOnce(&mut Self) -> Result<T, Self::Error> where F: FnOnce(&mut Self) -> Result<T, Self::Error>
{ {
self.read_tuple(len, f) self.read_tuple(len, f)
} }
#[inline]
fn read_tuple_struct_arg<T, F>(&mut self, a_idx: usize, f: F) -> Result<T, Self::Error> fn read_tuple_struct_arg<T, F>(&mut self, a_idx: usize, f: F) -> Result<T, Self::Error>
where F: FnOnce(&mut Self) -> Result<T, Self::Error> where F: FnOnce(&mut Self) -> Result<T, Self::Error>
{ {
@ -284,7 +255,6 @@ pub trait Decoder {
} }
// Specialized types: // Specialized types:
#[inline]
fn read_option<T, F>(&mut self, mut f: F) -> Result<T, Self::Error> fn read_option<T, F>(&mut self, mut f: F) -> Result<T, Self::Error>
where F: FnMut(&mut Self, bool) -> Result<T, Self::Error> where F: FnMut(&mut Self, bool) -> Result<T, Self::Error>
{ {
@ -299,7 +269,6 @@ pub trait Decoder {
}) })
} }
#[inline]
fn read_seq<T, F>(&mut self, f: F) -> Result<T, Self::Error> fn read_seq<T, F>(&mut self, f: F) -> Result<T, Self::Error>
where F: FnOnce(&mut Self, usize) -> Result<T, Self::Error> where F: FnOnce(&mut Self, usize) -> Result<T, Self::Error>
{ {
@ -307,14 +276,12 @@ pub trait Decoder {
f(self, len) f(self, len)
} }
#[inline]
fn read_seq_elt<T, F>(&mut self, _idx: usize, f: F) -> Result<T, Self::Error> fn read_seq_elt<T, F>(&mut self, _idx: usize, f: F) -> Result<T, Self::Error>
where F: FnOnce(&mut Self) -> Result<T, Self::Error> where F: FnOnce(&mut Self) -> Result<T, Self::Error>
{ {
f(self) f(self)
} }
#[inline]
fn read_map<T, F>(&mut self, f: F) -> Result<T, Self::Error> fn read_map<T, F>(&mut self, f: F) -> Result<T, Self::Error>
where F: FnOnce(&mut Self, usize) -> Result<T, Self::Error> where F: FnOnce(&mut Self, usize) -> Result<T, Self::Error>
{ {
@ -322,14 +289,12 @@ pub trait Decoder {
f(self, len) f(self, len)
} }
#[inline]
fn read_map_elt_key<T, F>(&mut self, _idx: usize, f: F) -> Result<T, Self::Error> fn read_map_elt_key<T, F>(&mut self, _idx: usize, f: F) -> Result<T, Self::Error>
where F: FnOnce(&mut Self) -> Result<T, Self::Error> where F: FnOnce(&mut Self) -> Result<T, Self::Error>
{ {
f(self) f(self)
} }
#[inline]
fn read_map_elt_val<T, F>(&mut self, _idx: usize, f: F) -> Result<T, Self::Error> fn read_map_elt_val<T, F>(&mut self, _idx: usize, f: F) -> Result<T, Self::Error>
where F: FnOnce(&mut Self) -> Result<T, Self::Error> where F: FnOnce(&mut Self) -> Result<T, Self::Error>
{ {
@ -349,287 +314,246 @@ pub trait Decodable: Sized {
} }
impl Encodable for usize { impl Encodable for usize {
#[inline]
fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> { fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
s.emit_usize(*self) s.emit_usize(*self)
} }
} }
impl Decodable for usize { impl Decodable for usize {
#[inline]
fn decode<D: Decoder>(d: &mut D) -> Result<usize, D::Error> { fn decode<D: Decoder>(d: &mut D) -> Result<usize, D::Error> {
d.read_usize() d.read_usize()
} }
} }
impl Encodable for u8 { impl Encodable for u8 {
#[inline]
fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> { fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
s.emit_u8(*self) s.emit_u8(*self)
} }
} }
impl Decodable for u8 { impl Decodable for u8 {
#[inline]
fn decode<D: Decoder>(d: &mut D) -> Result<u8, D::Error> { fn decode<D: Decoder>(d: &mut D) -> Result<u8, D::Error> {
d.read_u8() d.read_u8()
} }
} }
impl Encodable for u16 { impl Encodable for u16 {
#[inline]
fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> { fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
s.emit_u16(*self) s.emit_u16(*self)
} }
} }
impl Decodable for u16 { impl Decodable for u16 {
#[inline]
fn decode<D: Decoder>(d: &mut D) -> Result<u16, D::Error> { fn decode<D: Decoder>(d: &mut D) -> Result<u16, D::Error> {
d.read_u16() d.read_u16()
} }
} }
impl Encodable for u32 { impl Encodable for u32 {
#[inline]
fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> { fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
s.emit_u32(*self) s.emit_u32(*self)
} }
} }
impl Decodable for u32 { impl Decodable for u32 {
#[inline]
fn decode<D: Decoder>(d: &mut D) -> Result<u32, D::Error> { fn decode<D: Decoder>(d: &mut D) -> Result<u32, D::Error> {
d.read_u32() d.read_u32()
} }
} }
impl Encodable for u64 { impl Encodable for u64 {
#[inline]
fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> { fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
s.emit_u64(*self) s.emit_u64(*self)
} }
} }
impl Decodable for u64 { impl Decodable for u64 {
#[inline]
fn decode<D: Decoder>(d: &mut D) -> Result<u64, D::Error> { fn decode<D: Decoder>(d: &mut D) -> Result<u64, D::Error> {
d.read_u64() d.read_u64()
} }
} }
impl Encodable for u128 { impl Encodable for u128 {
#[inline]
fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> { fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
s.emit_u128(*self) s.emit_u128(*self)
} }
} }
impl Decodable for u128 { impl Decodable for u128 {
#[inline]
fn decode<D: Decoder>(d: &mut D) -> Result<u128, D::Error> { fn decode<D: Decoder>(d: &mut D) -> Result<u128, D::Error> {
d.read_u128() d.read_u128()
} }
} }
impl Encodable for isize { impl Encodable for isize {
#[inline]
fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> { fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
s.emit_isize(*self) s.emit_isize(*self)
} }
} }
impl Decodable for isize { impl Decodable for isize {
#[inline]
fn decode<D: Decoder>(d: &mut D) -> Result<isize, D::Error> { fn decode<D: Decoder>(d: &mut D) -> Result<isize, D::Error> {
d.read_isize() d.read_isize()
} }
} }
impl Encodable for i8 { impl Encodable for i8 {
#[inline]
fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> { fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
s.emit_i8(*self) s.emit_i8(*self)
} }
} }
impl Decodable for i8 { impl Decodable for i8 {
#[inline]
fn decode<D: Decoder>(d: &mut D) -> Result<i8, D::Error> { fn decode<D: Decoder>(d: &mut D) -> Result<i8, D::Error> {
d.read_i8() d.read_i8()
} }
} }
impl Encodable for i16 { impl Encodable for i16 {
#[inline]
fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> { fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
s.emit_i16(*self) s.emit_i16(*self)
} }
} }
impl Decodable for i16 { impl Decodable for i16 {
#[inline]
fn decode<D: Decoder>(d: &mut D) -> Result<i16, D::Error> { fn decode<D: Decoder>(d: &mut D) -> Result<i16, D::Error> {
d.read_i16() d.read_i16()
} }
} }
impl Encodable for i32 { impl Encodable for i32 {
#[inline]
fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> { fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
s.emit_i32(*self) s.emit_i32(*self)
} }
} }
impl Decodable for i32 { impl Decodable for i32 {
#[inline]
fn decode<D: Decoder>(d: &mut D) -> Result<i32, D::Error> { fn decode<D: Decoder>(d: &mut D) -> Result<i32, D::Error> {
d.read_i32() d.read_i32()
} }
} }
impl Encodable for i64 { impl Encodable for i64 {
#[inline]
fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> { fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
s.emit_i64(*self) s.emit_i64(*self)
} }
} }
impl Decodable for i64 { impl Decodable for i64 {
#[inline]
fn decode<D: Decoder>(d: &mut D) -> Result<i64, D::Error> { fn decode<D: Decoder>(d: &mut D) -> Result<i64, D::Error> {
d.read_i64() d.read_i64()
} }
} }
impl Encodable for i128 { impl Encodable for i128 {
#[inline]
fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> { fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
s.emit_i128(*self) s.emit_i128(*self)
} }
} }
impl Decodable for i128 { impl Decodable for i128 {
#[inline]
fn decode<D: Decoder>(d: &mut D) -> Result<i128, D::Error> { fn decode<D: Decoder>(d: &mut D) -> Result<i128, D::Error> {
d.read_i128() d.read_i128()
} }
} }
impl Encodable for str { impl Encodable for str {
#[inline]
fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> { fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
s.emit_str(self) s.emit_str(self)
} }
} }
impl Encodable for String { impl Encodable for String {
#[inline]
fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> { fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
s.emit_str(&self[..]) s.emit_str(&self[..])
} }
} }
impl Decodable for String { impl Decodable for String {
#[inline]
fn decode<D: Decoder>(d: &mut D) -> Result<String, D::Error> { fn decode<D: Decoder>(d: &mut D) -> Result<String, D::Error> {
Ok(d.read_str()?.into_owned()) Ok(d.read_str()?.into_owned())
} }
} }
impl Encodable for f32 { impl Encodable for f32 {
#[inline]
fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> { fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
s.emit_f32(*self) s.emit_f32(*self)
} }
} }
impl Decodable for f32 { impl Decodable for f32 {
#[inline]
fn decode<D: Decoder>(d: &mut D) -> Result<f32, D::Error> { fn decode<D: Decoder>(d: &mut D) -> Result<f32, D::Error> {
d.read_f32() d.read_f32()
} }
} }
impl Encodable for f64 { impl Encodable for f64 {
#[inline]
fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> { fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
s.emit_f64(*self) s.emit_f64(*self)
} }
} }
impl Decodable for f64 { impl Decodable for f64 {
#[inline]
fn decode<D: Decoder>(d: &mut D) -> Result<f64, D::Error> { fn decode<D: Decoder>(d: &mut D) -> Result<f64, D::Error> {
d.read_f64() d.read_f64()
} }
} }
impl Encodable for bool { impl Encodable for bool {
#[inline]
fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> { fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
s.emit_bool(*self) s.emit_bool(*self)
} }
} }
impl Decodable for bool { impl Decodable for bool {
#[inline]
fn decode<D: Decoder>(d: &mut D) -> Result<bool, D::Error> { fn decode<D: Decoder>(d: &mut D) -> Result<bool, D::Error> {
d.read_bool() d.read_bool()
} }
} }
impl Encodable for char { impl Encodable for char {
#[inline]
fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> { fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
s.emit_char(*self) s.emit_char(*self)
} }
} }
impl Decodable for char { impl Decodable for char {
#[inline]
fn decode<D: Decoder>(d: &mut D) -> Result<char, D::Error> { fn decode<D: Decoder>(d: &mut D) -> Result<char, D::Error> {
d.read_char() d.read_char()
} }
} }
impl Encodable for () { impl Encodable for () {
#[inline]
fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> { fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
s.emit_nil() s.emit_nil()
} }
} }
impl Decodable for () { impl Decodable for () {
#[inline]
fn decode<D: Decoder>(d: &mut D) -> Result<(), D::Error> { fn decode<D: Decoder>(d: &mut D) -> Result<(), D::Error> {
d.read_nil() d.read_nil()
} }
} }
impl<'a, T: ?Sized + Encodable> Encodable for &'a T { impl<'a, T: ?Sized + Encodable> Encodable for &'a T {
#[inline]
fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> { fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
(**self).encode(s) (**self).encode(s)
} }
} }
impl<T: ?Sized + Encodable> Encodable for Box<T> { impl<T: ?Sized + Encodable> Encodable for Box<T> {
#[inline]
fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> { fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
(**self).encode(s) (**self).encode(s)
} }
} }
impl< T: Decodable> Decodable for Box<T> { impl< T: Decodable> Decodable for Box<T> {
#[inline]
fn decode<D: Decoder>(d: &mut D) -> Result<Box<T>, D::Error> { fn decode<D: Decoder>(d: &mut D) -> Result<Box<T>, D::Error> {
Ok(box Decodable::decode(d)?) Ok(box Decodable::decode(d)?)
} }
} }
impl< T: Decodable> Decodable for Box<[T]> { impl< T: Decodable> Decodable for Box<[T]> {
#[inline]
fn decode<D: Decoder>(d: &mut D) -> Result<Box<[T]>, D::Error> { fn decode<D: Decoder>(d: &mut D) -> Result<Box<[T]>, D::Error> {
let v: Vec<T> = Decodable::decode(d)?; let v: Vec<T> = Decodable::decode(d)?;
Ok(v.into_boxed_slice()) Ok(v.into_boxed_slice())
@ -637,21 +561,18 @@ impl< T: Decodable> Decodable for Box<[T]> {
} }
impl<T:Encodable> Encodable for Rc<T> { impl<T:Encodable> Encodable for Rc<T> {
#[inline]
fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> { fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
(**self).encode(s) (**self).encode(s)
} }
} }
impl<T:Decodable> Decodable for Rc<T> { impl<T:Decodable> Decodable for Rc<T> {
#[inline]
fn decode<D: Decoder>(d: &mut D) -> Result<Rc<T>, D::Error> { fn decode<D: Decoder>(d: &mut D) -> Result<Rc<T>, D::Error> {
Ok(Rc::new(Decodable::decode(d)?)) Ok(Rc::new(Decodable::decode(d)?))
} }
} }
impl<T:Encodable> Encodable for [T] { impl<T:Encodable> Encodable for [T] {
#[inline]
fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> { fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
s.emit_seq(self.len(), |s| { s.emit_seq(self.len(), |s| {
for (i, e) in self.iter().enumerate() { for (i, e) in self.iter().enumerate() {
@ -663,7 +584,6 @@ impl<T:Encodable> Encodable for [T] {
} }
impl<T:Encodable> Encodable for Vec<T> { impl<T:Encodable> Encodable for Vec<T> {
#[inline]
fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> { fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
s.emit_seq(self.len(), |s| { s.emit_seq(self.len(), |s| {
for (i, e) in self.iter().enumerate() { for (i, e) in self.iter().enumerate() {
@ -675,7 +595,6 @@ impl<T:Encodable> Encodable for Vec<T> {
} }
impl<T:Decodable> Decodable for Vec<T> { impl<T:Decodable> Decodable for Vec<T> {
#[inline]
fn decode<D: Decoder>(d: &mut D) -> Result<Vec<T>, D::Error> { fn decode<D: Decoder>(d: &mut D) -> Result<Vec<T>, D::Error> {
d.read_seq(|d, len| { d.read_seq(|d, len| {
let mut v = Vec::with_capacity(len); let mut v = Vec::with_capacity(len);
@ -688,7 +607,6 @@ impl<T:Decodable> Decodable for Vec<T> {
} }
impl<'a, T:Encodable> Encodable for Cow<'a, [T]> where [T]: ToOwned<Owned = Vec<T>> { impl<'a, T:Encodable> Encodable for Cow<'a, [T]> where [T]: ToOwned<Owned = Vec<T>> {
#[inline]
fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> { fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
s.emit_seq(self.len(), |s| { s.emit_seq(self.len(), |s| {
for (i, e) in self.iter().enumerate() { for (i, e) in self.iter().enumerate() {
@ -699,8 +617,9 @@ impl<'a, T:Encodable> Encodable for Cow<'a, [T]> where [T]: ToOwned<Owned = Vec<
} }
} }
impl<T:Decodable+ToOwned> Decodable for Cow<'static, [T]> where [T]: ToOwned<Owned = Vec<T>> { impl<T:Decodable+ToOwned> Decodable for Cow<'static, [T]>
#[inline] where [T]: ToOwned<Owned = Vec<T>>
{
fn decode<D: Decoder>(d: &mut D) -> Result<Cow<'static, [T]>, D::Error> { fn decode<D: Decoder>(d: &mut D) -> Result<Cow<'static, [T]>, D::Error> {
d.read_seq(|d, len| { d.read_seq(|d, len| {
let mut v = Vec::with_capacity(len); let mut v = Vec::with_capacity(len);
@ -714,7 +633,6 @@ impl<T:Decodable+ToOwned> Decodable for Cow<'static, [T]> where [T]: ToOwned<Own
impl<T:Encodable> Encodable for Option<T> { impl<T:Encodable> Encodable for Option<T> {
#[inline]
fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> { fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
s.emit_option(|s| { s.emit_option(|s| {
match *self { match *self {
@ -726,7 +644,6 @@ impl<T:Encodable> Encodable for Option<T> {
} }
impl<T:Decodable> Decodable for Option<T> { impl<T:Decodable> Decodable for Option<T> {
#[inline]
fn decode<D: Decoder>(d: &mut D) -> Result<Option<T>, D::Error> { fn decode<D: Decoder>(d: &mut D) -> Result<Option<T>, D::Error> {
d.read_option(|d, b| { d.read_option(|d, b| {
if b { if b {
@ -739,7 +656,6 @@ impl<T:Decodable> Decodable for Option<T> {
} }
impl<T1: Encodable, T2: Encodable> Encodable for Result<T1, T2> { impl<T1: Encodable, T2: Encodable> Encodable for Result<T1, T2> {
#[inline]
fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> { fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
s.emit_enum("Result", |s| { s.emit_enum("Result", |s| {
match *self { match *self {
@ -763,7 +679,6 @@ impl<T1: Encodable, T2: Encodable> Encodable for Result<T1, T2> {
} }
impl<T1:Decodable, T2:Decodable> Decodable for Result<T1, T2> { impl<T1:Decodable, T2:Decodable> Decodable for Result<T1, T2> {
#[inline]
fn decode<D: Decoder>(d: &mut D) -> Result<Result<T1, T2>, D::Error> { fn decode<D: Decoder>(d: &mut D) -> Result<Result<T1, T2>, D::Error> {
d.read_enum("Result", |d| { d.read_enum("Result", |d| {
d.read_enum_variant(&["Ok", "Err"], |d, disr| { d.read_enum_variant(&["Ok", "Err"], |d, disr| {
@ -803,7 +718,6 @@ macro_rules! tuple {
( $($name:ident,)+ ) => ( ( $($name:ident,)+ ) => (
impl<$($name:Decodable),*> Decodable for ($($name,)*) { impl<$($name:Decodable),*> Decodable for ($($name,)*) {
#[allow(non_snake_case)] #[allow(non_snake_case)]
#[inline]
fn decode<D: Decoder>(d: &mut D) -> Result<($($name,)*), D::Error> { fn decode<D: Decoder>(d: &mut D) -> Result<($($name,)*), D::Error> {
let len: usize = count_idents!($($name,)*); let len: usize = count_idents!($($name,)*);
d.read_tuple(len, |d| { d.read_tuple(len, |d| {
@ -817,7 +731,6 @@ macro_rules! tuple {
} }
impl<$($name:Encodable),*> Encodable for ($($name,)*) { impl<$($name:Encodable),*> Encodable for ($($name,)*) {
#[allow(non_snake_case)] #[allow(non_snake_case)]
#[inline]
fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> { fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
let ($(ref $name,)*) = *self; let ($(ref $name,)*) = *self;
let mut n = 0; let mut n = 0;
@ -836,14 +749,12 @@ macro_rules! tuple {
tuple! { T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, } tuple! { T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, }
impl Encodable for path::PathBuf { impl Encodable for path::PathBuf {
#[inline]
fn encode<S: Encoder>(&self, e: &mut S) -> Result<(), S::Error> { fn encode<S: Encoder>(&self, e: &mut S) -> Result<(), S::Error> {
self.to_str().unwrap().encode(e) self.to_str().unwrap().encode(e)
} }
} }
impl Decodable for path::PathBuf { impl Decodable for path::PathBuf {
#[inline]
fn decode<D: Decoder>(d: &mut D) -> Result<path::PathBuf, D::Error> { fn decode<D: Decoder>(d: &mut D) -> Result<path::PathBuf, D::Error> {
let bytes: String = Decodable::decode(d)?; let bytes: String = Decodable::decode(d)?;
Ok(path::PathBuf::from(bytes)) Ok(path::PathBuf::from(bytes))
@ -851,14 +762,12 @@ impl Decodable for path::PathBuf {
} }
impl<T: Encodable + Copy> Encodable for Cell<T> { impl<T: Encodable + Copy> Encodable for Cell<T> {
#[inline]
fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> { fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
self.get().encode(s) self.get().encode(s)
} }
} }
impl<T: Decodable + Copy> Decodable for Cell<T> { impl<T: Decodable + Copy> Decodable for Cell<T> {
#[inline]
fn decode<D: Decoder>(d: &mut D) -> Result<Cell<T>, D::Error> { fn decode<D: Decoder>(d: &mut D) -> Result<Cell<T>, D::Error> {
Ok(Cell::new(Decodable::decode(d)?)) Ok(Cell::new(Decodable::decode(d)?))
} }
@ -870,28 +779,24 @@ impl<T: Decodable + Copy> Decodable for Cell<T> {
// from `encode` when `try_borrow` returns `None`. // from `encode` when `try_borrow` returns `None`.
impl<T: Encodable> Encodable for RefCell<T> { impl<T: Encodable> Encodable for RefCell<T> {
#[inline]
fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> { fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
self.borrow().encode(s) self.borrow().encode(s)
} }
} }
impl<T: Decodable> Decodable for RefCell<T> { impl<T: Decodable> Decodable for RefCell<T> {
#[inline]
fn decode<D: Decoder>(d: &mut D) -> Result<RefCell<T>, D::Error> { fn decode<D: Decoder>(d: &mut D) -> Result<RefCell<T>, D::Error> {
Ok(RefCell::new(Decodable::decode(d)?)) Ok(RefCell::new(Decodable::decode(d)?))
} }
} }
impl<T:Encodable> Encodable for Arc<T> { impl<T:Encodable> Encodable for Arc<T> {
#[inline]
fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> { fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
(**self).encode(s) (**self).encode(s)
} }
} }
impl<T:Decodable> Decodable for Arc<T> { impl<T:Decodable> Decodable for Arc<T> {
#[inline]
fn decode<D: Decoder>(d: &mut D) -> Result<Arc<T>, D::Error> { fn decode<D: Decoder>(d: &mut D) -> Result<Arc<T>, D::Error> {
Ok(Arc::new(Decodable::decode(d)?)) Ok(Arc::new(Decodable::decode(d)?))
} }
@ -913,7 +818,6 @@ pub trait SpecializationError {
} }
impl<E> SpecializationError for E { impl<E> SpecializationError for E {
#[inline]
default fn not_found<S, T: ?Sized>(trait_name: &'static str, method_name: &'static str) -> E { default fn not_found<S, T: ?Sized>(trait_name: &'static str, method_name: &'static str) -> E {
panic!("missing specialization: `<{} as {}<{}>>::{}` not overridden", panic!("missing specialization: `<{} as {}<{}>>::{}` not overridden",
unsafe { intrinsics::type_name::<S>() }, unsafe { intrinsics::type_name::<S>() },
@ -932,7 +836,6 @@ pub trait SpecializedEncoder<T: ?Sized + UseSpecializedEncodable>: Encoder {
} }
impl<E: Encoder, T: ?Sized + UseSpecializedEncodable> SpecializedEncoder<T> for E { impl<E: Encoder, T: ?Sized + UseSpecializedEncodable> SpecializedEncoder<T> for E {
#[inline]
default fn specialized_encode(&mut self, value: &T) -> Result<(), E::Error> { default fn specialized_encode(&mut self, value: &T) -> Result<(), E::Error> {
value.default_encode(self) value.default_encode(self)
} }
@ -947,7 +850,6 @@ pub trait SpecializedDecoder<T: UseSpecializedDecodable>: Decoder {
} }
impl<D: Decoder, T: UseSpecializedDecodable> SpecializedDecoder<T> for D { impl<D: Decoder, T: UseSpecializedDecodable> SpecializedDecoder<T> for D {
#[inline]
default fn specialized_decode(&mut self) -> Result<T, D::Error> { default fn specialized_decode(&mut self) -> Result<T, D::Error> {
T::default_decode(self) T::default_decode(self)
} }
@ -957,14 +859,12 @@ impl<D: Decoder, T: UseSpecializedDecodable> SpecializedDecoder<T> for D {
/// implementation which goes through `SpecializedEncoder`. /// implementation which goes through `SpecializedEncoder`.
pub trait UseSpecializedEncodable { pub trait UseSpecializedEncodable {
/// Defaults to returning an error (see `SpecializationError`). /// Defaults to returning an error (see `SpecializationError`).
#[inline]
fn default_encode<E: Encoder>(&self, _: &mut E) -> Result<(), E::Error> { fn default_encode<E: Encoder>(&self, _: &mut E) -> Result<(), E::Error> {
Err(E::Error::not_found::<E, Self>("SpecializedEncoder", "specialized_encode")) Err(E::Error::not_found::<E, Self>("SpecializedEncoder", "specialized_encode"))
} }
} }
impl<T: ?Sized + UseSpecializedEncodable> Encodable for T { impl<T: ?Sized + UseSpecializedEncodable> Encodable for T {
#[inline]
default fn encode<E: Encoder>(&self, e: &mut E) -> Result<(), E::Error> { default fn encode<E: Encoder>(&self, e: &mut E) -> Result<(), E::Error> {
E::specialized_encode(e, self) E::specialized_encode(e, self)
} }
@ -974,14 +874,12 @@ impl<T: ?Sized + UseSpecializedEncodable> Encodable for T {
/// implementation which goes through `SpecializedDecoder`. /// implementation which goes through `SpecializedDecoder`.
pub trait UseSpecializedDecodable: Sized { pub trait UseSpecializedDecodable: Sized {
/// Defaults to returning an error (see `SpecializationError`). /// Defaults to returning an error (see `SpecializationError`).
#[inline]
fn default_decode<D: Decoder>(_: &mut D) -> Result<Self, D::Error> { fn default_decode<D: Decoder>(_: &mut D) -> Result<Self, D::Error> {
Err(D::Error::not_found::<D, Self>("SpecializedDecoder", "specialized_decode")) Err(D::Error::not_found::<D, Self>("SpecializedDecoder", "specialized_decode"))
} }
} }
impl<T: UseSpecializedDecodable> Decodable for T { impl<T: UseSpecializedDecodable> Decodable for T {
#[inline]
default fn decode<D: Decoder>(d: &mut D) -> Result<T, D::Error> { default fn decode<D: Decoder>(d: &mut D) -> Result<T, D::Error> {
D::specialized_decode(d) D::specialized_decode(d)
} }