Merge pull request #98 from chrissimpkins/cargo-default

Convert to default installation of cargo and replace `--with-cargo` option with `--without-cargo` option

Author: spastorino

src/main.rs

@@ -93,12 +93,6 @@ struct Opts {
     )]
     preserve_target: bool,
 
-    #[structopt(
-        long = "with-cargo",
-        help = "Download cargo [default: installed cargo]"
-    )]
-    with_cargo: bool,
-
     #[structopt(long = "with-src", help = "Download rust-src [default: no download]")]
     with_src: bool,
 
@@ -157,6 +151,12 @@ struct Opts {
         parse(from_os_str)
     )]
     script: Option<PathBuf>,
+
+    #[structopt(
+        long = "without-cargo",
+        help = "Do not install cargo [default: install cargo]"
+    )]
+    without_cargo: bool,
 }
 
 pub type GitDate = Date<Utc>;

src/toolchains.rs

@@ -231,7 +231,11 @@ impl Toolchain {
             .map_err(InstallError::Download)?;
         }
 
-        if dl_params.install_cargo {
+        // download cargo by default
+        // deactivate with the `--without-cargo` flag
+        // this default behavior was changed as of v0.6.0
+        // see: https://github.com/rust-lang/cargo-bisect-rustc/issues/81
+        if !dl_params.without_cargo {
             let filename = format!("cargo-nightly-{}", self.host);
             download_tarball(
                 &client,
@@ -407,8 +411,8 @@ pub(crate) struct DownloadParams {
     url_prefix: String,
     tmp_dir: PathBuf,
     install_dir: PathBuf,
-    install_cargo: bool,
     install_src: bool,
+    without_cargo: bool,
     force_install: bool,
 }
 
@@ -432,8 +436,8 @@ impl DownloadParams {
             url_prefix,
             tmp_dir: cfg.rustup_tmp_path.clone(),
             install_dir: cfg.toolchains_path.clone(),
-            install_cargo: cfg.args.with_cargo,
             install_src: cfg.args.with_src,
+            without_cargo: cfg.args.without_cargo,
             force_install: cfg.args.force_install,
         }
     }