Skip to content

Commit

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

16 commits in 358e79fe56fe374649275ca7aebaafd57ade0e8d..95bb3c92bf516017e812e7f1c14c2dea3845b30e
2022-01-04 18:39:45 +0000 to 2022-01-18 17:39:35 +0000
- Error when setting crate type of both dylib and cdylib in library (rust-lang/cargo#10243)
- Include `help` in `--list` (rust-lang/cargo#10300)
- Add report subcommand to bash completion. (rust-lang/cargo#10295)
- Downgrade some log messages. (rust-lang/cargo#10296)
- Enable shortcut for triage bot (rust-lang/cargo#10298)
- Bump to 0.61.0, update changelog (rust-lang/cargo#10294)
- use new cargo fmt option (rust-lang/cargo#10291)
- Add `run-fail` to semver-check for docs (rust-lang/cargo#10287)
- Use `is_symlink()` method (rust-lang/cargo#10290)
- Stabilize namespaced and weak dependency features. (rust-lang/cargo#10269)
- Port cargo to clap3 (rust-lang/cargo#10265)
- feat: support rustflags per profile (rust-lang/cargo#10217)
- Make bors ignore the PR template so it doesn't end up in merge messages (rust-lang/cargo#10267)
- Be resilient to most IO error and filesystem loop while walking dirs (rust-lang/cargo#10214)
- Remove the option to disable pipelining (rust-lang/cargo#10258)
- Always ask rustc for messages about artifacts, and always process them (rust-lang/cargo#10255)
  • Loading branch information
@bors
bors committed Jan 19, 2022
2 parents e5e2b0b + bfacc5c commit 2f004d2
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 12 deletions.
58 changes: 47 additions & 11 deletions Cargo.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ dependencies = [

[[package]]
name = "cargo"
version = "0.60.0"
version = "0.61.0"
dependencies = [
"anyhow",
"atty",
Expand All @@ -335,7 +335,7 @@ dependencies = [
"cargo-test-macro",
"cargo-test-support",
"cargo-util",
"clap",
"clap 3.0.10",
"crates-io",
"crossbeam-utils",
"curl",
Expand Down Expand Up @@ -615,13 +615,28 @@ dependencies = [
"ansi_term 0.12.1",
"atty",
"bitflags",
"strsim",
"textwrap",
"strsim 0.8.0",
"textwrap 0.11.0",
"unicode-width",
"vec_map",
"yaml-rust 0.3.5",
]

[[package]]
name = "clap"
version = "3.0.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a30c3bf9ff12dfe5dae53f0a96e0febcd18420d1c0e7fad77796d9d5c4b5375"
dependencies = [
"atty",
"bitflags",
"indexmap",
"os_str_bytes",
"strsim 0.10.0",
"termcolor",
"textwrap 0.14.2",
]

[[package]]
name = "clippy"
version = "0.1.60"
Expand Down Expand Up @@ -654,7 +669,7 @@ version = "0.0.1"
dependencies = [
"bytecount",
"cargo_metadata 0.14.0",
"clap",
"clap 2.34.0",
"indoc",
"itertools 0.10.1",
"opener",
Expand Down Expand Up @@ -821,7 +836,7 @@ checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634"

[[package]]
name = "crates-io"
version = "0.33.1"
version = "0.34.0"
dependencies = [
"anyhow",
"curl",
Expand Down Expand Up @@ -1736,7 +1751,7 @@ name = "installer"
version = "0.0.0"
dependencies = [
"anyhow",
"clap",
"clap 2.34.0",
"flate2",
"lazy_static",
"num_cpus",
Expand Down Expand Up @@ -2175,7 +2190,7 @@ dependencies = [
"ammonia",
"anyhow",
"chrono",
"clap",
"clap 2.34.0",
"elasticlunr-rs",
"env_logger 0.7.1",
"handlebars",
Expand Down Expand Up @@ -2506,6 +2521,15 @@ dependencies = [
"winapi",
]

[[package]]
name = "os_str_bytes"
version = "6.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64"
dependencies = [
"memchr",
]

[[package]]
name = "output_vt100"
version = "0.1.2"
Expand Down Expand Up @@ -2910,7 +2934,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b0b4b5faaf07040474e8af74a9e19ff167d5d204df5db5c5c765edecfb900358"
dependencies = [
"bitflags",
"clap",
"clap 2.34.0",
"derive_more",
"env_logger 0.7.1",
"humantime 2.0.1",
Expand Down Expand Up @@ -3258,7 +3282,7 @@ dependencies = [
name = "rustbook"
version = "0.1.0"
dependencies = [
"clap",
"clap 2.34.0",
"env_logger 0.7.1",
"mdbook",
]
Expand Down Expand Up @@ -4873,13 +4897,19 @@ version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"

[[package]]
name = "strsim"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"

[[package]]
name = "structopt"
version = "0.3.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "40b9788f4202aa75c240ecc9c15c65185e6a39ccdeb0fd5d008b98825464c87c"
dependencies = [
"clap",
"clap 2.34.0",
"lazy_static",
"structopt-derive",
]
Expand Down Expand Up @@ -5050,6 +5080,12 @@ dependencies = [
"unicode-width",
]

[[package]]
name = "textwrap"
version = "0.14.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0066c8d12af8b5acd21e00547c3797fde4e8677254a7ee429176ccebbe93dd80"

[[package]]
name = "thiserror"
version = "1.0.30"
Expand Down
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 90 files
+2 −0 .github/PULL_REQUEST_TEMPLATE.md
+2 −2 .github/workflows/main.yml
+85 −1 CHANGELOG.md
+3 −3 Cargo.toml
+0 −8 crates/cargo-test-support/src/paths.rs
+0 −1 crates/cargo-util/src/paths.rs
+1 −1 crates/crates-io/Cargo.toml
+0 −2 crates/crates-io/lib.rs
+42 −36 src/bin/cargo/cli.rs
+4 −4 src/bin/cargo/commands/bench.rs
+1 −1 src/bin/cargo/commands/build.rs
+1 −1 src/bin/cargo/commands/check.rs
+1 −1 src/bin/cargo/commands/clean.rs
+8 −5 src/bin/cargo/commands/config.rs
+1 −1 src/bin/cargo/commands/doc.rs
+1 −1 src/bin/cargo/commands/fetch.rs
+7 −7 src/bin/cargo/commands/fix.rs
+1 −1 src/bin/cargo/commands/generate_lockfile.rs
+3 −3 src/bin/cargo/commands/git_checkout.rs
+2 −2 src/bin/cargo/commands/init.rs
+7 −3 src/bin/cargo/commands/install.rs
+3 −3 src/bin/cargo/commands/locate_project.rs
+2 −2 src/bin/cargo/commands/login.rs
+1 −1 src/bin/cargo/commands/logout.rs
+1 −1 src/bin/cargo/commands/metadata.rs
+1 −1 src/bin/cargo/commands/mod.rs
+2 −2 src/bin/cargo/commands/new.rs
+5 −5 src/bin/cargo/commands/owner.rs
+2 −2 src/bin/cargo/commands/package.rs
+2 −2 src/bin/cargo/commands/pkgid.rs
+1 −1 src/bin/cargo/commands/publish.rs
+2 −4 src/bin/cargo/commands/read_manifest.rs
+9 −4 src/bin/cargo/commands/report.rs
+6 −2 src/bin/cargo/commands/run.rs
+2 −2 src/bin/cargo/commands/rustc.rs
+2 −2 src/bin/cargo/commands/rustdoc.rs
+2 −2 src/bin/cargo/commands/search.rs
+5 −5 src/bin/cargo/commands/test.rs
+13 −27 src/bin/cargo/commands/tree.rs
+2 −2 src/bin/cargo/commands/uninstall.rs
+2 −2 src/bin/cargo/commands/update.rs
+21 −23 src/bin/cargo/commands/vendor.rs
+1 −1 src/bin/cargo/commands/verify_project.rs
+1 −1 src/bin/cargo/commands/version.rs
+2 −2 src/bin/cargo/commands/yank.rs
+9 −1 src/bin/cargo/main.rs
+2 −2 src/cargo/core/compiler/context/compilation_files.rs
+4 −16 src/cargo/core/compiler/context/mod.rs
+8 −8 src/cargo/core/compiler/job_queue.rs
+30 −44 src/cargo/core/compiler/mod.rs
+9 −4 src/cargo/core/features.rs
+14 −22 src/cargo/core/package.rs
+10 −2 src/cargo/core/profiles.rs
+19 −87 src/cargo/core/resolver/features.rs
+4 −58 src/cargo/core/summary.rs
+4 −1 src/cargo/lib.rs
+1 −1 src/cargo/ops/cargo_compile.rs
+2 −4 src/cargo/ops/cargo_output_metadata.rs
+0 −1 src/cargo/ops/registry.rs
+1 −1 src/cargo/sources/git/utils.rs
+19 −5 src/cargo/sources/path.rs
+1 −13 src/cargo/sources/registry/index.rs
+69 −57 src/cargo/util/command_prelude.rs
+1 −0 src/cargo/util/config/mod.rs
+6 −0 src/cargo/util/errors.rs
+10 −2 src/cargo/util/toml/mod.rs
+9 −0 src/cargo/util/toml/targets.rs
+98 −33 src/doc/semver-check/src/main.rs
+1 −6 src/doc/src/reference/config.md
+0 −2 src/doc/src/reference/environment-variables.md
+56 −20 src/doc/src/reference/features.md
+39 −1 src/doc/src/reference/registries.md
+29 −87 src/doc/src/reference/unstable.md
+7 −1 src/etc/cargo.bashcomp.sh
+47 −14 tests/testsuite/build.rs
+0 −69 tests/testsuite/build_script.rs
+8 −10 tests/testsuite/cargo_config.rs
+1 −2 tests/testsuite/clean.rs
+1 −0 tests/testsuite/config.rs
+18 −7 tests/testsuite/features.rs
+32 −155 tests/testsuite/features_namespaced.rs
+1 −1 tests/testsuite/metadata.rs
+1 −1 tests/testsuite/new.rs
+1 −2 tests/testsuite/old_cargos.rs
+3 −4 tests/testsuite/package.rs
+99 −21 tests/testsuite/profiles.rs
+1 −1 tests/testsuite/run.rs
+1 −1 tests/testsuite/rustc.rs
+24 −141 tests/testsuite/weak_dep_features.rs
+3 −0 triagebot.toml

0 comments on commit 2f004d2

Please sign in to comment.