renamed emit_nil to emit_unit

kenta7777 · kenta7777 · commit d02a5ffaed9c · 2018-09-10T10:31:37.000+09:00
diff --git a/src/doc/book b/src/doc/book
@@ -1 +1 @@
-Subproject commit cff0930664b688f1dd22aefb3d16944eb4cdbfd5
+Subproject commit f51127530d46b9acbf4747c859da185e771cfcf3
diff --git a/src/doc/nomicon b/src/doc/nomicon
@@ -1 +1 @@
-Subproject commit 7fd493465b7dd6cf3476f0b834884059bbdd1d93
+Subproject commit 748a5e6742db4a21c4c630a58087f818828e8a0a
diff --git a/src/doc/reference b/src/doc/reference
@@ -1 +1 @@
-Subproject commit 821355a6fd642b71988a2f88a3162fb358732012
+Subproject commit 134f419ee62714590b04712fe6072253bc2a7822
diff --git a/src/doc/rust-by-example b/src/doc/rust-by-example
@@ -1 +1 @@
-Subproject commit e459fb3f07f2b930ccd25d348671b8eae233fd64
+Subproject commit eebda16e4b45f2eed4310cf7b9872cc752278163
diff --git a/src/libcompiler_builtins b/src/libcompiler_builtins
@@ -1 +1 @@
-Subproject commit 0703bfa72524e01e414477657ca9b64794c5c1c3
+Subproject commit 2a2f6d96c8dc578d2474742f14c9bab0b36b0408
diff --git a/src/liblibc b/src/liblibc
@@ -1 +1 @@
-Subproject commit 1844a772b60771d0124a157019f627d60fea4e73
+Subproject commit a7e78a78e17c8776d7780008ccb3ce541ec64ae9
diff --git a/src/librustc/ty/query/on_disk_cache.rs b/src/librustc/ty/query/on_disk_cache.rs
@@ -1020,7 +1020,7 @@ impl<'enc, 'a, 'tcx, E> Encoder for CacheEncoder<'enc, 'a, 'tcx, E>
 {
     type Error = E::Error;
 
-    fn emit_nil(&mut self) -> Result<(), Self::Error> {
+    fn emit_unit(&mut self) -> Result<(), Self::Error> {
         Ok(())
     }
 
diff --git a/src/librustc_metadata/encoder.rs b/src/librustc_metadata/encoder.rs
@@ -75,7 +75,7 @@ macro_rules! encoder_methods {
 impl<'a, 'tcx> Encoder for EncodeContext<'a, 'tcx> {
     type Error = <opaque::Encoder as Encoder>::Error;
 
-    fn emit_nil(&mut self) -> Result<(), Self::Error> {
+    fn emit_unit(&mut self) -> Result<(), Self::Error> {
         Ok(())
     }
 
diff --git a/src/libserialize/json.rs b/src/libserialize/json.rs
@@ -490,7 +490,7 @@ macro_rules! emit_enquoted_if_mapkey {
 impl<'a> ::Encoder for Encoder<'a> {
     type Error = EncoderError;
 
-    fn emit_nil(&mut self) -> EncodeResult {
+    fn emit_unit(&mut self) -> EncodeResult {
         if self.is_emitting_map_key { return Err(EncoderError::BadHashmapKey); }
         write!(self.writer, "null")?;
         Ok(())
@@ -648,7 +648,7 @@ impl<'a> ::Encoder for Encoder<'a> {
     }
     fn emit_option_none(&mut self) -> EncodeResult {
         if self.is_emitting_map_key { return Err(EncoderError::BadHashmapKey); }
-        self.emit_nil()
+        self.emit_unit()
     }
     fn emit_option_some<F>(&mut self, f: F) -> EncodeResult where
         F: FnOnce(&mut Encoder<'a>) -> EncodeResult,
@@ -740,7 +740,7 @@ impl<'a> PrettyEncoder<'a> {
 impl<'a> ::Encoder for PrettyEncoder<'a> {
     type Error = EncoderError;
 
-    fn emit_nil(&mut self) -> EncodeResult {
+    fn emit_unit(&mut self) -> EncodeResult {
         if self.is_emitting_map_key { return Err(EncoderError::BadHashmapKey); }
         write!(self.writer, "null")?;
         Ok(())
@@ -923,7 +923,7 @@ impl<'a> ::Encoder for PrettyEncoder<'a> {
     }
     fn emit_option_none(&mut self) -> EncodeResult {
         if self.is_emitting_map_key { return Err(EncoderError::BadHashmapKey); }
-        self.emit_nil()
+        self.emit_unit()
     }
     fn emit_option_some<F>(&mut self, f: F) -> EncodeResult where
         F: FnOnce(&mut PrettyEncoder<'a>) -> EncodeResult,
@@ -1016,7 +1016,7 @@ impl Encodable for Json {
             Json::Boolean(v) => v.encode(e),
             Json::Array(ref v) => v.encode(e),
             Json::Object(ref v) => v.encode(e),
-            Json::Null => e.emit_nil(),
+            Json::Null => e.emit_unit(),
         }
     }
 }
diff --git a/src/libserialize/opaque.rs b/src/libserialize/opaque.rs
@@ -55,7 +55,7 @@ impl serialize::Encoder for Encoder {
     type Error = !;
 
     #[inline]
-    fn emit_nil(&mut self) -> EncodeResult {
+    fn emit_unit(&mut self) -> EncodeResult {
         Ok(())
     }
 
diff --git a/src/libserialize/serialize.rs b/src/libserialize/serialize.rs
@@ -25,7 +25,7 @@ pub trait Encoder {
     type Error;
 
     // Primitive types:
-    fn emit_nil(&mut self) -> Result<(), Self::Error>;
+    fn emit_unit(&mut self) -> Result<(), Self::Error>;
     fn emit_usize(&mut self, v: usize) -> Result<(), Self::Error>;
     fn emit_u128(&mut self, v: u128) -> Result<(), Self::Error>;
     fn emit_u64(&mut self, v: u64) -> Result<(), Self::Error>;
@@ -537,7 +537,7 @@ impl Decodable for char {
 
 impl Encodable for () {
     fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
-        s.emit_nil()
+        s.emit_unit()
     }
 }
 
diff --git a/src/llvm b/src/llvm
@@ -1 +1 @@
-Subproject commit 2a1cdeadd3ea8e1eba9cc681037b83f07332763b
+Subproject commit 7243155b1c3da0a980c868a87adebf00e0b33989
diff --git a/src/stdsimd b/src/stdsimd
@@ -1 +1 @@
-Subproject commit 05c2f61c384e2097a3a4c648344114fc4ac983be
+Subproject commit 1ea18a5cb431e24aa838b652ac305acc5e394d6b
diff --git a/src/tools/cargo b/src/tools/cargo
@@ -1 +1 @@
-Subproject commit 2fb77a49b43bf7266793c07a19a06749e6a8ad5a
+Subproject commit af3f1cd29bc872b932a13083e531255aab233a7e
diff --git a/src/tools/clippy b/src/tools/clippy
@@ -1 +1 @@
-Subproject commit fdd830f52c082b83db0dac3e0066c0cf114050d2
+Subproject commit e456241f18227c7eb8d78a45daa66c756a9b65e7
diff --git a/src/tools/miri b/src/tools/miri
@@ -1 +1 @@
-Subproject commit e6f1e15676c26fdc7c4713647fe007b26f361a8e
+Subproject commit e0e1bd7ff778e5913b566c9e03224faecc0eb486
diff --git a/src/tools/rls b/src/tools/rls
@@ -1 +1 @@
-Subproject commit 5b5cd9d45719414196e254ec17baa598acc8cd25
+Subproject commit 1263f1ff25bb329b76f74715ad4a7ec0d1f71430
diff --git a/src/tools/rust-installer b/src/tools/rust-installer
@@ -1 +1 @@
-Subproject commit 27dec6cae3a8132d8a073aad6775425c85095c99
+Subproject commit 118e078c5badd520d18b92813fd88789c8d341ab
diff --git a/src/tools/rustfmt b/src/tools/rustfmt
@@ -1 +1 @@
-Subproject commit 1c408818c8a752dd584e7858b4afd3ceb011a7da
+Subproject commit 0f8029f251b569a010cb5cfc5a8bff8bf3c949ac

Original file line number	Diff line number	Diff line change
`@@ -1020,7 +1020,7 @@ impl<'enc, 'a, 'tcx, E> Encoder for CacheEncoder<'enc, 'a, 'tcx, E>`
`1020`	`1020`	`{`
`1021`	`1021`	`type Error = E::Error;`
`1022`	`1022`
`1023`		`- fn emit_nil(&mut self) -> Result<(), Self::Error> {`
	`1023`	`+ fn emit_unit(&mut self) -> Result<(), Self::Error> {`
`1024`	`1024`	`Ok(())`
`1025`	`1025`	`}`
`1026`	`1026`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ macro_rules! encoder_methods {`
`75`	`75`	`impl<'a, 'tcx> Encoder for EncodeContext<'a, 'tcx> {`
`76`	`76`	`type Error = <opaque::Encoder as Encoder>::Error;`
`77`	`77`
`78`		`- fn emit_nil(&mut self) -> Result<(), Self::Error> {`
	`78`	`+ fn emit_unit(&mut self) -> Result<(), Self::Error> {`
`79`	`79`	`Ok(())`
`80`	`80`	`}`
`81`	`81`
Original file line number	Diff line number	Diff line change
`@@ -490,7 +490,7 @@ macro_rules! emit_enquoted_if_mapkey {`
`490`	`490`	`impl<'a> ::Encoder for Encoder<'a> {`
`491`	`491`	`type Error = EncoderError;`
`492`	`492`
`493`		`- fn emit_nil(&mut self) -> EncodeResult {`
	`493`	`+ fn emit_unit(&mut self) -> EncodeResult {`
`494`	`494`	`if self.is_emitting_map_key { return Err(EncoderError::BadHashmapKey); }`
`495`	`495`	`write!(self.writer, "null")?;`
`496`	`496`	`Ok(())`
`@@ -648,7 +648,7 @@ impl<'a> ::Encoder for Encoder<'a> {`
`648`	`648`	`}`
`649`	`649`	`fn emit_option_none(&mut self) -> EncodeResult {`
`650`	`650`	`if self.is_emitting_map_key { return Err(EncoderError::BadHashmapKey); }`
`651`		`- self.emit_nil()`
	`651`	`+ self.emit_unit()`
`652`	`652`	`}`
`653`	`653`	`fn emit_option_some<F>(&mut self, f: F) -> EncodeResult where`
`654`	`654`	`F: FnOnce(&mut Encoder<'a>) -> EncodeResult,`
`@@ -740,7 +740,7 @@ impl<'a> PrettyEncoder<'a> {`
`740`	`740`	`impl<'a> ::Encoder for PrettyEncoder<'a> {`
`741`	`741`	`type Error = EncoderError;`
`742`	`742`
`743`		`- fn emit_nil(&mut self) -> EncodeResult {`
	`743`	`+ fn emit_unit(&mut self) -> EncodeResult {`
`744`	`744`	`if self.is_emitting_map_key { return Err(EncoderError::BadHashmapKey); }`
`745`	`745`	`write!(self.writer, "null")?;`
`746`	`746`	`Ok(())`
`@@ -923,7 +923,7 @@ impl<'a> ::Encoder for PrettyEncoder<'a> {`
`923`	`923`	`}`
`924`	`924`	`fn emit_option_none(&mut self) -> EncodeResult {`
`925`	`925`	`if self.is_emitting_map_key { return Err(EncoderError::BadHashmapKey); }`
`926`		`- self.emit_nil()`
	`926`	`+ self.emit_unit()`
`927`	`927`	`}`
`928`	`928`	`fn emit_option_some<F>(&mut self, f: F) -> EncodeResult where`
`929`	`929`	`F: FnOnce(&mut PrettyEncoder<'a>) -> EncodeResult,`
`@@ -1016,7 +1016,7 @@ impl Encodable for Json {`
`1016`	`1016`	`Json::Boolean(v) => v.encode(e),`
`1017`	`1017`	`Json::Array(ref v) => v.encode(e),`
`1018`	`1018`	`Json::Object(ref v) => v.encode(e),`
`1019`		`- Json::Null => e.emit_nil(),`
	`1019`	`+ Json::Null => e.emit_unit(),`
`1020`	`1020`	`}`
`1021`	`1021`	`}`
`1022`	`1022`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ impl serialize::Encoder for Encoder {`
`55`	`55`	`type Error = !;`
`56`	`56`
`57`	`57`	`#[inline]`
`58`		`- fn emit_nil(&mut self) -> EncodeResult {`
	`58`	`+ fn emit_unit(&mut self) -> EncodeResult {`
`59`	`59`	`Ok(())`
`60`	`60`	`}`
`61`	`61`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ pub trait Encoder {`
`25`	`25`	`type Error;`
`26`	`26`
`27`	`27`	`// Primitive types:`
`28`		`- fn emit_nil(&mut self) -> Result<(), Self::Error>;`
	`28`	`+ fn emit_unit(&mut self) -> Result<(), Self::Error>;`
`29`	`29`	`fn emit_usize(&mut self, v: usize) -> Result<(), Self::Error>;`
`30`	`30`	`fn emit_u128(&mut self, v: u128) -> Result<(), Self::Error>;`
`31`	`31`	`fn emit_u64(&mut self, v: u64) -> Result<(), Self::Error>;`
`@@ -537,7 +537,7 @@ impl Decodable for char {`
`537`	`537`
`538`	`538`	`impl Encodable for () {`
`539`	`539`	`fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {`
`540`		`- s.emit_nil()`
	`540`	`+ s.emit_unit()`
`541`	`541`	`}`
`542`	`542`	`}`
`543`	`543`