Merge remote-tracking branch 'upstream/master' into patch-in-config

Author: Jon Gjengset

crates/cargo-test-support/src/lib.rs

@@ -1582,6 +1582,24 @@ fn _process(t: &OsStr) -> cargo::util::ProcessBuilder {
             p.env_remove(&k);
         }
     }
+    if env::var_os("RUSTUP_TOOLCHAIN").is_some() {
+        // Override the PATH to avoid executing the rustup wrapper thousands
+        // of times. This makes the testsuite run substantially faster.
+        let path = env::var_os("PATH").unwrap_or_default();
+        let paths = env::split_paths(&path);
+        let mut outer_cargo = PathBuf::from(env::var_os("CARGO").unwrap());
+        outer_cargo.pop();
+        let new_path = env::join_paths(std::iter::once(outer_cargo).chain(paths)).unwrap();
+        p.env("PATH", new_path);
+    }
+
+    if cfg!(target_os = "macos") {
+        // This makes the test suite run substantially faster.
+        p.env("CARGO_PROFILE_DEV_SPLIT_DEBUGINFO", "unpacked")
+            .env("CARGO_PROFILE_TEST_SPLIT_DEBUGINFO", "unpacked")
+            .env("CARGO_PROFILE_RELEASE_SPLIT_DEBUGINFO", "unpacked")
+            .env("CARGO_PROFILE_BENCH_SPLIT_DEBUGINFO", "unpacked");
+    }
 
     p.cwd(&paths::root())
         .env("HOME", paths::home())

crates/crates-io/lib.rs

@@ -155,13 +155,13 @@ impl fmt::Display for ResponseError {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self {
             ResponseError::Curl(e) => write!(f, "{}", e),
-            ResponseError::Api { code, errors } => write!(
-                f,
-                "api errors (status {} {}): {}",
-                code,
-                reason(*code),
-                errors.join(", ")
-            ),
+            ResponseError::Api { code, errors } => {
+                f.write_str("the remote server responded with an error")?;
+                if *code != 200 {
+                    write!(f, " (status {} {})", code, reason(*code))?;
+                };
+                write!(f, ": {}", errors.join(", "))
+            }
             ResponseError::Code {
                 code,
                 headers,

crates/resolver-tests/tests/resolve.rs

@@ -1,5 +1,5 @@
 use cargo::core::dependency::DepKind;
-use cargo::core::{enable_nightly_features, Dependency};
+use cargo::core::Dependency;
 use cargo::util::{is_ci, Config};
 
 use resolver_tests::{
@@ -55,9 +55,8 @@ proptest! {
     fn prop_minimum_version_errors_the_same(
             PrettyPrintRegistry(input) in registry_strategy(50, 20, 60)
     ) {
-        enable_nightly_features();
-
         let mut config = Config::default().unwrap();
+        config.nightly_features_allowed = true;
         config
             .configure(
                 1,
@@ -553,11 +552,6 @@ fn test_resolving_maximum_version_with_transitive_deps() {
 
 #[test]
 fn test_resolving_minimum_version_with_transitive_deps() {
-    enable_nightly_features(); // -Z minimal-versions
-                               // When the minimal-versions config option is specified then the lowest
-                               // possible version of a package should be selected. "util 1.0.0" can't be
-                               // selected because of the requirements of "bar", so the minimum version
-                               // must be 1.1.1.
     let reg = registry(vec![
         pkg!(("util", "1.2.2")),
         pkg!(("util", "1.0.0")),
@@ -567,6 +561,12 @@ fn test_resolving_minimum_version_with_transitive_deps() {
     ]);
 
     let mut config = Config::default().unwrap();
+    // -Z minimal-versions
+    // When the minimal-versions config option is specified then the lowest
+    // possible version of a package should be selected. "util 1.0.0" can't be
+    // selected because of the requirements of "bar", so the minimum version
+    // must be 1.1.1.
+    config.nightly_features_allowed = true;
     config
         .configure(
             1,

src/bin/cargo/cli.rs

@@ -48,7 +48,7 @@ Available unstable (nightly-only) flags:
 
 Run with 'cargo -Z [FLAG] [SUBCOMMAND]'"
         );
-        if !features::nightly_features_allowed() {
+        if !config.nightly_features_allowed {
             drop_println!(
                 config,
                 "\nUnstable flags are only available on the nightly channel \

src/bin/cargo/commands/install.rs

@@ -117,7 +117,7 @@ pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
     let version = args.value_of("version");
     let root = args.value_of("root");
 
-    // We only provide worksapce information for local crate installation from
+    // We only provide workspace information for local crate installation from
     // one of the following sources:
     // - From current working directory (only work for edition 2015).
     // - From a specific local file path.

src/bin/cargo/commands/locate_project.rs

@@ -51,7 +51,7 @@ pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
     let location = ProjectLocation { root };
 
     match MessageFormat::parse(args)? {
-        MessageFormat::Json => config.shell().print_json(&location),
+        MessageFormat::Json => config.shell().print_json(&location)?,
         MessageFormat::Plain => drop_println!(config, "{}", location.root),
     }
 

src/bin/cargo/commands/logout.rs

@@ -16,7 +16,7 @@ pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
     if !(unstable.credential_process || unstable.unstable_options) {
         const SEE: &str = "See https://github.com/rust-lang/cargo/issues/8933 for more \
         information about the `cargo logout` command.";
-        if features::nightly_features_allowed() {
+        if config.nightly_features_allowed {
             return Err(format_err!(
                 "the `cargo logout` command is unstable, pass `-Z unstable-options` to enable it\n\
                 {}",

src/bin/cargo/commands/metadata.rs

@@ -53,6 +53,6 @@ pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
     };
 
     let result = ops::output_metadata(&ws, &options)?;
-    config.shell().print_json(&result);
+    config.shell().print_json(&result)?;
     Ok(())
 }

src/bin/cargo/commands/read_manifest.rs

@@ -15,6 +15,8 @@ Deprecated, use `cargo metadata --no-deps` instead.\
 
 pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
     let ws = args.workspace(config)?;
-    config.shell().print_json(&ws.current()?.serialized(config));
+    config
+        .shell()
+        .print_json(&ws.current()?.serialized(config))?;
     Ok(())
 }

src/bin/cargo/commands/verify_project.rs

@@ -15,12 +15,12 @@ pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
     if let Err(e) = args.workspace(config) {
         let mut h = HashMap::new();
         h.insert("invalid".to_string(), e.to_string());
-        config.shell().print_json(&h);
+        config.shell().print_json(&h)?;
         process::exit(1)
     }
 
     let mut h = HashMap::new();
     h.insert("success".to_string(), "true".to_string());
-    config.shell().print_json(&h);
+    config.shell().print_json(&h)?;
     Ok(())
 }