Skip to content

Commit f1bcb0f

Browse files
Delete Decoder::read_unit
1 parent 2098ea6 commit f1bcb0f

File tree

5 files changed

+4
-17
lines changed

5 files changed

+4
-17
lines changed

compiler/rustc_ast/src/ast.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -2418,8 +2418,7 @@ impl<S: Encoder> rustc_serialize::Encodable<S> for AttrId {
24182418
}
24192419

24202420
impl<D: Decoder> rustc_serialize::Decodable<D> for AttrId {
2421-
fn decode(d: &mut D) -> AttrId {
2422-
d.read_unit();
2421+
fn decode(_: &mut D) -> AttrId {
24232422
crate::attr::mk_attr_id()
24242423
}
24252424
}

compiler/rustc_middle/src/mir/predecessors.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,7 @@ impl<S: serialize::Encoder> serialize::Encodable<S> for PredecessorCache {
6363

6464
impl<D: serialize::Decoder> serialize::Decodable<D> for PredecessorCache {
6565
#[inline]
66-
fn decode(d: &mut D) -> Self {
67-
let () = d.read_unit();
66+
fn decode(_: &mut D) -> Self {
6867
Self::new()
6968
}
7069
}

compiler/rustc_middle/src/ty/codec.rs

-2
Original file line numberDiff line numberDiff line change
@@ -465,8 +465,6 @@ macro_rules! implement_ty_decoder {
465465

466466
impl<$($typaram ),*> Decoder for $DecoderName<$($typaram),*> {
467467
$crate::__impl_decoder_methods! {
468-
read_unit -> ();
469-
470468
read_u128 -> u128;
471469
read_u64 -> u64;
472470
read_u32 -> u32;

compiler/rustc_serialize/src/opaque.rs

-5
Original file line numberDiff line numberDiff line change
@@ -555,11 +555,6 @@ macro_rules! read_leb128 {
555555
}
556556

557557
impl<'a> serialize::Decoder for Decoder<'a> {
558-
#[inline]
559-
fn read_unit(&mut self) -> () {
560-
()
561-
}
562-
563558
#[inline]
564559
fn read_u128(&mut self) -> u128 {
565560
read_leb128!(self, read_u128_leb128)

compiler/rustc_serialize/src/serialize.rs

+2-6
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,6 @@ pub trait Encoder {
181181
// concise.
182182
pub trait Decoder {
183183
// Primitive types:
184-
fn read_unit(&mut self) -> ();
185184
fn read_usize(&mut self) -> usize;
186185
fn read_u128(&mut self) -> u128;
187186
fn read_u64(&mut self) -> u64;
@@ -324,9 +323,7 @@ impl<S: Encoder> Encodable<S> for () {
324323
}
325324

326325
impl<D: Decoder> Decodable<D> for () {
327-
fn decode(d: &mut D) -> () {
328-
d.read_unit()
329-
}
326+
fn decode(_: &mut D) -> () {}
330327
}
331328

332329
impl<S: Encoder, T> Encodable<S> for PhantomData<T> {
@@ -336,8 +333,7 @@ impl<S: Encoder, T> Encodable<S> for PhantomData<T> {
336333
}
337334

338335
impl<D: Decoder, T> Decodable<D> for PhantomData<T> {
339-
fn decode(d: &mut D) -> PhantomData<T> {
340-
d.read_unit();
336+
fn decode(_: &mut D) -> PhantomData<T> {
341337
PhantomData
342338
}
343339
}

0 commit comments

Comments
 (0)