Skip to content

Commit

Permalink
Auto merge of #88278 - ehuss:update-cargo, r=ehuss
Browse files Browse the repository at this point in the history 
Update cargo

19 commits in e96bdb0c3d0a418e7fcd7fbd69be08abf830b4bc..f559c109cc79fe413a8535fb620a5a58b3823d94
2021-08-17 22:58:47 +0000 to 2021-08-26 22:54:55 +0000
- Fix test not to rely on `cargo` in PATH. (rust-lang/cargo#9843)
- Improve resolver message to include dependency requirements (rust-lang/cargo#9827)
- Add hint for cargo metadata in environment section (rust-lang/cargo#9836)
- Fix panic with build-std of a proc-macro. (rust-lang/cargo#9834)
- Fix typos “a”→“an” (rust-lang/cargo#9821)
- Fix typo in git-authentication.md (rust-lang/cargo#9832)
- Add some debug logging for `cargo fix` (rust-lang/cargo#9831)
- Add documentation about third-party registries. (rust-lang/cargo#9830)
- unset the FIX_ENV when executing the real rustc (rust-lang/cargo#9818)
- Allow crate download by checksum (rust-lang/cargo#9801)
- Emit warning for migrating to unstable edition in stable channel (rust-lang/cargo#9792)
- Warning for no lib dependencies (rust-lang/cargo#9771)
- Temporarily disable extern-html-root-url test. (rust-lang/cargo#9824)
- Move `tmp` test directory. (rust-lang/cargo#9814)
- Fix test incorrectly validating CARGO_PKG_LICENSE_FILE. (rust-lang/cargo#9813)
- Implement `[future-incompat-report]` config section (rust-lang/cargo#9774)
- Bump curl. (rust-lang/cargo#9809)
- Determine packages to install prior to installing (rust-lang/cargo#9793)
- Show feature resolver differences for dev-dependencies. (rust-lang/cargo#9803)
  • Loading branch information
@bors
bors committed Aug 27, 2021
2 parents d5cd320 + 167ee54 commit 720a1b2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -871,9 +871,9 @@ dependencies = [

[[package]]
name = "curl-sys"
version = "0.4.44+curl-7.77.0"
version = "0.4.45+curl-7.78.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4b6d85e9322b193f117c966e79c2d6929ec08c02f339f950044aba12e20bbaf1"
checksum = "de9e5a72b1c744eb5dd20b2be4d7eb84625070bb5c4ab9b347b70464ab1e62eb"
dependencies = [
"cc",
"libc",
Expand Down
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 45 files
+2 −2 Cargo.toml
+2 −2 crates/resolver-tests/tests/resolve.rs
+23 −7 src/cargo/core/compiler/job_queue.rs
+1 −1 src/cargo/core/compiler/layout.rs
+11 −13 src/cargo/core/compiler/links.rs
+9 −4 src/cargo/core/compiler/unit_dependencies.rs
+79 −23 src/cargo/core/package.rs
+1 −1 src/cargo/core/resolver/conflict_cache.rs
+2 −2 src/cargo/core/resolver/dep_cache.rs
+56 −16 src/cargo/core/resolver/errors.rs
+22 −14 src/cargo/core/resolver/mod.rs
+4 −1 src/cargo/core/resolver/resolve.rs
+1 −1 src/cargo/core/resolver/types.rs
+1 −1 src/cargo/core/source/source_id.rs
+530 −445 src/cargo/ops/cargo_install.rs
+89 −45 src/cargo/ops/fix.rs
+18 −0 src/cargo/ops/resolve.rs
+1 −1 src/cargo/ops/tree/mod.rs
+1 −1 src/cargo/sources/git/utils.rs
+1 −1 src/cargo/sources/registry/index.rs
+3 −1 src/cargo/sources/registry/mod.rs
+6 −4 src/cargo/sources/registry/remote.rs
+41 −3 src/cargo/util/config/mod.rs
+5 −10 src/cargo/util/diagnostic_server.rs
+21 −11 src/cargo/util/graph.rs
+1 −0 src/cargo/util/toml/mod.rs
+1 −1 src/doc/src/appendix/git-authentication.md
+2 −1 src/doc/src/reference/environment-variables.md
+4 −3 src/doc/src/reference/registries.md
+12 −0 src/doc/src/reference/unstable.md
+16 −12 tests/testsuite/build.rs
+2 −2 tests/testsuite/build_script.rs
+1 −1 tests/testsuite/config.rs
+1 −1 tests/testsuite/features_namespaced.rs
+76 −7 tests/testsuite/fix.rs
+35 −2 tests/testsuite/future_incompat_report.rs
+6 −6 tests/testsuite/install.rs
+6 −6 tests/testsuite/install_upgrade.rs
+3 −3 tests/testsuite/patch.rs
+2 −2 tests/testsuite/path.rs
+1 −1 tests/testsuite/registry.rs
+190 −0 tests/testsuite/run.rs
+2 −0 tests/testsuite/rustdoc_extern_html.rs
+28 −0 tests/testsuite/standard_lib.rs
+1 −1 tests/testsuite/weak_dep_features.rs

0 comments on commit 720a1b2

Please sign in to comment.