diff options
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/rustc_ast/src/ast.rs | 3 | ||||
| -rw-r--r-- | compiler/rustc_middle/src/mir/predecessors.rs | 3 | ||||
| -rw-r--r-- | compiler/rustc_middle/src/ty/codec.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_serialize/src/opaque.rs | 5 | ||||
| -rw-r--r-- | compiler/rustc_serialize/src/serialize.rs | 8 |
5 files changed, 4 insertions, 17 deletions
diff --git a/compiler/rustc_ast/src/ast.rs b/compiler/rustc_ast/src/ast.rs index e9135b71630..0449d715a5e 100644 --- a/compiler/rustc_ast/src/ast.rs +++ b/compiler/rustc_ast/src/ast.rs @@ -2418,8 +2418,7 @@ impl<S: Encoder> rustc_serialize::Encodable<S> for AttrId { } impl<D: Decoder> rustc_serialize::Decodable<D> for AttrId { - fn decode(d: &mut D) -> AttrId { - d.read_unit(); + fn decode(_: &mut D) -> AttrId { crate::attr::mk_attr_id() } } diff --git a/compiler/rustc_middle/src/mir/predecessors.rs b/compiler/rustc_middle/src/mir/predecessors.rs index 2562baac911..4fe2cde7532 100644 --- a/compiler/rustc_middle/src/mir/predecessors.rs +++ b/compiler/rustc_middle/src/mir/predecessors.rs @@ -63,8 +63,7 @@ impl<S: serialize::Encoder> serialize::Encodable<S> for PredecessorCache { impl<D: serialize::Decoder> serialize::Decodable<D> for PredecessorCache { #[inline] - fn decode(d: &mut D) -> Self { - let () = d.read_unit(); + fn decode(_: &mut D) -> Self { Self::new() } } diff --git a/compiler/rustc_middle/src/ty/codec.rs b/compiler/rustc_middle/src/ty/codec.rs index 7a6cbea00d8..23fb7a49d9c 100644 --- a/compiler/rustc_middle/src/ty/codec.rs +++ b/compiler/rustc_middle/src/ty/codec.rs @@ -465,8 +465,6 @@ macro_rules! implement_ty_decoder { impl<$($typaram ),*> Decoder for $DecoderName<$($typaram),*> { $crate::__impl_decoder_methods! { - read_unit -> (); - read_u128 -> u128; read_u64 -> u64; read_u32 -> u32; diff --git a/compiler/rustc_serialize/src/opaque.rs b/compiler/rustc_serialize/src/opaque.rs index 1a71ee9038b..5e5cbacbcff 100644 --- a/compiler/rustc_serialize/src/opaque.rs +++ b/compiler/rustc_serialize/src/opaque.rs @@ -556,11 +556,6 @@ macro_rules! read_leb128 { impl<'a> serialize::Decoder for Decoder<'a> { #[inline] - fn read_unit(&mut self) -> () { - () - } - - #[inline] fn read_u128(&mut self) -> u128 { read_leb128!(self, read_u128_leb128) } diff --git a/compiler/rustc_serialize/src/serialize.rs b/compiler/rustc_serialize/src/serialize.rs index 7b6dd8b60f8..42bf6ff2a98 100644 --- a/compiler/rustc_serialize/src/serialize.rs +++ b/compiler/rustc_serialize/src/serialize.rs @@ -181,7 +181,6 @@ pub trait Encoder { // concise. pub trait Decoder { // Primitive types: - fn read_unit(&mut self) -> (); fn read_usize(&mut self) -> usize; fn read_u128(&mut self) -> u128; fn read_u64(&mut self) -> u64; @@ -324,9 +323,7 @@ impl<S: Encoder> Encodable<S> for () { } impl<D: Decoder> Decodable<D> for () { - fn decode(d: &mut D) -> () { - d.read_unit() - } + fn decode(_: &mut D) -> () {} } impl<S: Encoder, T> Encodable<S> for PhantomData<T> { @@ -336,8 +333,7 @@ impl<S: Encoder, T> Encodable<S> for PhantomData<T> { } impl<D: Decoder, T> Decodable<D> for PhantomData<T> { - fn decode(d: &mut D) -> PhantomData<T> { - d.read_unit(); + fn decode(_: &mut D) -> PhantomData<T> { PhantomData } } |
