Added aliases to subcommand typo suggestions.

CHANGELOG.md

@@ -1,9 +1,50 @@
 # Changelog
 
+## Cargo 1.40 (2019-12-19)
+[4b105b6a...HEAD](https://github.com/rust-lang/cargo/compare/4b105b6a...HEAD)
+
+### Added
+- (Nightly only): The `mtime-on-use` feature may now be enabled via the
+  `unstable.mtime_on_use` config option.
+  [#7411](https://github.com/rust-lang/cargo/pull/7411)
+
+### Changed
+- Cargo's "platform" `cfg` parsing has been extracted into a separate crate
+  named `cargo-platform`.
+  [#7375](https://github.com/rust-lang/cargo/pull/7375)
+
+### Fixed
+- Fixed an issue where if a package had an `include` field, and `Cargo.lock`
+  in `.gitignore`, and a binary or example target, and the `Cargo.lock` exists
+  in the current project, it would fail to publish complaining the
+  `Cargo.lock` was dirty.
+  [#7448](https://github.com/rust-lang/cargo/pull/7448)
+- Fixed a panic in a particular combination of `[patch]` entries.
+  [#7452](https://github.com/rust-lang/cargo/pull/7452)
+
 ## Cargo 1.39 (2019-11-07)
-[e853aa97...HEAD](https://github.com/rust-lang/cargo/compare/e853aa97...HEAD)
+[e853aa97...4b105b6a](https://github.com/rust-lang/cargo/compare/e853aa97...4b105b6a)
 
 ### Added
+- Config files may now use the `.toml` filename extension.
+  [#7295](https://github.com/rust-lang/cargo/pull/7295)
+- (Nightly only): Basic support for building the standard library directly
+  from Cargo has been added.
+  ([docs](https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#build-std))
+  [#7216](https://github.com/rust-lang/cargo/pull/7216)
+- The `--workspace` flag has been added as an alias for `--all` to help avoid
+  confusion about the meaning of "all".
+  [#7241](https://github.com/rust-lang/cargo/pull/7241)
+- The `publish` field has been added to `cargo metadata`.
+  [#7354](https://github.com/rust-lang/cargo/pull/7354)
+- (Nightly only): Added `-Ztimings` feature to generate an HTML report
+  on the time spent on individual compilation steps. This also may output
+  completion steps on the console and JSON data.
+  ([docs](https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#timings))
+  [#7311](https://github.com/rust-lang/cargo/pull/7311)
+- (Nightly only): Added ability to cross-compile doctests.
+  ([docs](https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#doctest-xcompile))
+  [#6892](https://github.com/rust-lang/cargo/pull/6892)
 
 ### Changed
 - Display more information if parsing the output from `rustc` fails.
@@ -29,14 +70,62 @@
   `git` value will be stripped from the uploaded crate, matching the behavior
   of `path` dependencies.
   [#7237](https://github.com/rust-lang/cargo/pull/7237)
+- The behavior of workspace default-members has changed. The default-members
+  now only applies when running Cargo in the root of the workspace. Previously
+  it would always apply regardless of which directory Cargo is running in.
+  [#7270](https://github.com/rust-lang/cargo/pull/7270)
+- libgit2 updated pulling in all upstream changes.
+  [#7275](https://github.com/rust-lang/cargo/pull/7275)
+- Bump `home` dependency for locating home directories.
+  [#7277](https://github.com/rust-lang/cargo/pull/7277)
+- zsh completions have been updated.
+  [#7296](https://github.com/rust-lang/cargo/pull/7296)
+- SSL connect errors are now retried.
+  [#7318](https://github.com/rust-lang/cargo/pull/7318)
+- The jobserver has been changed to acquire N tokens (instead of N-1), and
+  then immediately acquires the extra token. This was changed to accommodate
+  the `cc` crate on Windows to allow it to release its implicit token.
+  [#7344](https://github.com/rust-lang/cargo/pull/7344)
+- The scheduling algorithm for choosing which crate to build next has been
+  changed. It now chooses the crate with the greatest number of transitive
+  crates waiting on it. Previously it used a maximum topological depth.
+  [#7390](https://github.com/rust-lang/cargo/pull/7390)
 
 ### Fixed
 - Git dependencies with submodules with shorthand SSH URLs (like
   `git@github.com/user/repo.git`) should now work.
   [#7238](https://github.com/rust-lang/cargo/pull/7238)
+- Handle broken symlinks when creating `.dSYM` symlinks on macOS.
+  [#7268](https://github.com/rust-lang/cargo/pull/7268)
+- Fixed issues with multiple versions of the same crate in a `[patch]` table.
+  [#7303](https://github.com/rust-lang/cargo/pull/7303)
+- Fixed issue with custom target `.json` files where a substring of the name
+  matches an unsupported crate type (like "bin").
+  [#7363](https://github.com/rust-lang/cargo/issues/7363)
+- Fixed issues with generating documentation for proc-macro crate types.
+  [#7159](https://github.com/rust-lang/cargo/pull/7159)
+- Fixed hang if Cargo panics within a build thread.
+  [#7366](https://github.com/rust-lang/cargo/pull/7366)
+- Fixed rebuild detection if a `build.rs` script issues different `rerun-if`
+  directives between builds. Cargo was erroneously causing a rebuild after the
+  change.
+  [#7373](https://github.com/rust-lang/cargo/pull/7373)
+- Properly handle canonical URLs for `[patch]` table entries, preventing
+  the patch from working after the first time it is used.
+  [#7368](https://github.com/rust-lang/cargo/pull/7368)
+- Fixed an issue where integration tests were waiting for the package binary
+  to finish building before starting their own build. They now may build
+  concurrently.
+  [#7394](https://github.com/rust-lang/cargo/pull/7394)
+- Fixed accidental change in the previous release on how `--features a b` flag
+  is interpreted, restoring the original behavior where this is interpreted as
+  `--features a` along with the argument `b` passed to the command. To pass
+  multiple features, use quotes around the features to pass multiple features
+  like `--features "a b"`, or use commas, or use multiple `--features` flags.
+  [#7419](https://github.com/rust-lang/cargo/pull/7419)
 
 ## Cargo 1.38 (2019-09-26)
-[4c1fa54d...e853aa97](https://github.com/rust-lang/cargo/compare/4c1fa54d...e853aa97)
+[4c1fa54d...23ef9a4e](https://github.com/rust-lang/cargo/compare/4c1fa54d...23ef9a4e)
 
 ### Added
 
@@ -127,7 +216,7 @@
   [#7162](https://github.com/rust-lang/cargo/pull/7162)
 
 ## Cargo 1.37 (2019-08-15)
-[c4fcfb72...4c1fa54d](https://github.com/rust-lang/cargo/compare/c4fcfb72...4c1fa54d)
+[c4fcfb72...9edd0891](https://github.com/rust-lang/cargo/compare/c4fcfb72...9edd0891)
 
 ### Added
 - Added `doctest` field to `cargo metadata` to determine if a target's

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cargo"
-version = "0.40.0"
+version = "0.41.0"
 edition = "2018"
 authors = ["Yehuda Katz <wycats@gmail.com>",
            "Carl Lerche <me@carllerche.com>",
@@ -9,6 +9,7 @@ license = "MIT OR Apache-2.0"
 homepage = "https://crates.io"
 repository = "https://github.com/rust-lang/cargo"
 documentation = "https://docs.rs/cargo"
+readme = "README.md"
 description = """
 Cargo, a package manager for Rust.
 """
@@ -20,22 +21,24 @@ path = "src/cargo/lib.rs"
 [dependencies]
 atty = "0.2"
 bytesize = "1.0"
-crates-io = { path = "crates/crates-io", version = "0.28" }
+cargo-platform = { path = "crates/cargo-platform", version = "0.1" }
+crates-io = { path = "crates/crates-io", version = "0.29" }
 crossbeam-utils = "0.6"
 crypto-hash = "0.3.1"
-curl = { version = "0.4.21", features = ['http2'] }
-curl-sys = "0.4.18"
-env_logger = "0.6.0"
+curl = { version = "0.4.23", features = ["http2"] }
+curl-sys = "0.4.22"
+env_logger = "0.7.0"
 pretty_env_logger = { version = "0.3", optional = true }
 failure = "0.1.5"
 filetime = "0.2"
-flate2 = { version = "1.0.3", features = ['zlib'] }
+flate2 = { version = "1.0.3", features = ["zlib"] }
 fs2 = "0.4"
 git2 = "0.10.0"
 git2-curl = "0.11.0"
 glob = "0.3.0"
-hex = "0.3"
+hex = "0.4"
 home = "0.5"
+humantime = "1.2.0"
 ignore = "0.4.7"
 lazy_static = "1.2.0"
 jobserver = "0.1.13"
@@ -51,7 +54,7 @@ remove_dir_all = "0.5.2"
 rustfix = "0.4.6"
 same-file = "1"
 semver = { version = "0.9.0", features = ["serde"] }
-serde = { version = "1.0.82", features = ['derive'] }
+serde = { version = "1.0.82", features = ["derive"] }
 serde_ignored = "0.1.0"
 serde_json = { version = "1.0.30", features = ["raw_value"] }
 shell-escape = "0.1.4"
@@ -60,7 +63,7 @@ tar = { version = "0.4.18", default-features = false }
 tempfile = "3.0"
 termcolor = "1.0"
 toml = "0.5.3"
-url = { version = "2.0", features = ['serde'] }
+url = "2.0"
 walkdir = "2.2"
 clap = "2.31.2"
 unicode-width = "0.1.5"
@@ -102,6 +105,7 @@ features = [
 
 [dev-dependencies]
 cargo-test-macro = { path = "crates/cargo-test-macro", version = "0.1.0" }
+cargo-test-support = { path = "crates/cargo-test-support", version = "0.1.0" }
 
 [[bin]]
 name = "cargo"
@@ -110,5 +114,5 @@ doc = false
 
 [features]
 deny-warnings = []
-vendored-openssl = ['openssl/vendored']
-pretty-env-logger = ['pretty_env_logger']
+vendored-openssl = ["openssl/vendored"]
+pretty-env-logger = ["pretty_env_logger"]

README.md

@@ -6,7 +6,7 @@ Learn more at https://doc.rust-lang.org/cargo/
 
 ## Code Status
 
-[![Build Status](https://dev.azure.com/rust-lang/cargo/_apis/build/status/rust-lang.cargo?branchName=master)](https://dev.azure.com/rust-lang/cargo/_build/latest?definitionId=18&branchName=master)
+[![Build Status](https://dev.azure.com/rust-lang/cargo/_apis/build/status/rust-lang.cargo?branchName=auto-cargo)](https://dev.azure.com/rust-lang/cargo/_build?definitionId=18)
 
 Code documentation: https://docs.rs/cargo/
 
@@ -22,6 +22,7 @@ Cargo requires the following tools and packages to build:
 * `git`
 * `python`
 * `curl` (on Unix)
+* `pkg-config` (on Unix, used to figure out the `libssl` headers/libraries)
 * OpenSSL headers (only for Unix, this is the `libssl-dev` package on ubuntu)
 * `cargo` and `rustc`
 

azure-pipelines.yml

@@ -43,6 +43,7 @@ jobs:
       x86_64-msvc:
         TOOLCHAIN: stable-x86_64-pc-windows-msvc
         OTHER_TARGET: i686-pc-windows-msvc
+
 - job: rustfmt
   pool:
     vmImage: ubuntu-16.04
@@ -54,10 +55,14 @@ jobs:
       displayName: "Check rustfmt (cargo)"
     - bash: cd crates/cargo-test-macro && cargo fmt --all -- --check
       displayName: "Check rustfmt (cargo-test-macro)"
+    - bash: cd crates/cargo-test-support && cargo fmt --all -- --check
+      displayName: "Check rustfmt (cargo-test-support)"
     - bash: cd crates/crates-io && cargo fmt --all -- --check
       displayName: "Check rustfmt (crates-io)"
     - bash: cd crates/resolver-tests && cargo fmt --all -- --check
       displayName: "Check rustfmt (resolver-tests)"
+    - bash: cd crates/cargo-platform && cargo fmt --all -- --check
+      displayName: "Check rustfmt (cargo-platform)"
   variables:
     TOOLCHAIN: stable
 
@@ -71,6 +76,20 @@ jobs:
   variables:
     TOOLCHAIN: stable
 
+- job: build_std
+  pool:
+    vmImage: ubuntu-16.04
+  steps:
+    - template: ci/azure-install-rust.yml
+    - bash: rustup component add rust-src
+      displayName: "Install rust-src"
+    - bash: cargo build
+    - bash: cargo test --test build-std
+      displayName: "tests"
+  variables:
+    TOOLCHAIN: nightly
+    CARGO_RUN_BUILD_STD_TESTS: 1
+
 - job: docs
   pool:
     vmImage: ubuntu-16.04
@@ -88,4 +107,3 @@ jobs:
       displayName: "Build mdbook documentation"
   variables:
     TOOLCHAIN: stable
-

ci/azure-test-all.yml

@@ -26,3 +26,9 @@ steps:
 # fix the link errors.
 - bash: cargo test --features 'deny-warnings curl/force-system-lib-on-osx'
   displayName: "cargo test"
+
+- bash: cargo test -p cargo-test-support
+  displayName: "cargo test -p cargo-test-support"
+
+- bash: cargo test -p cargo-platform
+  displayName: "cargo test -p cargo-platform"

crates/cargo-platform/Cargo.toml

@@ -0,0 +1,13 @@
+[package]
+name = "cargo-platform"
+version = "0.1.0"
+authors = ["The Cargo Project Developers"]
+edition = "2018"
+license = "MIT OR Apache-2.0"
+homepage = "https://github.com/rust-lang/cargo"
+repository = "https://github.com/rust-lang/cargo"
+documentation = "https://docs.rs/cargo-platform"
+description = "Cargo's representation of a target platform."
+
+[dependencies]
+serde = { version = "1.0.82", features = ['derive'] }

crates/cargo-platform/examples/matches.rs

@@ -0,0 +1,55 @@
+//! This example demonstrates how to filter a Platform based on the current
+//! host target.
+
+use cargo_platform::{Cfg, Platform};
+use std::process::Command;
+use std::str::FromStr;
+
+static EXAMPLES: &[&str] = &[
+    "cfg(windows)",
+    "cfg(unix)",
+    "cfg(target_os=\"macos\")",
+    "cfg(target_os=\"linux\")",
+    "cfg(any(target_arch=\"x86\", target_arch=\"x86_64\"))",
+];
+
+fn main() {
+    let target = get_target();
+    let cfgs = get_cfgs();
+    println!("host target={} cfgs:", target);
+    for cfg in &cfgs {
+        println!("  {}", cfg);
+    }
+    let mut examples: Vec<&str> = EXAMPLES.iter().copied().collect();
+    examples.push(target.as_str());
+    for example in examples {
+        let p = Platform::from_str(example).unwrap();
+        println!("{:?} matches: {:?}", example, p.matches(&target, &cfgs));
+    }
+}
+
+fn get_target() -> String {
+    let output = Command::new("rustc")
+        .arg("-Vv")
+        .output()
+        .expect("rustc failed to run");
+    let stdout = String::from_utf8(output.stdout).unwrap();
+    for line in stdout.lines() {
+        if line.starts_with("host: ") {
+            return String::from(&line[6..]);
+        }
+    }
+    panic!("Failed to find host: {}", stdout);
+}
+
+fn get_cfgs() -> Vec<Cfg> {
+    let output = Command::new("rustc")
+        .arg("--print=cfg")
+        .output()
+        .expect("rustc failed to run");
+    let stdout = String::from_utf8(output.stdout).unwrap();
+    stdout
+        .lines()
+        .map(|line| Cfg::from_str(line).unwrap())
+        .collect()
+}