renamed emit_nil to emit_unit

kenta7777 · Sep 10, 2018 · d02a5ff · d02a5ff
1 parent 2d4e34c
commit d02a5ff
Show file tree

Hide file tree

Showing 19 changed files with 24 additions and 24 deletions.
diff --git a/src/doc/book b/src/doc/book
diff --git a/src/doc/nomicon b/src/doc/nomicon
diff --git a/src/doc/reference b/src/doc/reference
diff --git a/src/doc/rust-by-example b/src/doc/rust-by-example
diff --git a/src/libcompiler_builtins b/src/libcompiler_builtins
diff --git a/src/liblibc b/src/liblibc
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
diff --git a/src/stdsimd b/src/stdsimd
diff --git a/src/tools/cargo b/src/tools/cargo
diff --git a/src/tools/clippy b/src/tools/clippy
diff --git a/src/tools/miri b/src/tools/miri
diff --git a/src/tools/rls b/src/tools/rls
diff --git a/src/tools/rust-installer b/src/tools/rust-installer
diff --git a/src/tools/rustfmt b/src/tools/rustfmt
+2 −0		.travis.yml
+7 −9		CODE_OF_CONDUCT.md
+30 −0		deploy.sh
+2 −5		src/SUMMARY.md
+0 −7		src/compatibility.md
+0 −42		src/compatibility/raw_identifiers.md
+9 −5		src/custom_types/constants.md
+1 −1		src/error/multiple_error_types/reenter_question_mark.md
+1 −0		src/error/multiple_error_types/wrap_error.md
+1 −1		src/flow_control/match/binding.md
+1 −1		src/fn/closures/capture.md
+1 −1		src/hello/print.md
+2 −4		src/index.md
+0 −1		src/macros/designators.md
+3 −19		src/mod/use.md
+2 −3		src/primitives.md
+1 −1		src/primitives/array.md
+1 −1		src/scope/lifetime/elision.md
+1 −1		src/std_misc/arg.md
+2 −10		src/std_misc/channels.md
+2 −1		src/std_misc/fs.md
+2 −1		src/std_misc/process/wait.md
+8 −15		.travis.yml
+90 −70		Cargo.lock
+1 −2		Cargo.toml
+22 −34		README.md
+6 −6		ci/docker/aarch64-unknown-linux-musl/Dockerfile
+6 −6		ci/docker/arm-unknown-linux-musleabihf/Dockerfile
+6 −7		ci/docker/i686-unknown-linux-musl/Dockerfile
+1 −4		ci/docker/sparc64-unknown-linux-gnu/Dockerfile
+6 −6		ci/docker/x86_64-unknown-linux-musl/Dockerfile
+0 −1		ci/ios/deploy_and_run_on_ios_simulator.rs
+1 −1		ci/linux-sparc64.sh
+2 −10		ci/run.sh
+1 −3		ci/style.rs
+1 −2		libc-test/Cargo.toml
+16 −76		libc-test/build.rs
+5 −63		src/dox.rs
+2 −2		src/fuchsia/aarch64.rs
+68 −93		src/fuchsia/mod.rs
+79 −0		src/fuchsia/powerpc64.rs
+27 −31		src/lib.rs
+2 −19		src/macros.rs
+0 −34		src/redox/mod.rs
+0 −14		src/redox/net.rs
+0 −48		src/switch.rs
+0 −6		src/unix/bsd/apple/b32.rs
+1 −5		src/unix/bsd/apple/b64.rs
+12 −46		src/unix/bsd/apple/mod.rs
+0 −24		src/unix/bsd/freebsdlike/dragonfly/mod.rs
+0 −30		src/unix/bsd/freebsdlike/freebsd/mod.rs
+4 −24		src/unix/bsd/freebsdlike/mod.rs
+0 −1		src/unix/bsd/mod.rs
+4 −14		src/unix/bsd/netbsdlike/mod.rs
+0 −3		src/unix/bsd/netbsdlike/netbsd/aarch64.rs
+0 −3		src/unix/bsd/netbsdlike/netbsd/arm.rs
+3 −49		src/unix/bsd/netbsdlike/netbsd/mod.rs
+0 −1		src/unix/bsd/netbsdlike/netbsd/other/b32/mod.rs
+0 −1		src/unix/bsd/netbsdlike/netbsd/other/b64/mod.rs
+14 −0		src/unix/bsd/netbsdlike/netbsd/other/mod.rs
+0 −3		src/unix/bsd/netbsdlike/netbsd/powerpc.rs
+0 −3		src/unix/bsd/netbsdlike/netbsd/x86_64.rs
+0 −2		src/unix/bsd/netbsdlike/openbsdlike/bitrig/mod.rs
+1 −14		src/unix/bsd/netbsdlike/openbsdlike/mod.rs
+0 −206		src/unix/bsd/netbsdlike/openbsdlike/openbsd/mod.rs
+4 −27		src/unix/haiku/mod.rs
+0 −2		src/unix/hermit/aarch64.rs
+0 −736		src/unix/hermit/mod.rs
+0 −2		src/unix/hermit/x86_64.rs
+2 −28		src/unix/mod.rs
+23 −72		src/unix/newlib/mod.rs
+16 −0		src/unix/notbsd/android/b32/mod.rs
+25 −0		src/unix/notbsd/android/b64/mod.rs
+23 −118		src/unix/notbsd/android/mod.rs
+39 −42		src/unix/notbsd/emscripten.rs
+3 −69		src/unix/notbsd/linux/mips/mips32.rs
+0 −68		src/unix/notbsd/linux/mips/mips64.rs
+20 −26		src/unix/notbsd/linux/mips/mod.rs
+88 −280		src/unix/notbsd/linux/mod.rs
+0 −85		src/unix/notbsd/linux/musl/b32/arm.rs
+0 −85		src/unix/notbsd/linux/musl/b32/mips.rs
+15 −9		src/unix/notbsd/linux/musl/b32/mod.rs
+0 −866		src/unix/notbsd/linux/musl/b32/powerpc.rs
+0 −85		src/unix/notbsd/linux/musl/b32/x86.rs
+0 −135		src/unix/notbsd/linux/musl/b64/aarch64.rs
+62 −0		src/unix/notbsd/linux/musl/b64/mod.rs
+12 −143		src/unix/notbsd/linux/musl/b64/powerpc64.rs
+0 −136		src/unix/notbsd/linux/musl/b64/x86_64.rs
+75 −22		src/unix/notbsd/linux/musl/mod.rs
+0 −69		src/unix/notbsd/linux/other/b32/mod.rs
+0 −44		src/unix/notbsd/linux/other/b64/aarch64.rs
+0 −70		src/unix/notbsd/linux/other/b64/not_x32.rs
+0 −68		src/unix/notbsd/linux/other/b64/powerpc64.rs
+0 −78		src/unix/notbsd/linux/other/b64/sparc64.rs
+0 −43		src/unix/notbsd/linux/other/b64/x32.rs
+0 −4		src/unix/notbsd/linux/other/b64/x86_64.rs
+20 −47		src/unix/notbsd/linux/other/mod.rs
+0 −47		src/unix/notbsd/linux/s390x.rs
+2 −200		src/unix/notbsd/mod.rs
+3 −7		src/unix/solaris/mod.rs
+2 −372		src/unix/uclibc/mips/mips32.rs
+0 −5		src/unix/uclibc/mips/mips64.rs
+25 −77		src/unix/uclibc/mod.rs
+11 −67		src/unix/uclibc/x86_64/mod.rs
-Original file line number
+Diff line change
@@ Expand Up @@
     {
         type Error = E::Error;
-        fn emit_nil(&mut self) -> Result<(), Self::Error> {
+        fn emit_unit(&mut self) -> Result<(), Self::Error> {
             Ok(())
         }
@@ Expand Down @@