about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2020-03-31 15:59:52 +0200
committerGitHub <noreply@github.com>2020-03-31 15:59:52 +0200
commit976f8d59dddac2ccddbe940953ee6247454e6736 (patch)
tree16273bf92f9580d0c1a3fbb99b10d32c234902b7 /src/libstd
parent4aeeb81db5bc4770e06dbe6f113f92588ccbfccc (diff)
parent08f2904dfaf5e75fbcc1305c8b0aad5fae71a4ff (diff)
downloadrust-976f8d59dddac2ccddbe940953ee6247454e6736.tar.gz
rust-976f8d59dddac2ccddbe940953ee6247454e6736.zip
Rollup merge of #70613 - matthiaskrgr:cl5ppy_squashed, r=Centril
more clippy fixes

* use is_empty() instead of len comparison (clippy::len_zero)
* use if let instead of while let loop that never loops (clippy::never_loop)
* remove redundant returns (clippy::needless_return)
* remove redundant closures (clippy::redundant_closure)
* use if let instead of match and wildcard pattern (clippy::single_match)
* don't repeat field names redundantly (clippy::redundant_field_names)

r? @Centril
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/io/stdio.rs4
-rw-r--r--src/libstd/sys/unix/process/process_unix.rs2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/io/stdio.rs b/src/libstd/io/stdio.rs
index 9a82ae7626d..a064c552c84 100644
--- a/src/libstd/io/stdio.rs
+++ b/src/libstd/io/stdio.rs
@@ -496,7 +496,7 @@ pub fn stdout() -> Stdout {
         unsafe {
             let ret = Arc::new(ReentrantMutex::new(RefCell::new(LineWriter::new(stdout))));
             ret.init();
-            return ret;
+            ret
         }
     }
 }
@@ -664,7 +664,7 @@ pub fn stderr() -> Stderr {
             *INSTANCE.lock().borrow_mut() = Maybe::Real(stderr);
         }
     });
-    return Stderr { inner: &INSTANCE };
+    Stderr { inner: &INSTANCE }
 }
 
 impl Stderr {
diff --git a/src/libstd/sys/unix/process/process_unix.rs b/src/libstd/sys/unix/process/process_unix.rs
index 07d0fbf61fe..f389c60615f 100644
--- a/src/libstd/sys/unix/process/process_unix.rs
+++ b/src/libstd/sys/unix/process/process_unix.rs
@@ -72,7 +72,7 @@ impl Command {
             }
         };
 
-        let mut p = Process { pid: pid, status: None };
+        let mut p = Process { pid, status: None };
         drop(output);
         let mut bytes = [0; 8];