Skip to content

Commit

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

12 commits in 390e8f245ef2cd7ac698b8a76abf029f9abcab0d..74e3a7d5b756d7c0e94399fc29fcd154e792c22a
2020-04-07 17:46:45 +0000 to 2020-04-13 20:41:52 +0000
- Update dependencies to support illumos target (rust-lang/cargo#8093)
- Whitelist another known spurious curl error (rust-lang/cargo#8102)
- Fix nightly test matching rustc "warning" output. (rust-lang/cargo#8098)
- Update default for codegen-units. (rust-lang/cargo#8096)
- Fix freshness when linking is interrupted. (rust-lang/cargo#8087)
- Add `cargo tree` command. (rust-lang/cargo#8062)
- Add "build-finished" JSON message. (rust-lang/cargo#8069)
- Extend -Zpackage-features with more capabilities. (rust-lang/cargo#8074)
- Disallow invalid dependency names through crate renaming (rust-lang/cargo#8090)
- Use the same filename hash for pre-release channels. (rust-lang/cargo#8073)
- Index the commands section (rust-lang/cargo#8081)
- Upgrade to mdBook v0.3.7 (rust-lang/cargo#8083)
  • Loading branch information
bors committed Apr 14, 2020
2 parents 6805906 + b04924a commit edc0258
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 18 deletions.
23 changes: 6 additions & 17 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,6 @@ dependencies = [
"env_logger 0.7.1",
"filetime",
"flate2",
"fs2",
"fwdansi",
"git2",
"git2-curl",
Expand Down Expand Up @@ -1084,9 +1083,9 @@ checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"

[[package]]
name = "filetime"
version = "0.2.8"
version = "0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1ff6d4dab0aa0c8e6346d46052e93b13a16cf847b54ed357087c35011048cc7d"
checksum = "f59efc38004c988e4201d11d263b8171f49a2e7ec0bdbb71773433f271504a5e"
dependencies = [
"cfg-if",
"libc",
Expand Down Expand Up @@ -1146,16 +1145,6 @@ dependencies = [
"rustc-std-workspace-core",
]

[[package]]
name = "fs2"
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213"
dependencies = [
"libc",
"winapi 0.3.8",
]

[[package]]
name = "fs_extra"
version = "1.1.0"
Expand Down Expand Up @@ -1262,9 +1251,9 @@ dependencies = [

[[package]]
name = "git2"
version = "0.13.0"
version = "0.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b7da16ceafe24cedd9ba02c4463a2b506b6493baf4317c79c5acb553134a3c15"
checksum = "2cfb93ca10f2934069c3aaafb753fbe0663f08ee009a01b6d62e062391447b15"
dependencies = [
"bitflags",
"libc",
Expand Down Expand Up @@ -1806,9 +1795,9 @@ dependencies = [

[[package]]
name = "libgit2-sys"
version = "0.12.0+0.99.0"
version = "0.12.3+1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "05dff41ac39e7b653f5f1550886cf00ba52f8e7f57210b633cdeedb3de5b236c"
checksum = "7637dc15e7f05a16011723e0448655081fc01a374bcd368e2c9b9c7f5c5ab3ea"
dependencies = [
"cc",
"libc",
Expand Down
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 56 files
+3 −4 Cargo.toml
+1 −1 azure-pipelines.yml
+3 −0 src/bin/cargo/commands/mod.rs
+254 −0 src/bin/cargo/commands/tree.rs
+3 −17 src/cargo/core/compiler/build_config.rs
+27 −0 src/cargo/core/compiler/compile_kind.rs
+49 −2 src/cargo/core/compiler/context/compilation_files.rs
+187 −46 src/cargo/core/compiler/fingerprint.rs
+11 −5 src/cargo/core/compiler/job_queue.rs
+2 −0 src/cargo/core/features.rs
+1 −5 src/cargo/core/profiles.rs
+11 −1 src/cargo/core/resolver/features.rs
+4 −0 src/cargo/core/resolver/resolve.rs
+134 −49 src/cargo/core/workspace.rs
+8 −1 src/cargo/ops/cargo_clean.rs
+5 −17 src/cargo/ops/cargo_compile.rs
+1 −4 src/cargo/ops/cargo_doc.rs
+1 −0 src/cargo/ops/mod.rs
+110 −0 src/cargo/ops/tree/format/mod.rs
+123 −0 src/cargo/ops/tree/format/parse.rs
+595 −0 src/cargo/ops/tree/graph.rs
+374 −0 src/cargo/ops/tree/mod.rs
+24 −7 src/cargo/util/command_prelude.rs
+131 −23 src/cargo/util/flock.rs
+11 −0 src/cargo/util/machine_message.rs
+1 −0 src/cargo/util/network.rs
+18 −7 src/cargo/util/rustc.rs
+1 −0 src/cargo/util/toml/mod.rs
+15 −0 src/doc/asciidoc-extension.rb
+227 −0 src/doc/man/cargo-tree.adoc
+3 −0 src/doc/man/cargo.adoc
+508 −0 src/doc/man/generated/cargo-tree.html
+4 −0 src/doc/man/generated/cargo.html
+2 −0 src/doc/man/options-packages.adoc
+1 −0 src/doc/src/SUMMARY.md
+3 −0 src/doc/src/commands/cargo-tree.md
+1 −0 src/doc/src/commands/manifest-commands.md
+4 −0 src/doc/src/index.md
+24 −0 src/doc/src/reference/external-tools.md
+4 −4 src/doc/src/reference/profiles.md
+26 −1 src/doc/src/reference/unstable.md
+15 −0 src/etc/_cargo
+1 −0 src/etc/cargo.bashcomp.sh
+628 −0 src/etc/man/cargo-tree.1
+7 −2 src/etc/man/cargo.1
+2 −0 tests/testsuite/bench.rs
+35 −0 tests/testsuite/build.rs
+0 −74 tests/testsuite/features.rs
+260 −2 tests/testsuite/freshness.rs
+3 −0 tests/testsuite/main.rs
+4 −1 tests/testsuite/message_format.rs
+472 −0 tests/testsuite/package_features.rs
+1 −7 tests/testsuite/pub_priv.rs
+6 −0 tests/testsuite/test.rs
+1,438 −0 tests/testsuite/tree.rs
+361 −0 tests/testsuite/tree_graph_features.rs

0 comments on commit edc0258

Please sign in to comment.