From fa683ac6563a844327de5e23d2a17bcfb5c328cd Mon Sep 17 00:00:00 2001
From: kenta7777 <k.hasegw7@gmail.com>
Date: Tue, 11 Sep 2018 22:20:09 +0900
Subject: [PATCH] Revert "renamed read_nil to read_unit"

This reverts commit 37d0600c23ba1890346078bd7f310e15915417b2.
---
 src/librustc/ty/codec.rs      | 2 +-
 src/libserialize/json.rs      | 2 +-
 src/libserialize/opaque.rs    | 2 +-
 src/libserialize/serialize.rs | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/librustc/ty/codec.rs b/src/librustc/ty/codec.rs
index 051cca49f7e2..cc3e8a458a01 100644
--- a/src/librustc/ty/codec.rs
+++ b/src/librustc/ty/codec.rs
@@ -298,7 +298,7 @@ macro_rules! implement_ty_decoder {
                 type Error = String;
 
                 __impl_decoder_methods! {
-                    read_unit -> ();
+                    read_nil -> ();
 
                     read_u128 -> u128;
                     read_u64 -> u64;
diff --git a/src/libserialize/json.rs b/src/libserialize/json.rs
index bbb3b73f2fa1..9439dc78d3ca 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 fee5e59cc401..4ce80bc36a08 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 64d6dbecea65..f0b49c3d9bc8 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()
     }
 }