Skip to content

Commit

Permalink
Rollup merge of rust-lang#87147 - ehuss:update-cargo, r=ehuss
Browse files Browse the repository at this point in the history 
Update cargo

13 commits in 3ebb5f15a940810f250b68821149387af583a79e..66a6737a0c9f3a974af2dd032a65d3e409c77aac
2021-07-02 20:35:38 +0000 to 2021-07-14 20:54:28 +0000
- Add format option to `cargo tree` to print the lib_name (rust-lang/cargo#9663)
- Prefer patched versions of dependencies (rust-lang/cargo#9639)
- When a dependency does not have a version, git or path, fails directly (rust-lang/cargo#9686)
- Spot the crate typo easily (rust-lang/cargo#9665)
- remove unnecessary 'collect' (rust-lang/cargo#9616)
- Make it easier to run testsuite with a custom toolchain. (rust-lang/cargo#9679)
- Serialize `cargo fix` (rust-lang/cargo#9677)
- Don't recommend filing issues on rust-lang/cargo for Cargo.toml errors. (rust-lang/cargo#9658)
- Update nightly failure notification. (rust-lang/cargo#9657)
- Update Windows env uppercase key check. (rust-lang/cargo#9654)
- Unignore fix_edition_2021. (rust-lang/cargo#9662)
- Warning when using features in patch (rust-lang/cargo#9666)
- Unify cargo and rustc's error reporting (rust-lang/cargo#9655)
  • Loading branch information
@JohnTitor
JohnTitor committed Jul 15, 2021
2 parents 6d0d80e + 0c4b2a8 commit 20b363c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 42 files
+19 −3 crates/cargo-test-support/src/lib.rs
+1 −0 crates/resolver-tests/src/lib.rs
+1 −1 src/cargo/core/compiler/context/mod.rs
+1 −0 src/cargo/core/compiler/future_incompat.rs
+46 −1 src/cargo/core/compiler/mod.rs
+101 −61 src/cargo/core/features.rs
+4 −5 src/cargo/core/package.rs
+8 −0 src/cargo/core/registry.rs
+18 −7 src/cargo/core/resolver/dep_cache.rs
+13 −10 src/cargo/core/resolver/errors.rs
+13 −1 src/cargo/core/resolver/mod.rs
+3 −9 src/cargo/lib.rs
+6 −4 src/cargo/ops/fix.rs
+1 −1 src/cargo/ops/registry.rs
+17 −3 src/cargo/ops/resolve.rs
+16 −2 src/cargo/ops/tree/format/mod.rs
+5 −14 src/cargo/util/config/mod.rs
+4 −7 src/cargo/util/toml/mod.rs
+1 −0 src/doc/man/cargo-tree.md
+3 −0 src/doc/man/generated_txt/cargo-tree.txt
+1 −0 src/doc/src/commands/cargo-tree.md
+99 −31 src/doc/src/reference/unstable.md
+4 −0 src/etc/man/cargo-tree.1
+7 −3 tests/testsuite/bad_config.rs
+1 −6 tests/testsuite/build.rs
+1 −1 tests/testsuite/build_script.rs
+106 −4 tests/testsuite/cargo_features.rs
+1 −2 tests/testsuite/check.rs
+3 −2 tests/testsuite/directory.rs
+5 −3 tests/testsuite/edition.rs
+48 −4 tests/testsuite/fix.rs
+1 −3 tests/testsuite/install.rs
+7 −2 tests/testsuite/metabuild.rs
+145 −0 tests/testsuite/patch.rs
+3 −2 tests/testsuite/path.rs
+6 −1 tests/testsuite/profile_config.rs
+6 −1 tests/testsuite/profiles.rs
+6 −2 tests/testsuite/pub_priv.rs
+4 −4 tests/testsuite/publish_lockfile.rs
+9 −6 tests/testsuite/registry.rs
+5 −2 tests/testsuite/tool_paths.rs
+36 −3 tests/testsuite/tree.rs

0 comments on commit 20b363c

Please sign in to comment.