Fix warnings generated by new clippy version.

Author: michaelwoerister

src/cache/cache.rs

@@ -47,6 +47,7 @@ fn get_file_mode(file: &fs::File) -> Result<Option<u32>> {
 }
 
 #[cfg(windows)]
+#[allow(clippy::unnecessary_wraps)]
 fn get_file_mode(_file: &fs::File) -> Result<Option<u32>> {
     Ok(None)
 }
@@ -61,6 +62,7 @@ fn set_file_mode(path: &Path, mode: u32) -> Result<()> {
 }
 
 #[cfg(windows)]
+#[allow(clippy::unnecessary_wraps)]
 fn set_file_mode(_path: &Path, _mode: u32) -> Result<()> {
     Ok(())
 }

src/cache/gcs.rs

@@ -338,6 +338,7 @@ impl GCSCredentialProvider {
         }
     }
 
+    #[allow(clippy::unnecessary_wraps)]
     fn auth_request_jwt(
         &self,
         sa_key: &ServiceAccountKey,

src/commands.rs

@@ -112,6 +112,7 @@ fn run_server_process() -> Result<ServerStartup> {
 }
 
 #[cfg(not(windows))]
+#[allow(clippy::unnecessary_wraps)]
 fn redirect_stderr(f: File) -> Result<()> {
     use libc::dup2;
     use std::os::unix::io::IntoRawFd;
@@ -123,6 +124,7 @@ fn redirect_stderr(f: File) -> Result<()> {
 }
 
 #[cfg(windows)]
+#[allow(clippy::unnecessary_wraps)]
 fn redirect_stderr(f: File) -> Result<()> {
     use std::os::windows::io::IntoRawHandle;
     use winapi::um::processenv::SetStdHandle;

src/compiler/compiler.rs

@@ -1453,7 +1453,7 @@ LLVM version: 6.0",
                 // wait on cache write future so we don't race with it!
                 f.wait().unwrap();
             }
-            _ => assert!(false, "Unexpected compile result: {:?}", cached),
+            _ => panic!("Unexpected compile result: {:?}", cached),
         }
         assert_eq!(exit_status(0), res.status);
         assert_eq!(COMPILER_STDOUT, res.stdout.as_slice());
@@ -1554,7 +1554,7 @@ LLVM version: 6.0",
                 // wait on cache write future so we don't race with it!
                 f.wait().unwrap();
             }
-            _ => assert!(false, "Unexpected compile result: {:?}", cached),
+            _ => panic!("Unexpected compile result: {:?}", cached),
         }
         assert_eq!(exit_status(0), res.status);
         assert_eq!(COMPILER_STDOUT, res.stdout.as_slice());
@@ -1662,7 +1662,7 @@ LLVM version: 6.0",
                 // wait on cache write future so we don't race with it!
                 f.wait().unwrap();
             }
-            _ => assert!(false, "Unexpected compile result: {:?}", cached),
+            _ => panic!("Unexpected compile result: {:?}", cached),
         }
 
         assert_eq!(exit_status(0), res.status);
@@ -1744,7 +1744,7 @@ LLVM version: 6.0",
                 // wait on cache write future so we don't race with it!
                 f.wait().unwrap();
             }
-            _ => assert!(false, "Unexpected compile result: {:?}", cached),
+            _ => panic!("Unexpected compile result: {:?}", cached),
         }
         assert_eq!(exit_status(0), res.status);
         assert_eq!(COMPILER_STDOUT, res.stdout.as_slice());
@@ -1771,7 +1771,7 @@ LLVM version: 6.0",
                 // wait on cache write future so we don't race with it!
                 f.wait().unwrap();
             }
-            _ => assert!(false, "Unexpected compile result: {:?}", cached),
+            _ => panic!("Unexpected compile result: {:?}", cached),
         }
         assert_eq!(exit_status(0), res.status);
         assert_eq!(COMPILER_STDOUT, res.stdout.as_slice());
@@ -1932,7 +1932,7 @@ LLVM version: 6.0",
                     // wait on cache write future so we don't race with it!
                     f.wait().unwrap();
                 }
-                _ => assert!(false, "Unexpected compile result: {:?}", cached),
+                _ => panic!("Unexpected compile result: {:?}", cached),
             }
             assert_eq!(exit_status(0), res.status);
             assert_eq!(COMPILER_STDOUT, res.stdout.as_slice());

src/compiler/rust.rs

@@ -3063,6 +3063,7 @@ c:/foo/bar.rs:
             .key
     }
 
+    #[allow(clippy::unnecessary_wraps)]
     fn nothing(_path: &Path) -> Result<()> {
         Ok(())
     }