renamed emit_nil to emit_unit

diff --git a/src/doc/book b/src/doc/book
index cff0930664b688f1dd22aefb3d16944eb4cdbfd5..f51127530d46b9acbf4747c859da185e771cfcf3 160000 (submodule)
--- 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
index 7fd493465b7dd6cf3476f0b834884059bbdd1d93..748a5e6742db4a21c4c630a58087f818828e8a0a 160000 (submodule)
--- 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
index 821355a6fd642b71988a2f88a3162fb358732012..134f419ee62714590b04712fe6072253bc2a7822 160000 (submodule)
--- 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
index e459fb3f07f2b930ccd25d348671b8eae233fd64..eebda16e4b45f2eed4310cf7b9872cc752278163 160000 (submodule)
--- 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
index 0703bfa72524e01e414477657ca9b64794c5c1c3..2a2f6d96c8dc578d2474742f14c9bab0b36b0408 160000 (submodule)
--- a/src/libcompiler_builtins
+++ b/src/libcompiler_builtins
@@ -1 +1 @@
-Subproject commit 0703bfa72524e01e414477657ca9b64794c5c1c3
+Subproject commit 2a2f6d96c8dc578d2474742f14c9bab0b36b0408

diff --git a/src/liblibc b/src/liblibc
index 1844a772b60771d0124a157019f627d60fea4e73..a7e78a78e17c8776d7780008ccb3ce541ec64ae9 160000 (submodule)
--- 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
index 6e16d92ba0c8d91ef45e9bf0274530698de2f0af..19e235154cbd08d23cc440f856bcb6358fb27905 100644 (file)
--- 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
index aae45c17c6771bd134b95bafcb22eef9d7ecb64f..56b38cfbc872a2711e0b7912f27a556bdfdc7830 100644 (file)
--- 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
index 35ef6327de5fd81f73c63b2092cf79fc6da36745..9439dc78d3ca447029f0ce336d689d6d83c4c6a0 100644 (file)
--- 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 @@ fn emit_option<F>(&mut self, f: F) -> EncodeResult where
     }
     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 @@ pub fn set_indent(&mut self, indent: usize) {
 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 @@ fn emit_option<F>(&mut self, f: F) -> EncodeResult where
     }
     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 @@ fn encode<E: ::Encoder>(&self, e: &mut E) -> Result<(), E::Error> {
             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
index c71f474891131dede6617e443b15b3efd4da1e17..4ce80bc36a080a44ce6b693d283a8f9fe043077e 100644 (file)
--- 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
index 416be50bfe9ea4f52a19ba7e9dbe4cf28721708e..f0b49c3d9bc8faec0db174a40eeafe0f555e8d70 100644 (file)
--- 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 @@ fn decode<D: Decoder>(d: &mut D) -> Result<char, D::Error> {
 
 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
index 2a1cdeadd3ea8e1eba9cc681037b83f07332763b..7243155b1c3da0a980c868a87adebf00e0b33989 160000 (submodule)
--- a/src/llvm
+++ b/src/llvm
@@ -1 +1 @@
-Subproject commit 2a1cdeadd3ea8e1eba9cc681037b83f07332763b
+Subproject commit 7243155b1c3da0a980c868a87adebf00e0b33989

diff --git a/src/stdsimd b/src/stdsimd
index 05c2f61c384e2097a3a4c648344114fc4ac983be..1ea18a5cb431e24aa838b652ac305acc5e394d6b 160000 (submodule)
--- a/src/stdsimd
+++ b/src/stdsimd
@@ -1 +1 @@
-Subproject commit 05c2f61c384e2097a3a4c648344114fc4ac983be
+Subproject commit 1ea18a5cb431e24aa838b652ac305acc5e394d6b

diff --git a/src/tools/cargo b/src/tools/cargo
index 2fb77a49b43bf7266793c07a19a06749e6a8ad5a..af3f1cd29bc872b932a13083e531255aab233a7e 160000 (submodule)
--- 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
index fdd830f52c082b83db0dac3e0066c0cf114050d2..e456241f18227c7eb8d78a45daa66c756a9b65e7 160000 (submodule)
--- 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
index e6f1e15676c26fdc7c4713647fe007b26f361a8e..e0e1bd7ff778e5913b566c9e03224faecc0eb486 160000 (submodule)
--- 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
index 5b5cd9d45719414196e254ec17baa598acc8cd25..1263f1ff25bb329b76f74715ad4a7ec0d1f71430 160000 (submodule)
--- 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
index 27dec6cae3a8132d8a073aad6775425c85095c99..118e078c5badd520d18b92813fd88789c8d341ab 160000 (submodule)
--- 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
index 1c408818c8a752dd584e7858b4afd3ceb011a7da..0f8029f251b569a010cb5cfc5a8bff8bf3c949ac 160000 (submodule)
--- a/src/tools/rustfmt
+++ b/src/tools/rustfmt
@@ -1 +1 @@
-Subproject commit 1c408818c8a752dd584e7858b4afd3ceb011a7da
+Subproject commit 0f8029f251b569a010cb5cfc5a8bff8bf3c949ac