Merge branch 'master' into trywithout

Author: illicitonion

CHANGELOG.md

@@ -1,12 +1,64 @@
 # Changelog
 
+## Cargo 1.45 (2020-07-16)
+[ebda5065e...HEAD](https://github.com/rust-lang/cargo/compare/ebda5065e...HEAD)
+
+### Added
+
+### Changed
+- Changed official documentation to recommend `.cargo/config.toml` filenames
+  (with the `.toml` extension). `.toml` extension support was added in 1.39.
+  [#8121](https://github.com/rust-lang/cargo/pull/8121)
+- The `registry.index` config value is no longer allowed (it has been
+  deprecated for 4 years).
+  [#7973](https://github.com/rust-lang/cargo/pull/7973)
+- An error is generated if both `--index` and `--registry` are passed
+  (previously `--index` was silently ignored).
+  [#7973](https://github.com/rust-lang/cargo/pull/7973)
+- The `registry.token` config value is no longer used with the `--index` flag.
+  This is intended to avoid potentially leaking the crates.io token to another
+  registry.
+  [#7973](https://github.com/rust-lang/cargo/pull/7973)
+- Added a warning if `registry.token` is used with source replacement. It is
+  intended this will be an error in future versions.
+  [#7973](https://github.com/rust-lang/cargo/pull/7973)
+- Windows GNU targets now copy `.dll.a` import library files for DLL crate
+  types to the output directory.
+  [#8141](https://github.com/rust-lang/cargo/pull/8141)
+- Dylibs for all dependencies are now unconditionally copied to the output
+  directory. Some obscure scenarios can cause an old dylib to be referenced
+  between builds, and this ensures that all the latest copies are used.
+  [#8139](https://github.com/rust-lang/cargo/pull/8139)
+
+### Fixed
+- Fixed copying Windows `.pdb` files to the output directory when the filename
+  contained dashes.
+  [#8123](https://github.com/rust-lang/cargo/pull/8123)
+
+### Nightly only
+- Fixed passing the full path for `--target` to `rustdoc` when using JSON spec
+  targets.
+  [#8094](https://github.com/rust-lang/cargo/pull/8094)
+- `-Cembed-bitcode=no` renamed to `-Cbitcode-in-rlib=no`
+  [#8134](https://github.com/rust-lang/cargo/pull/8134)
+- Added new `resolver` field to `Cargo.toml` to opt-in to the new feature
+  resolver.
+  [#8129](https://github.com/rust-lang/cargo/pull/8129)
+
 ## Cargo 1.44 (2020-06-04)
-[bda50510...HEAD](https://github.com/rust-lang/cargo/compare/bda50510...HEAD)
+[bda50510...ebda5065e](https://github.com/rust-lang/cargo/compare/bda50510...ebda5065e)
 
 ### Added
+- 🔥 Added the `cargo tree` command.
+  [docs](https://doc.rust-lang.org/nightly/cargo/commands/cargo-tree.html)
+  [#8062](https://github.com/rust-lang/cargo/pull/8062)
 - Added warnings if a package has Windows-restricted filenames (like `nul`,
   `con`, `aux`, `prn`, etc.).
   [#7959](https://github.com/rust-lang/cargo/pull/7959)
+- Added a `"build-finished"` JSON message when compilation is complete so that
+  tools can detect when they can stop listening for JSON messages with
+  commands like `cargo run` or `cargo test`.
+  [#8069](https://github.com/rust-lang/cargo/pull/8069)
 
 ### Changed
 - Valid package names are now restricted to Unicode XID identifiers. This is
@@ -19,22 +71,79 @@
   [#7959](https://github.com/rust-lang/cargo/pull/7959)
 - Tests are no longer hard-linked into the output directory (`target/debug/`).
   This ensures tools will have access to debug symbols and execute tests in
-  the same was as Cargo. Tools should use JSON messages to discover the path
+  the same way as Cargo. Tools should use JSON messages to discover the path
   to the executable.
   [#7965](https://github.com/rust-lang/cargo/pull/7965)
 - Updating git submodules now displays an "Updating" message for each
   submodule.
   [#7989](https://github.com/rust-lang/cargo/pull/7989)
+- File modification times are now preserved when extracting a `.crate` file.
+  This reverses the change made in 1.40 where the mtime was not preserved.
+  [#7935](https://github.com/rust-lang/cargo/pull/7935)
+- Build script warnings are now displayed separately when the build script
+  fails.
+  [#8017](https://github.com/rust-lang/cargo/pull/8017)
+- Removed the `git-checkout` subcommand.
+  [#8040](https://github.com/rust-lang/cargo/pull/8040)
+- The progress bar is now enabled for all unix platforms. Previously it was
+  only Linux, macOS, and FreeBSD.
+  [#8054](https://github.com/rust-lang/cargo/pull/8054)
+- Artifacts generated by pre-release versions of `rustc` now share the same
+  filenames. This means that changing nightly versions will not leave stale
+  files in the build directory.
+  [#8073](https://github.com/rust-lang/cargo/pull/8073)
+- Invalid package names are rejected when using renamed dependencies.
+  [#8090](https://github.com/rust-lang/cargo/pull/8090)
+- Added a certain class of HTTP2 errors as "spurious" that will get retried.
+  [#8102](https://github.com/rust-lang/cargo/pull/8102)
 
 ### Fixed
 - Cargo no longer buffers excessive amounts of compiler output in memory.
   [#7838](https://github.com/rust-lang/cargo/pull/7838)
 - Symbolic links in git repositories now work on Windows.
   [#7996](https://github.com/rust-lang/cargo/pull/7996)
+- Fixed an issue where `profile.dev` was not loaded from a config file with
+  `cargo test` when the `dev` profile was not defined in `Cargo.toml`.
+  [#8012](https://github.com/rust-lang/cargo/pull/8012)
+- When a binary is built as an implicit dependency of an integration test,
+  it now checks `dep_name/feature_name` syntax in `required-features` correctly.
+  [#8020](https://github.com/rust-lang/cargo/pull/8020)
+- Fixed an issue where Cargo would not detect that an executable (such as an
+  integration test) needs to be rebuilt when the previous build was
+  interrupted with Ctrl-C.
+  [#8087](https://github.com/rust-lang/cargo/pull/8087)
+- Protect against some (unknown) situations where Cargo could panic when the
+  system monotonic clock doesn't appear to be monotonic.
+  [#8114](https://github.com/rust-lang/cargo/pull/8114)
 
 ### Nightly only
 - Fixed panic with new feature resolver and required-features.
   [#7962](https://github.com/rust-lang/cargo/pull/7962)
+- Added `RUSTC_WORKSPACE_WRAPPER` environment variable, which provides a way
+  to wrap `rustc` for workspace members only, and affects the filename hash so
+  that artifacts produced by the wrapper are cached separately. This usage can
+  be seen on nightly clippy with `cargo clippy -Zunstable-options`.
+  [#7533](https://github.com/rust-lang/cargo/pull/7533)
+- Added `--unit-graph` CLI option to display Cargo's internal dependency graph
+  as JSON.
+  [#7977](https://github.com/rust-lang/cargo/pull/7977)
+- Changed `-Zbuild_dep` to `-Zhost_dep`, and added proc-macros to the feature
+  decoupling logic.
+  [#8003](https://github.com/rust-lang/cargo/pull/8003)
+  [#8028](https://github.com/rust-lang/cargo/pull/8028)
+- Fixed so that `--crate-version` is not automatically passed when the flag
+  is found in `RUSTDOCFLAGS`.
+  [#8014](https://github.com/rust-lang/cargo/pull/8014)
+- Fixed panic with `-Zfeatures=dev_dep` and `check --profile=test`.
+  [#8027](https://github.com/rust-lang/cargo/pull/8027)
+- Fixed panic with `-Zfeatures=itarget` with certain host dependencies.
+  [#8048](https://github.com/rust-lang/cargo/pull/8048)
+- Added support for `-Cembed-bitcode=no`, which provides a performance boost
+  and disk-space usage reduction for non-LTO builds.
+  [#8066](https://github.com/rust-lang/cargo/pull/8066)
+- `-Zpackage-features` has been extended with several changes intended to make
+  it easier to select features on the command-line in a workspace.
+  [#8074](https://github.com/rust-lang/cargo/pull/8074)
 
 ## Cargo 1.43 (2020-04-23)
 [9d32b7b0...rust-1.43.0](https://github.com/rust-lang/cargo/compare/9d32b7b0...rust-1.43.0)

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cargo"
-version = "0.45.0"
+version = "0.46.0"
 edition = "2018"
 authors = ["Yehuda Katz <wycats@gmail.com>",
            "Carl Lerche <me@carllerche.com>",
@@ -32,7 +32,7 @@ pretty_env_logger = { version = "0.4", optional = true }
 anyhow = "1.0"
 filetime = "0.2.9"
 flate2 = { version = "1.0.3", default-features = false, features = ["zlib"] }
-git2 = "0.13.1"
+git2 = "0.13.5"
 git2-curl = "0.14.0"
 glob = "0.3.0"
 hex = "0.4"
@@ -44,7 +44,7 @@ jobserver = "0.1.21"
 lazycell = "1.2.0"
 libc = "0.2"
 log = "0.4.6"
-libgit2-sys = "0.12.1"
+libgit2-sys = "0.12.5"
 memchr = "2.1.3"
 num_cpus = "1.0"
 opener = "0.4"

azure-pipelines.yml

@@ -41,6 +41,9 @@ jobs:
       x86_64-msvc:
         TOOLCHAIN: stable-x86_64-pc-windows-msvc
         OTHER_TARGET: i686-pc-windows-msvc
+      x86_64-gnu:
+        TOOLCHAIN: nightly-x86_64-pc-windows-gnu
+        OTHER_TARGET: i686-pc-windows-gnu
 
 - job: rustfmt
   pool:

ci/azure-install-rust.yml

@@ -4,7 +4,7 @@ steps:
       rustup set profile minimal
       rustup component remove --toolchain=$TOOLCHAIN rust-docs || echo "already removed"
       rustup update --no-self-update $TOOLCHAIN
-      if [ "$TOOLCHAIN" = "nightly" ]; then
+      if [[ "$TOOLCHAIN" == "nightly"* ]]; then
         rustup component add --toolchain=$TOOLCHAIN rustc-dev
       fi
       rustup default $TOOLCHAIN

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

@@ -190,6 +190,8 @@ pub fn alternate() -> &'static str {
         "i686-unknown-linux-gnu"
     } else if cfg!(all(target_os = "windows", target_env = "msvc")) {
         "i686-pc-windows-msvc"
+    } else if cfg!(all(target_os = "windows", target_env = "gnu")) {
+        "i686-pc-windows-gnu"
     } else {
         panic!("This test should be gated on cross_compile::disabled.");
     }

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

@@ -117,7 +117,6 @@ use std::path::{Path, PathBuf};
 use std::process::{Command, Output};
 use std::str;
 use std::time::{self, Duration};
-use std::usize;
 
 use cargo::util::{is_ci, CargoResult, ProcessBuilder, ProcessError, Rustc};
 use serde_json::{self, Value};
@@ -1723,6 +1722,7 @@ fn _process(t: &OsStr) -> cargo::util::ProcessBuilder {
         .env_remove("RUSTDOC")
         .env_remove("RUSTC_WRAPPER")
         .env_remove("RUSTFLAGS")
+        .env_remove("RUSTDOCFLAGS")
         .env_remove("XDG_CONFIG_HOME") // see #2345
         .env("GIT_CONFIG_NOSYSTEM", "1") // keep trying to sandbox ourselves
         .env_remove("EMAIL")

crates/resolver-tests/tests/resolve.rs

@@ -25,7 +25,7 @@ proptest! {
                 0
             } else {
                 // but that local builds will give a small clear test case.
-                std::u32::MAX
+                u32::MAX
             },
         result_cache: prop::test_runner::basic_result_cache,
         .. ProptestConfig::default()

src/bin/cargo/commands/clean.rs

@@ -28,7 +28,7 @@ pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
     let opts = CleanOptions {
         config,
         spec: values(args, "package"),
-        target: args.target(),
+        targets: args.targets(),
         requested_profile: args.get_profile_name(config, "dev", ProfileChecking::Checked)?,
         profile_specified: args.is_present("profile") || args.is_present("release"),
         doc: args.is_present("doc"),

src/bin/cargo/commands/fetch.rs

@@ -28,7 +28,7 @@ pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
 
     let opts = FetchOptions {
         config,
-        target: args.target(),
+        targets: args.targets(),
     };
     let _ = ops::fetch(&ws, &opts)?;
     Ok(())

src/bin/cargo/commands/metadata.rs

@@ -12,13 +12,11 @@ pub fn cli() -> App {
         )
         .arg(opt("quiet", "No output printed to stdout").short("q"))
         .arg_features()
-        .arg(
-            opt(
-                "filter-platform",
-                "Only include resolve dependencies matching the given target-triple",
-            )
-            .value_name("TRIPLE"),
-        )
+        .arg(multi_opt(
+            "filter-platform",
+            "TRIPLE",
+            "Only include resolve dependencies matching the given target-triple",
+        ))
         .arg(opt(
             "no-deps",
             "Output information only about the workspace members \
@@ -51,7 +49,7 @@ pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
         all_features: args.is_present("all-features"),
         no_default_features: args.is_present("no-default-features"),
         no_deps: args.is_present("no-deps"),
-        filter_platform: args.value_of("filter-platform").map(|s| s.to_string()),
+        filter_platforms: args._values_of("filter-platform"),
         version,
     };