Merge remote-tracking branch 'origin/master' into job-fix

Author: Seeker14491

ARCHITECTURE.md

@@ -93,13 +93,13 @@ call to `execs()`:
 // Before
 assert_that(
     p.cargo("run"),
-    execs().with_status(0)
+    execs()
 );
 
 // After
 assert_that(
     p.cargo("run"),
-    execs().stream().with_status(0)
+    execs().stream()
 );
 ```
 

CONTRIBUTING.md

@@ -96,8 +96,8 @@ ignore the cross-compile test failures or disable them by
 using `CFG_DISABLE_CROSS_TESTS=1 cargo test`. Note that some tests are enabled
 only on `nightly` toolchain. If you can, test both toolchains.
 * All code changes are expected to comply with the formatting suggested by `rustfmt`.
-You can use `rustup +stable component add rustfmt-preview` to install `rustfmt` and use
-`rustfmt +stable --skip-children $FILE` on the changed files to automatically format your code.
+You can use `rustup component add --toolchain nightly rustfmt-preview` to install `rustfmt` and use
+`rustfmt +nightly --unstable-features --skip-children` on the changed files to automatically format your code.
 * Push your commits to GitHub and create a pull request against Cargo's
 `master` branch.
 

Cargo.toml

@@ -23,11 +23,11 @@ crossbeam-utils = "0.5"
 crypto-hash = "0.3.1"
 curl = "0.4.13"
 env_logger = "0.5.4"
-failure = "0.1.1"
+failure = "0.1.2"
 filetime = "0.2"
 flate2 = "1.0"
 fs2 = "0.4"
-git2 = "0.7.3"
+git2 = "0.7.5"
 git2-curl = "0.8.1"
 glob = "0.2.11"
 hex = "0.3"
@@ -40,7 +40,7 @@ libc = "0.2"
 log = "0.4"
 libgit2-sys = "0.7.5"
 num_cpus = "1.0"
-rustfix = "0.4"
+rustfix = "0.4.2"
 same-file = "1"
 semver = { version = "0.9.0", features = ["serde"] }
 serde = "1.0"
@@ -55,16 +55,19 @@ toml = "0.4.2"
 url = "1.1"
 clap = "2.31.2"
 unicode-width = "0.1.5"
+openssl = { version = '0.10.11', optional = true }
 
-# Not actually needed right now but required to make sure that rls/cargo build
-# with the same set of features in rust-lang/rust
-num-traits = "0.2" # enable the default feature
+# A noop dependency that changes in the Rust repository, it's a bit of a hack.
+# See the `src/tools/rustc-workspace-hack/README.md` file in `rust-lang/rust`
+# for more information.
+rustc-workspace-hack = "1.0.0"
 
 [target.'cfg(target_os = "macos")'.dependencies]
 core-foundation = { version = "0.6.0", features = ["mac_os_10_7_support"] }
 
 [target.'cfg(windows)'.dependencies]
 miow = "0.3.1"
+fwdansi = "1"
 
 [target.'cfg(windows)'.dependencies.winapi]
 version = "0.3"
@@ -94,3 +97,6 @@ bufstream = "0.1"
 name = "cargo"
 test = false
 doc = false
+
+[features]
+vendored-openssl = ['openssl/vendored']

src/bin/cargo/command_prelude.rs

@@ -127,7 +127,7 @@ pub trait AppExt: Sized {
             opt("message-format", "Error format")
                 .value_name("FMT")
                 .case_insensitive(true)
-                .possible_values(&["human", "json"])
+                .possible_values(&["human", "json", "short"])
                 .default_value("human"),
         )
     }
@@ -270,6 +270,8 @@ pub trait ArgMatchesExt {
                     MessageFormat::Json
                 } else if f.eq_ignore_ascii_case("human") {
                     MessageFormat::Human
+                } else if f.eq_ignore_ascii_case("short") {
+                    MessageFormat::Short
                 } else {
                     panic!("Impossible message format: {:?}", f)
                 }

src/bin/cargo/commands/fix.rs

@@ -1,6 +1,6 @@
 use command_prelude::*;
 
-use cargo::ops;
+use cargo::ops::{self, CompileFilter, FilterRule};
 
 pub fn cli() -> App {
     subcommand("fix")
@@ -37,10 +37,24 @@ pub fn cli() -> App {
         )
         .arg(
             Arg::with_name("edition")
+                .long("edition")
+                .help("Fix in preparation for the next edition"),
+        )
+        .arg(
+            // This is a deprecated argument, we'll want to phase it out
+            // eventually.
+            Arg::with_name("prepare-for")
                 .long("prepare-for")
                 .help("Fix warnings in preparation of an edition upgrade")
                 .takes_value(true)
-                .possible_values(&["2018"]),
+                .possible_values(&["2018"])
+                .conflicts_with("edition")
+                .hidden(true),
+        )
+        .arg(
+            Arg::with_name("idioms")
+                .long("edition-idioms")
+                .help("Fix warnings to migrate to the idioms of an edition")
         )
         .arg(
             Arg::with_name("allow-no-vcs")
@@ -67,22 +81,16 @@ remaining warnings will be displayed when the check process is finished. For
 example if you'd like to prepare for the 2018 edition, you can do so by
 executing:
 
-    cargo fix --prepare-for 2018
-
-Note that this is not guaranteed to fix all your code as it only fixes code that
-`cargo check` would otherwise compile. For example unit tests are left out
-from this command, but they can be checked with:
-
-    cargo fix --prepare-for 2018 --all-targets
+    cargo fix --edition
 
 which behaves the same as `cargo check --all-targets`. Similarly if you'd like
 to fix code for different platforms you can do:
 
-    cargo fix --prepare-for 2018 --target x86_64-pc-windows-gnu
+    cargo fix --edition --target x86_64-pc-windows-gnu
 
 or if your crate has optional features:
 
-    cargo fix --prepare-for 2018 --no-default-features --features foo
+    cargo fix --edition --no-default-features --features foo
 
 If you encounter any problems with `cargo fix` or otherwise have any questions
 or feature requests please don't hesitate to file an issue at
@@ -106,9 +114,25 @@ pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult {
         }
     };
     let mode = CompileMode::Check { test };
+
+    // Unlike other commands default `cargo fix` to all targets to fix as much
+    // code as we can.
+    let mut opts = args.compile_options(config, mode)?;
+    if let CompileFilter::Default { .. } = opts.filter {
+        opts.filter = CompileFilter::Only {
+            all_targets: true,
+            lib: true,
+            bins: FilterRule::All,
+            examples: FilterRule::All,
+            benches: FilterRule::All,
+            tests: FilterRule::All,
+        }
+    }
     ops::fix(&ws, &mut ops::FixOptions {
-        edition: args.value_of("edition"),
-        compile_opts: args.compile_options(config, mode)?,
+        edition: args.is_present("edition"),
+        prepare_for: args.value_of("prepare-for"),
+        idioms: args.is_present("idioms"),
+        compile_opts: opts,
         allow_dirty: args.is_present("allow-dirty"),
         allow_no_vcs: args.is_present("allow-no-vcs"),
         broken_code: args.is_present("broken-code"),

src/bin/cargo/commands/locate_project.rs

@@ -9,8 +9,8 @@ pub fn cli() -> App {
 }
 
 #[derive(Serialize)]
-pub struct ProjectLocation {
-    root: String,
+pub struct ProjectLocation<'a> {
+    root: &'a str,
 }
 
 pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult {
@@ -23,8 +23,7 @@ pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult {
                  not representable in Unicode"
             )
         })
-        .map_err(|e| CliError::new(e, 1))?
-        .to_string();
+        .map_err(|e| CliError::new(e, 1))?;
 
     let location = ProjectLocation { root };
 

src/bin/cargo/commands/run.rs

@@ -38,14 +38,18 @@ run. If you're passing arguments to both Cargo and the binary, the ones after
 pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult {
     let ws = args.workspace(config)?;
 
-    let mut compile_opts = args.compile_options_for_single_package(config, CompileMode::Build)?;
+    let mut compile_opts = args.compile_options(config, CompileMode::Build)?;
     if !args.is_present("example") && !args.is_present("bin") {
-        if let Some(default_run) = compile_opts.get_package(&ws)?
-            .and_then(|pkg| pkg.manifest().default_run())
-        {
+        let default_runs: Vec<_> = compile_opts
+            .spec
+            .get_packages(&ws)?
+            .iter()
+            .filter_map(|pkg| pkg.manifest().default_run())
+            .collect();
+        if default_runs.len() == 1 {
             compile_opts.filter = CompileFilter::new(
                 false,
-                vec![default_run.to_owned()],
+                vec![default_runs[0].to_owned()],
                 false,
                 vec![],
                 false,
@@ -56,7 +60,11 @@ pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult {
                 false,
             );
         } else {
+            // ops::run will take care of errors if len pkgs != 1.
             compile_opts.filter = CompileFilter::Default {
+                // Force this to false because the code in ops::run is not
+                // able to pre-check features before compilation starts to
+                // enforce that only 1 binary is built.
                 required_features_filterable: false,
             };
         }

src/bin/cargo/commands/test.rs

@@ -21,8 +21,8 @@ pub fn cli() -> App {
             "Test only this package's library",
             "Test only the specified binary",
             "Test all binaries",
-            "Check that the specified examples compile",
-            "Check that all examples compile",
+            "Test only the specified example",
+            "Test all examples",
             "Test only the specified test target",
             "Test all tests",
             "Test only the specified bench target",

src/bin/cargo/commands/uninstall.rs

@@ -6,6 +6,7 @@ pub fn cli() -> App {
     subcommand("uninstall")
         .about("Remove a Rust binary")
         .arg(Arg::with_name("spec").multiple(true))
+        .arg_package_spec_simple("Package to uninstall")
         .arg(multi_opt("bin", "NAME", "Only uninstall the binary NAME"))
         .arg(opt("root", "Directory to uninstall packages from").value_name("DIR"))
         .after_help(
@@ -20,7 +21,10 @@ only uninstall particular binaries.
 
 pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult {
     let root = args.value_of("root");
-    let specs = args.values_of("spec").unwrap_or_default().collect();
+    let specs = args
+        .values_of("spec")
+        .unwrap_or_else(|| args.values_of("package").unwrap_or_default())
+        .collect();
     ops::uninstall(root, specs, &values(args, "bin"), config)?;
     Ok(())
 }

src/bin/cargo/main.rs

@@ -1,5 +1,5 @@
-// we have lots of arguments, cleaning this up would be a large project
-#![cfg_attr(feature = "cargo-clippy", allow(too_many_arguments))]
+#![cfg_attr(feature = "cargo-clippy", allow(too_many_arguments))] // large project
+#![cfg_attr(feature = "cargo-clippy", allow(redundant_closure))]  // there's a false positive
 
 extern crate cargo;
 extern crate clap;
@@ -135,7 +135,6 @@ fn find_closest(config: &Config, cmd: &str) -> Option<String> {
 
 fn execute_external_subcommand(config: &Config, cmd: &str, args: &[&str]) -> CliResult {
     let command_exe = format!("cargo-{}{}", cmd, env::consts::EXE_SUFFIX);
-    #[cfg_attr(feature = "cargo-clippy", allow(redundant_closure))] // false positive
     let path = search_directories(config)
         .iter()
         .map(|dir| dir.join(&command_exe))