Skip to content

Commit

Permalink
Update cargo
Browse files Browse the repository at this point in the history
  • Loading branch information
@ehuss
ehuss committed Jun 2, 2021
1 parent 153f22a commit 7852935
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 4 deletions.
25 changes: 22 additions & 3 deletions Cargo.lock
View file
Expand Up @@ -278,6 +278,7 @@ dependencies = [
"humantime 2.0.1",
"ignore",
"im-rc",
"itertools 0.10.0",
"jobserver",
"lazy_static",
"lazycell",
Expand All @@ -293,7 +294,7 @@ dependencies = [
"rand 0.8.3",
"rustc-workspace-hack",
"rustfix",
"semver 0.10.0",
"semver 1.0.1",
"serde",
"serde_ignored",
"serde_json",
Expand Down Expand Up @@ -1715,6 +1716,15 @@ dependencies = [
"either",
]

[[package]]
name = "itertools"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "37d572918e350e82412fe766d24b15e6682fb2ed2bbe018280caa810397cb319"
dependencies = [
"either",
]

[[package]]
name = "itoa"
version = "0.4.6"
Expand Down Expand Up @@ -4674,6 +4684,15 @@ dependencies = [
"serde",
]

[[package]]
name = "semver"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d023dabf011d5dcb5ac64e3685d97d3b0ef412911077a2851455c6098524a723"
dependencies = [
"serde",
]

[[package]]
name = "semver-parser"
version = "0.7.0"
Expand Down Expand Up @@ -5033,9 +5052,9 @@ dependencies = [

[[package]]
name = "tar"
version = "0.4.33"
version = "0.4.35"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c0bcfbd6a598361fda270d82469fff3d65089dc33e175c9a131f7b4cd395f228"
checksum = "7d779dc6aeff029314570f666ec83f19df7280bb36ef338442cfa8c604021b80"
dependencies = [
"filetime",
"libc",
Expand Down
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 45 files
+3 −2 Cargo.toml
+2 −7 crates/cargo-test-support/src/registry.rs
+1 −0 crates/cargo-util/src/lib.rs
+45 −0 crates/cargo-util/src/registry.rs
+3 −3 crates/resolver-tests/src/lib.rs
+53 −19 src/bin/cargo/commands/tree.rs
+9 −4 src/cargo/core/compiler/build_context/target_info.rs
+5 −22 src/cargo/core/compiler/compilation.rs
+1 −1 src/cargo/core/compiler/context/compilation_files.rs
+25 −1 src/cargo/core/compiler/context/mod.rs
+60 −19 src/cargo/core/compiler/custom_build.rs
+1 −1 src/cargo/core/compiler/standard_lib.rs
+18 −83 src/cargo/core/dependency.rs
+4 −0 src/cargo/core/features.rs
+1 −1 src/cargo/core/registry.rs
+1 −1 src/cargo/core/resolver/errors.rs
+281 −82 src/cargo/core/workspace.rs
+7 −1 src/cargo/ops/cargo_compile.rs
+5 −59 src/cargo/ops/cargo_doc.rs
+2 −6 src/cargo/ops/cargo_install.rs
+2 −0 src/cargo/ops/cargo_package.rs
+48 −19 src/cargo/ops/tree/mod.rs
+7 −12 src/cargo/sources/registry/index.rs
+4 −4 src/cargo/sources/registry/mod.rs
+2 −26 src/cargo/sources/registry/remote.rs
+10 −0 src/cargo/util/config/mod.rs
+49 −5 src/cargo/util/config/target.rs
+2 −0 src/cargo/util/mod.rs
+76 −0 src/cargo/util/semver_ext.rs
+1 −1 src/cargo/util/to_semver.rs
+29 −10 src/cargo/util/toml/mod.rs
+8 −1 src/doc/man/cargo-tree.md
+8 −2 src/doc/man/generated_txt/cargo-tree.txt
+8 −1 src/doc/src/commands/cargo-tree.md
+10 −0 src/doc/src/reference/config.md
+55 −0 src/doc/src/reference/unstable.md
+12 −1 src/etc/man/cargo-tree.1
+2 −2 tests/testsuite/build.rs
+387 −0 tests/testsuite/build_script.rs
+70 −0 tests/testsuite/build_script_extra_link_arg.rs
+33 −21 tests/testsuite/doc.rs
+2 −1 tests/testsuite/package.rs
+42 −2 tests/testsuite/package_features.rs
+0 −113 tests/testsuite/registry.rs
+243 −2 tests/testsuite/tree.rs

0 comments on commit 7852935

Please sign in to comment.