Last adjustments for the PR

Author: xFrednet

cargo-marker/src/driver.rs

@@ -99,7 +99,16 @@ fn build_driver(toolchain: &str, version: &str, verbose: bool, dev_build: bool)
     if dev_build {
         cmd.args(["build", "--bin", "marker_driver_rustc"]);
     } else {
-        // TODO Set output path to the local branch thingy
+        // FIXME: This currently installs the binary in Cargo's default location.
+        // Ideally this should install the driver in the toolchain folder for the
+        // installed nightly version. This would allow the user to have multiple
+        // drivers depending on the project toolchain.
+        //
+        // We can just reuse rustup to select the correct driver for a defined
+        // toolchain. This would also simulate how the driver would be delivered
+        // in a perfect world.
+        //
+        // See #60
         cmd.args(["install", "marker_rustc_driver", "--version", version]);
     }
 

cargo-marker/src/main.rs

@@ -9,7 +9,7 @@ mod lints;
 use std::{
     ffi::{OsStr, OsString},
     fs::create_dir_all,
-    io::{self, Write},
+    io,
     path::{Path, PathBuf},
     process::exit,
 };
@@ -138,6 +138,7 @@ fn print_version(verbose: bool) {
     }
 }
 
+#[allow(clippy::unnecessary_wraps)]
 fn print_env(env: Vec<(OsString, OsString)>) -> io::Result<()> {
     // Operating systems are fun... So, this function prints out the environment
     // values to the standard output. For Unix systems, this requires `OsStr`
@@ -151,6 +152,7 @@ fn print_env(env: Vec<(OsString, OsString)>) -> io::Result<()> {
 
     #[cfg(any(target_os = "linux", target_os = "macos"))]
     {
+        use std::io::Write;
         use std::os::unix::prelude::OsStrExt;
 
         // stdout is used directly, to print the `OsString`s without requiring
@@ -164,7 +166,7 @@ fn print_env(env: Vec<(OsString, OsString)>) -> io::Result<()> {
             writeln!(lock)?;
         }
 
-        return Ok(());
+        Ok(())
     }
 
     #[cfg(target_os = "windows")]
@@ -177,6 +179,6 @@ fn print_env(env: Vec<(OsString, OsString)>) -> io::Result<()> {
             }
         }
 
-        return Ok(());
+        Ok(())
     }
 }