rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Rename Decoder::read_nil and read_unit.

Browse Source 
Because `()` is called "unit" and it makes it match
`Encoder::emit_unit`.
This commit is contained in:
Nicholas Nethercote
2022-01-19 12:09:19 +11:00
parent cbaeec14f9
commit 88600a6d7f
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/rustc_ast/src/ast.rs
View File

@@ -2419,7 +2419,7 @@ impl<S: Encoder> rustc_serialize::Encodable<S> for AttrId {
impl<D: Decoder> rustc_serialize::Decodable<D> for AttrId { impl<D: Decoder> rustc_serialize::Decodable<D> for AttrId {
fn decode(d: &mut D) -> Result<AttrId, D::Error> { fn decode(d: &mut D) -> Result<AttrId, D::Error> {
d.read_nil().map(|_| crate::attr::mk_attr_id()) d.read_unit().map(|_| crate::attr::mk_attr_id())
} }
} }

2
compiler/rustc_middle/src/ty/codec.rs
View File

@@ -459,7 +459,7 @@ macro_rules! implement_ty_decoder {
type Error = String; type Error = String;
$crate::__impl_decoder_methods! { $crate::__impl_decoder_methods! {
read_nil -> (); read_unit -> ();
read_u128 -> u128; read_u128 -> u128;
read_u64 -> u64; read_u64 -> u64;

2
compiler/rustc_serialize/src/json.rs
View File

@@ -2240,7 +2240,7 @@ macro_rules! read_primitive {
impl crate::Decoder for Decoder { impl crate::Decoder for Decoder {
type Error = DecoderError; type Error = DecoderError;
fn read_nil(&mut self) -> DecodeResult<()> { fn read_unit(&mut self) -> DecodeResult<()> {
expect!(self.pop(), Null) expect!(self.pop(), Null)
} }

2
compiler/rustc_serialize/src/opaque.rs
View File

@@ -567,7 +567,7 @@ impl<'a> serialize::Decoder for Decoder<'a> {
type Error = String; type Error = String;
#[inline] #[inline]
fn read_nil(&mut self) -> Result<(), Self::Error> { fn read_unit(&mut self) -> Result<(), Self::Error> {
Ok(()) Ok(())
} }

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

@@ -177,7 +177,7 @@ pub trait Decoder {
type Error; type Error;
// Primitive types: // Primitive types:
fn read_nil(&mut self) -> Result<(), Self::Error>; fn read_unit(&mut self) -> Result<(), Self::Error>;
fn read_usize(&mut self) -> Result<usize, Self::Error>; fn read_usize(&mut self) -> Result<usize, Self::Error>;
fn read_u128(&mut self) -> Result<u128, Self::Error>; fn read_u128(&mut self) -> Result<u128, Self::Error>;
fn read_u64(&mut self) -> Result<u64, Self::Error>; fn read_u64(&mut self) -> Result<u64, Self::Error>;
@@ -436,7 +436,7 @@ impl<S: Encoder> Encodable<S> for () {
impl<D: Decoder> Decodable<D> for () { impl<D: Decoder> Decodable<D> for () {
fn decode(d: &mut D) -> Result<(), D::Error> { fn decode(d: &mut D) -> Result<(), D::Error> {
d.read_nil() d.read_unit()
} }
} }
@@ -448,7 +448,7 @@ impl<S: Encoder, T> Encodable<S> for PhantomData<T> {
impl<D: Decoder, T> Decodable<D> for PhantomData<T> { impl<D: Decoder, T> Decodable<D> for PhantomData<T> {
fn decode(d: &mut D) -> Result<PhantomData<T>, D::Error> { fn decode(d: &mut D) -> Result<PhantomData<T>, D::Error> {
d.read_nil()?; d.read_unit()?;
Ok(PhantomData) Ok(PhantomData)
} }
} }