Merge pull request #54 from jyn514/clippy

Fix clippy warnings

Author: pietroalbini

examples/docs-builder.rs

@@ -1,4 +1,3 @@
-use env_logger;
 use rustwide::{cmd::SandboxBuilder, Crate, Toolchain, WorkspaceBuilder};
 use std::error::Error;
 use std::path::Path;

src/cmd/mod.rs

@@ -356,7 +356,7 @@ impl<'w, 'pl> Command<'w, 'pl> {
     /// is by default) the output will be also logged. You can disable this behavior by calling the
     /// [`log_output`](struct.Command.html#method.log_output) method.
     pub fn run_capture(self) -> Result<ProcessOutput, CommandError> {
-        Ok(self.run_inner(true)?)
+        self.run_inner(true)
     }
 
     fn run_inner(self, capture: bool) -> Result<ProcessOutput, CommandError> {
@@ -371,8 +371,7 @@ impl<'w, 'pl> Command<'w, 'pl> {
                 }
             };
 
-            let mut cmd = Vec::new();
-            cmd.push(binary.to_string_lossy().as_ref().to_string());
+            let mut cmd = vec![binary.to_string_lossy().as_ref().to_string()];
 
             for arg in self.args {
                 cmd.push(arg.to_string_lossy().to_string());

src/cmd/process_lines_actions.rs

@@ -54,13 +54,13 @@ mod test {
     fn test_replace() {
         let mut actions = ProcessLinesActions::new();
 
-        actions.replace_with_lines("ipsum".split("\n"));
+        actions.replace_with_lines("ipsum".split('\n'));
         assert_eq!(
             actions.take_lines(),
             InnerState::Replaced(vec!["ipsum".to_string()])
         );
 
-        actions.replace_with_lines("lorem ipsum dolor".split(" "));
+        actions.replace_with_lines("lorem ipsum dolor".split(' '));
         assert_eq!(
             actions.take_lines(),
             InnerState::Replaced(vec![

src/lib.rs

@@ -1,5 +1,6 @@
 #![warn(missing_docs)]
 #![allow(clippy::new_without_default)]
+#![allow(clippy::upper_case_acronyms)]
 #![cfg_attr(docs_rs, feature(doc_cfg))]
 
 //! Rustwide is a library to execute your code on the Rust ecosystem, powering projects like

src/native/unix.rs

@@ -25,6 +25,7 @@ pub(crate) fn kill_process(id: u32) -> Result<(), KillFailedError> {
     }
 }
 
+#[allow(clippy::unnecessary_wraps)] // the API is intentionally the same as `windows::current_user`
 pub(crate) fn current_user() -> Option<CurrentUser> {
     Some(CurrentUser {
         user_id: Uid::effective().into(),

src/tools/binary_crates.rs

@@ -44,7 +44,7 @@ impl Tool for BinaryCrate {
             return Ok(false);
         }
 
-        Ok(crate::native::is_executable(path)?)
+        crate::native::is_executable(path)
     }
 
     fn install(&self, workspace: &Workspace, fast_install: bool) -> Result<(), Error> {

src/tools/rustup.rs

@@ -29,7 +29,7 @@ impl Tool for Rustup {
             return Ok(false);
         }
 
-        Ok(crate::native::is_executable(path)?)
+        crate::native::is_executable(path)
     }
 
     fn install(&self, workspace: &Workspace, _fast_install: bool) -> Result<(), Error> {

src/workspace.rs

@@ -317,6 +317,7 @@ impl Workspace {
         Ok(())
     }
 
+    #[allow(clippy::unnecessary_wraps)] // hopefully we could actually catch the error here at some point
     fn update_cratesio_registry(&self) -> Result<(), Error> {
         // This nop cargo command is to update the registry so we don't have to do it for each
         // crate.  using `install` is a temporary solution until

tests/buildtest/mod.rs

@@ -38,7 +38,7 @@ fn test_process_lines() {
                     .process_lines(&mut |line: &str, actions: &mut ProcessLinesActions| {
                         if line.contains("Hello, world again!") {
                             ex = true;
-                            actions.replace_with_lines(line.split(","));
+                            actions.replace_with_lines(line.split(','));
                         } else if line.contains("Hello, world!") {
                             actions.remove_line();
                         }

tests/integration/crates_git.rs

@@ -16,16 +16,15 @@ fn test_fetch() -> Result<(), Error> {
     let cloned_commit = || -> Result<String, Error> {
         let mut dir = workspace.build_dir("integration-crates_git-test_fetch");
         dir.purge()?;
-        Ok(dir
-            .build(&toolchain, &krate, SandboxBuilder::new())
+        dir.build(&toolchain, &krate, SandboxBuilder::new())
             .run(|build| {
                 Ok(Command::new(&workspace, "git")
                     .args(&["rev-parse", "HEAD"])
                     .cd(build.host_source_dir())
                     .run_capture()?
                     .stdout_lines()[0]
                     .to_string())
-            })?)
+            })
     };
 
     // Check if the initial commit was fetched