Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update cargo #86560

Merged
merged 2 commits into from
Jun 24, 2021
Merged

Update cargo #86560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
faa6461
Update cargo
ehuss Jun 22, 2021
d296ea0
Add bstr to rustc-workspace-hack for rustfmt/cargo.
ehuss Jun 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 21 additions & 7 deletions Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ dependencies = [
"merge",
"num_cpus",
"once_cell",
"opener",
"opener 0.5.0",
"pretty_assertions",
"serde",
"serde_json",
Expand All @@ -195,7 +195,9 @@ version = "0.2.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "31accafdb70df7871592c058eca3985b71104e15ac32f64706022c58867da931"
dependencies = [
"lazy_static",
"memchr",
"regex-automata",
]

[[package]]
Expand Down Expand Up @@ -253,7 +255,7 @@ checksum = "81a18687293a1546b67c246452202bbbf143d239cb43494cc163da14979082da"

[[package]]
name = "cargo"
version = "0.55.0"
version = "0.56.0"
dependencies = [
"anyhow",
"atty",
Expand Down Expand Up @@ -288,11 +290,10 @@ dependencies = [
"log",
"memchr",
"num_cpus",
"opener",
"opener 0.5.0",
"openssl",
"percent-encoding 2.1.0",
"pretty_env_logger",
"rand 0.8.3",
"rustc-workspace-hack",
"rustfix 0.6.0",
"semver 1.0.3",
Expand Down Expand Up @@ -375,10 +376,12 @@ dependencies = [
"flate2",
"git2",
"glob",
"itertools 0.10.0",
"lazy_static",
"remove_dir_all",
"serde_json",
"tar",
"termcolor",
"toml",
"url 2.2.2",
]
Expand Down Expand Up @@ -575,7 +578,7 @@ dependencies = [
"bytecount",
"clap",
"itertools 0.9.0",
"opener",
"opener 0.4.1",
"regex",
"shell-escape",
"walkdir",
Expand Down Expand Up @@ -2418,6 +2421,16 @@ dependencies = [
"winapi 0.3.9",
]

[[package]]
name = "opener"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ea3ebcd72a54701f56345f16785a6d3ac2df7e986d273eb4395c0b01db17952"
dependencies = [
"bstr",
"winapi 0.3.9",
]

[[package]]
name = "openssl"
version = "0.10.33"
Expand Down Expand Up @@ -3558,6 +3571,7 @@ dependencies = [
name = "rustc-workspace-hack"
version = "1.0.0"
dependencies = [
"bstr",
"byteorder",
"crossbeam-utils 0.8.3",
"libc",
Expand Down Expand Up @@ -5158,9 +5172,9 @@ dependencies = [

[[package]]
name = "termcolor"
version = "1.1.0"
version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f"
checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"
dependencies = [
"winapi-util",
]
Expand Down
2 changes: 1 addition & 1 deletion src/bootstrap/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ toml = "0.5"
lazy_static = "1.3.0"
time = "0.1"
ignore = "0.4.10"
opener = "0.4"
opener = "0.5"
merge = "0.1.0"
once_cell = "1.7.2"

Expand Down
2 changes: 1 addition & 1 deletion src/tools/cargo
Open in desktop
Submodule cargo updated 56 files
+89 −1 CHANGELOG.md
+2 −3 Cargo.toml
+2 −0 crates/cargo-test-support/Cargo.toml
+583 −0 crates/cargo-test-support/src/compare.rs
+174 −0 crates/cargo-test-support/src/diff.rs
+113 −693 crates/cargo-test-support/src/lib.rs
+7 −7 crates/cargo-test-support/src/paths.rs
+2 −11 crates/cargo-test-support/src/publish.rs
+33 −26 crates/cargo-util/src/process_builder.rs
+12 −32 src/bin/cargo/commands/report.rs
+3 −0 src/cargo/core/compiler/build_config.rs
+6 −1 src/cargo/core/compiler/compilation.rs
+23 −5 src/cargo/core/compiler/context/mod.rs
+13 −7 src/cargo/core/compiler/custom_build.rs
+259 −7 src/cargo/core/compiler/future_incompat.rs
+114 −100 src/cargo/core/compiler/job_queue.rs
+6 −1 src/cargo/core/compiler/mod.rs
+1 −1 src/cargo/core/compiler/output_depinfo.rs
+4 −4 src/cargo/core/features.rs
+4 −5 src/cargo/core/resolver/dep_cache.rs
+4 −0 src/cargo/core/resolver/errors.rs
+9 −26 src/cargo/core/resolver/features.rs
+18 −2 src/cargo/core/shell.rs
+3 −26 src/cargo/core/summary.rs
+3 −15 src/cargo/core/workspace.rs
+1 −5 src/cargo/ops/cargo_compile.rs
+12 −4 src/cargo/ops/cargo_install.rs
+12 −3 src/cargo/ops/cargo_read_manifest.rs
+3 −1 src/cargo/ops/common_for_install_and_uninstall.rs
+33 −7 src/cargo/ops/fix.rs
+7 −8 src/cargo/ops/tree/graph.rs
+19 −5 src/cargo/util/important_paths.rs
+1 −1 src/cargo/util/toml/mod.rs
+4 −4 src/doc/contrib/src/tests/writing.md
+4 −4 tests/testsuite/bad_config.rs
+4 −4 tests/testsuite/bench.rs
+46 −7 tests/testsuite/build.rs
+11 −39 tests/testsuite/build_script.rs
+126 −9 tests/testsuite/build_script_extra_link_arg.rs
+2 −4 tests/testsuite/cargo_command.rs
+4 −4 tests/testsuite/cargo_config.rs
+28 −0 tests/testsuite/cargo_env_config.rs
+2 −2 tests/testsuite/clean.rs
+6 −38 tests/testsuite/config.rs
+38 −0 tests/testsuite/dep_info.rs
+14 −9 tests/testsuite/doc.rs
+8 −90 tests/testsuite/features_namespaced.rs
+46 −0 tests/testsuite/fix.rs
+213 −37 tests/testsuite/future_incompat_report.rs
+40 −1 tests/testsuite/install.rs
+9 −21 tests/testsuite/locate_project.rs
+10 −18 tests/testsuite/lockfile_compat.rs
+1 −1 tests/testsuite/metabuild.rs
+29 −7 tests/testsuite/publish.rs
+1 −1 tests/testsuite/verify_project.rs
+51 −33 tests/testsuite/weak_dep_features.rs
1 change: 1 addition & 0 deletions src/tools/rustc-workspace-hack/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ features = [
]

[dependencies]
bstr = { version = "0.2.13", features = ["default"] }
byteorder = { version = "1", features = ['default', 'std'] }
curl-sys = { version = "0.4.13", features = ["http2", "libnghttp2-sys"], optional = true }
crossbeam-utils = { version = "0.8.0", features = ["nightly"] }
Expand Down