Skip to content

Commit

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

3 commits in 79b397d72c557eb6444a2ba0dc00a211a226a35a..dd83ae55c871d94f060524656abab62ec40b4c40
2020-10-15 14:41:21 +0000 to 2020-10-20 19:31:26 +0000
- Support glob patterns for package/target selection (rust-lang/cargo#8752)
- Update env_logger requirement from 0.7.0 to 0.8.1 (rust-lang/cargo#8795)
- Fix man page links inside `option` blocks. (rust-lang/cargo#8793)
  • Loading branch information
Dylan-DPC committed Oct 22, 2020
2 parents 8b861e3 + e852a4a commit faa1d37
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 2 deletions.
15 changes: 14 additions & 1 deletion Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ dependencies = [
"crypto-hash",
"curl",
"curl-sys",
"env_logger 0.7.1",
"env_logger 0.8.1",
"filetime",
"flate2",
"fwdansi",
Expand Down Expand Up @@ -1035,6 +1035,19 @@ dependencies = [
"termcolor",
]

[[package]]
name = "env_logger"
version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "54532e3223c5af90a6a757c90b5c5521564b07e5e7a958681bcd2afad421cdcd"
dependencies = [
"atty",
"humantime 2.0.1",
"log",
"regex",
"termcolor",
]

[[package]]
name = "error_index_generator"
version = "0.0.0"
Expand Down
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 84 files
+1 −1 Cargo.toml
+2 −2 ci/validate-man.sh
+6 −2 crates/cargo-test-support/src/lib.rs
+4 −6 crates/mdman/src/format/md.rs
+1 −1 crates/mdman/src/lib.rs
+14 −0 crates/mdman/tests/compare/expected/links.1
+22 −1 crates/mdman/tests/compare/expected/links.md
+10 −0 crates/mdman/tests/compare/expected/links.txt
+1 −1 crates/mdman/tests/compare/expected/options.md
+7 −0 crates/mdman/tests/compare/includes/links-include.md
+14 −0 crates/mdman/tests/compare/links.md
+13 −1 src/bin/cargo/commands/run.rs
+175 −40 src/cargo/ops/cargo_compile.rs
+4 −0 src/cargo/ops/cargo_run.rs
+6 −1 src/cargo/util/command_prelude.rs
+6 −1 src/cargo/util/restricted_names.rs
+1 −1 src/doc/man/cargo-publish.md
+19 −6 src/doc/man/generated_txt/cargo-bench.txt
+19 −6 src/doc/man/generated_txt/cargo-build.txt
+19 −6 src/doc/man/generated_txt/cargo-check.txt
+11 −3 src/doc/man/generated_txt/cargo-doc.txt
+21 −7 src/doc/man/generated_txt/cargo-fix.txt
+1 −1 src/doc/man/generated_txt/cargo-publish.txt
+9 −4 src/doc/man/generated_txt/cargo-rustc.txt
+9 −4 src/doc/man/generated_txt/cargo-rustdoc.txt
+20 −7 src/doc/man/generated_txt/cargo-test.txt
+10 −2 src/doc/man/generated_txt/cargo-tree.txt
+2 −1 src/doc/man/includes/options-targets-lib-bin.md
+11 −4 src/doc/man/includes/options-targets.md
+8 −2 src/doc/man/includes/section-package-selection.md
+33 −19 src/doc/src/commands/cargo-bench.md
+32 −18 src/doc/src/commands/cargo-build.md
+32 −18 src/doc/src/commands/cargo-check.md
+9 −9 src/doc/src/commands/cargo-clean.md
+21 −14 src/doc/src/commands/cargo-doc.md
+7 −7 src/doc/src/commands/cargo-fetch.md
+33 −19 src/doc/src/commands/cargo-fix.md
+6 −6 src/doc/src/commands/cargo-generate-lockfile.md
+1 −1 src/doc/src/commands/cargo-help.md
+5 −5 src/doc/src/commands/cargo-init.md
+11 −11 src/doc/src/commands/cargo-install.md
+3 −3 src/doc/src/commands/cargo-locate-project.md
+5 −5 src/doc/src/commands/cargo-login.md
+5 −5 src/doc/src/commands/cargo-metadata.md
+5 −5 src/doc/src/commands/cargo-new.md
+7 −7 src/doc/src/commands/cargo-owner.md
+10 −10 src/doc/src/commands/cargo-package.md
+5 −5 src/doc/src/commands/cargo-pkgid.md
+16 −16 src/doc/src/commands/cargo-publish.md
+11 −11 src/doc/src/commands/cargo-run.md
+24 −16 src/doc/src/commands/cargo-rustc.md
+24 −16 src/doc/src/commands/cargo-rustdoc.md
+4 −4 src/doc/src/commands/cargo-search.md
+32 −18 src/doc/src/commands/cargo-test.md
+14 −8 src/doc/src/commands/cargo-tree.md
+5 −5 src/doc/src/commands/cargo-uninstall.md
+6 −6 src/doc/src/commands/cargo-update.md
+5 −5 src/doc/src/commands/cargo-vendor.md
+5 −5 src/doc/src/commands/cargo-verify-project.md
+1 −1 src/doc/src/commands/cargo-version.md
+7 −7 src/doc/src/commands/cargo-yank.md
+36 −36 src/doc/src/commands/cargo.md
+21 −7 src/etc/man/cargo-bench.1
+21 −7 src/etc/man/cargo-build.1
+21 −7 src/etc/man/cargo-check.1
+10 −3 src/etc/man/cargo-doc.1
+21 −7 src/etc/man/cargo-fix.1
+6 −6 src/etc/man/cargo-metadata.1
+1 −1 src/etc/man/cargo-publish.1
+13 −5 src/etc/man/cargo-rustc.1
+13 −5 src/etc/man/cargo-rustdoc.1
+21 −7 src/etc/man/cargo-test.1
+8 −2 src/etc/man/cargo-tree.1
+102 −0 tests/testsuite/bench.rs
+220 −28 tests/testsuite/build.rs
+109 −1 tests/testsuite/check.rs
+108 −0 tests/testsuite/doc.rs
+535 −0 tests/testsuite/glob_targets.rs
+1 −0 tests/testsuite/main.rs
+10 −1 tests/testsuite/run.rs
+20 −0 tests/testsuite/rustc.rs
+20 −0 tests/testsuite/rustdoc.rs
+185 −4 tests/testsuite/test.rs
+40 −7 tests/testsuite/tree.rs

0 comments on commit faa1d37

Please sign in to comment.