diff options
| author | kenta7777 <k.hasegw7@gmail.com> | 2018-09-11 22:20:09 +0900 |
|---|---|---|
| committer | kenta7777 <k.hasegw7@gmail.com> | 2018-09-11 22:20:09 +0900 |
| commit | fa683ac6563a844327de5e23d2a17bcfb5c328cd (patch) | |
| tree | f77be3ca72a335113d3d86415ef79ae3112ef197 /src/libserialize | |
| parent | 10b2083a6d3de2dad2a41639bfe5a90c4d87bf31 (diff) | |
| download | rust-fa683ac6563a844327de5e23d2a17bcfb5c328cd.tar.gz rust-fa683ac6563a844327de5e23d2a17bcfb5c328cd.zip | |
Revert "renamed read_nil to read_unit"
This reverts commit 37d0600c23ba1890346078bd7f310e15915417b2.
Diffstat (limited to 'src/libserialize')
| -rw-r--r-- | src/libserialize/json.rs | 2 | ||||
| -rw-r--r-- | src/libserialize/opaque.rs | 2 | ||||
| -rw-r--r-- | src/libserialize/serialize.rs | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/libserialize/json.rs b/src/libserialize/json.rs index bbb3b73f2fa..9439dc78d3c 100644 --- a/src/libserialize/json.rs +++ b/src/libserialize/json.rs @@ -2128,7 +2128,7 @@ macro_rules! read_primitive { impl ::Decoder for Decoder { type Error = DecoderError; - fn read_unit(&mut self) -> DecodeResult<()> { + fn read_nil(&mut self) -> DecodeResult<()> { expect!(self.pop(), Null) } diff --git a/src/libserialize/opaque.rs b/src/libserialize/opaque.rs index fee5e59cc40..4ce80bc36a0 100644 --- a/src/libserialize/opaque.rs +++ b/src/libserialize/opaque.rs @@ -228,7 +228,7 @@ impl<'a> serialize::Decoder for Decoder<'a> { type Error = String; #[inline] - fn read_unit(&mut self) -> Result<(), Self::Error> { + fn read_nil(&mut self) -> Result<(), Self::Error> { Ok(()) } diff --git a/src/libserialize/serialize.rs b/src/libserialize/serialize.rs index 64d6dbecea6..f0b49c3d9bc 100644 --- a/src/libserialize/serialize.rs +++ b/src/libserialize/serialize.rs @@ -167,7 +167,7 @@ pub trait Decoder { type Error; // Primitive types: - fn read_unit(&mut self) -> Result<(), Self::Error>; + fn read_nil(&mut self) -> Result<(), Self::Error>; fn read_usize(&mut self) -> Result<usize, Self::Error>; fn read_u128(&mut self) -> Result<u128, Self::Error>; fn read_u64(&mut self) -> Result<u64, Self::Error>; @@ -543,7 +543,7 @@ impl Encodable for () { impl Decodable for () { fn decode<D: Decoder>(d: &mut D) -> Result<(), D::Error> { - d.read_unit() + d.read_nil() } } |
