Skip to content

Commit

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

11 commits in d21c22870e58499d6c31f1bef3bf1255eb021666..cc17afbb0067b1f57d8882640f63b2168d5b7624
2021-07-26 20:23:21 +0000 to 2021-08-02 20:28:08 +0000
- Stabilize the rust-version field (rust-lang/cargo#9732)
- Remove nbsp characters. (rust-lang/cargo#9751)
- Update unstable documentation TOC. (rust-lang/cargo#9750)
- Some minor updates for package/publish package selection. (rust-lang/cargo#9749)
- Bump to 0.57.0, update changelog (rust-lang/cargo#9748)
- Stabilize `[env]` sections (rust-lang/cargo#9411)
- doc: Clarify [doc].browser docs, document PathAndArgs better (rust-lang/cargo#9747)
- Bump cargo-util version. (rust-lang/cargo#9745)
- Make clippy happy (rust-lang/cargo#9736)
- Fix typo in features doc (rust-lang/cargo#9737)
- doc test supports silent output (rust-lang/cargo#9730)
  • Loading branch information
JohnTitor committed Aug 3, 2021
2 parents 519c5a2 + 6698cdc commit 1666c26
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ checksum = "81a18687293a1546b67c246452202bbbf143d239cb43494cc163da14979082da"

[[package]]
name = "cargo"
version = "0.56.0"
version = "0.57.0"
dependencies = [
"anyhow",
"atty",
Expand Down Expand Up @@ -388,7 +388,7 @@ dependencies = [

[[package]]
name = "cargo-util"
version = "0.1.0"
version = "0.1.1"
dependencies = [
"anyhow",
"core-foundation",
Expand Down
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 77 files
+111 −4 CHANGELOG.md
+2 −2 Cargo.toml
+1 −1 crates/cargo-util/Cargo.toml
+3 −3 crates/mdman/doc/mdman.md
+3 −3 crates/mdman/doc/out/mdman.1
+13 −13 crates/mdman/doc/out/mdman.md
+4 −4 crates/mdman/doc/out/mdman.txt
+1 −1 src/bin/cargo/commands/package.rs
+8 −10 src/cargo/core/compiler/compilation.rs
+1 −1 src/cargo/core/compiler/timings.rs
+5 −5 src/cargo/core/features.rs
+1 −1 src/cargo/core/profiles.rs
+4 −4 src/cargo/ops/cargo_package.rs
+4 −0 src/cargo/ops/cargo_test.rs
+2 −2 src/cargo/ops/registry.rs
+4 −10 src/cargo/util/command_prelude.rs
+17 −38 src/cargo/util/toml/mod.rs
+18 −18 src/doc/contrib/src/architecture/codebase.md
+7 −7 src/doc/contrib/src/architecture/packages.md
+5 −5 src/doc/contrib/src/issues.md
+2 −0 src/doc/man/cargo-bench.md
+2 −0 src/doc/man/cargo-build.md
+2 −0 src/doc/man/cargo-check.md
+2 −0 src/doc/man/cargo-doc.md
+2 −0 src/doc/man/cargo-fix.md
+3 −0 src/doc/man/cargo-package.md
+2 −0 src/doc/man/cargo-publish.md
+2 −0 src/doc/man/cargo-run.md
+2 −0 src/doc/man/cargo-rustc.md
+2 −0 src/doc/man/cargo-rustdoc.md
+2 −0 src/doc/man/cargo-test.md
+5 −0 src/doc/man/generated_txt/cargo-bench.txt
+5 −0 src/doc/man/generated_txt/cargo-build.txt
+5 −0 src/doc/man/generated_txt/cargo-check.txt
+5 −0 src/doc/man/generated_txt/cargo-doc.txt
+5 −0 src/doc/man/generated_txt/cargo-fix.txt
+33 −0 src/doc/man/generated_txt/cargo-package.txt
+7 −0 src/doc/man/generated_txt/cargo-publish.txt
+5 −0 src/doc/man/generated_txt/cargo-run.txt
+5 −0 src/doc/man/generated_txt/cargo-rustc.txt
+5 −0 src/doc/man/generated_txt/cargo-rustdoc.txt
+5 −0 src/doc/man/generated_txt/cargo-test.txt
+4 −0 src/doc/man/includes/options-ignore-rust-version.md
+6 −0 src/doc/src/commands/cargo-bench.md
+6 −0 src/doc/src/commands/cargo-build.md
+6 −0 src/doc/src/commands/cargo-check.md
+6 −0 src/doc/src/commands/cargo-doc.md
+6 −0 src/doc/src/commands/cargo-fix.md
+42 −0 src/doc/src/commands/cargo-package.md
+16 −0 src/doc/src/commands/cargo-publish.md
+6 −0 src/doc/src/commands/cargo-run.md
+6 −0 src/doc/src/commands/cargo-rustc.md
+6 −0 src/doc/src/commands/cargo-rustdoc.md
+6 −0 src/doc/src/commands/cargo-test.md
+1 −1 src/doc/src/index.md
+10 −10 src/doc/src/reference/build-scripts.md
+52 −7 src/doc/src/reference/config.md
+26 −26 src/doc/src/reference/environment-variables.md
+1 −1 src/doc/src/reference/features.md
+67 −39 src/doc/src/reference/manifest.md
+4 −4 src/doc/src/reference/profiles.md
+60 −94 src/doc/src/reference/unstable.md
+6 −0 src/etc/man/cargo-bench.1
+6 −0 src/etc/man/cargo-build.1
+6 −0 src/etc/man/cargo-check.1
+6 −0 src/etc/man/cargo-doc.1
+6 −0 src/etc/man/cargo-fix.1
+35 −0 src/etc/man/cargo-package.1
+10 −0 src/etc/man/cargo-publish.1
+6 −0 src/etc/man/cargo-run.1
+6 −0 src/etc/man/cargo-rustc.1
+6 −0 src/etc/man/cargo-rustdoc.1
+6 −0 src/etc/man/cargo-test.1
+4 −9 tests/testsuite/cargo_env_config.rs
+1 −1 tests/testsuite/features2.rs
+4 −73 tests/testsuite/rust_version.rs
+67 −0 tests/testsuite/test.rs

0 comments on commit 1666c26

Please sign in to comment.