Skip to content

Commit

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

6 commits in 95b45eca19ac785263fed98ecefe540bb47337ac..0e35bd8af0ec72d3225c4819b330b94628f0e9d0
2019-03-06 19:24:30 +0000 to 2019-03-13 06:52:51 +0000
- Make `hg` optional for tests. (rust-lang/cargo#6739)
- Fingerprint build script deps only for path packages. (rust-lang/cargo#6734)
- Add --quiet option for `cargo test` (rust-lang/cargo#6358)
- .gitignore should end with a newline. (rust-lang/cargo#6732)
- Emit warning on misspelled environment variables (rust-lang/cargo#6694)
- Update glob requirement from 0.2.11 to 0.3.0 (rust-lang/cargo#6724)
  • Loading branch information
bors committed Mar 13, 2019
2 parents 8bf1f1c + 4543245 commit 719b0d9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ dependencies = [
"fwdansi 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"git2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
"git2-curl 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"home 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
"ignore 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
Expand Down Expand Up @@ -1009,7 +1009,7 @@ dependencies = [

[[package]]
name = "glob"
version = "0.2.11"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"

[[package]]
Expand Down Expand Up @@ -4083,7 +4083,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum getopts 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)" = "b900c08c1939860ce8b54dc6a89e26e00c04c380fd0e09796799bd7f12861e05"
"checksum git2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c7339329bfa14a00223244311560d11f8f489b453fb90092af97f267a6090ab0"
"checksum git2-curl 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d58551e903ed7e2d6fe3a2f3c7efa3a784ec29b19d0fbb035aaf0497c183fbdd"
"checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb"
"checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
"checksum globset 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4743617a7464bbda3c8aec8558ff2f9429047e025771037df561d383337ff865"
"checksum handlebars 0.32.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d89ec99d1594f285d4590fc32bac5f75cdab383f1123d504d27862c644a807dd"
"checksum handlebars 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d82e5750d8027a97b9640e3fefa66bbaf852a35228e1c90790efd13c4b09c166"
Expand Down
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 43 files
+1 −1 Cargo.toml
+3 −6 src/bin/cargo/cli.rs
+1 −0 src/bin/cargo/commands/bench.rs
+1 −0 src/bin/cargo/commands/build.rs
+1 −0 src/bin/cargo/commands/check.rs
+1 −0 src/bin/cargo/commands/clean.rs
+1 −0 src/bin/cargo/commands/doc.rs
+1 −0 src/bin/cargo/commands/fetch.rs
+1 −0 src/bin/cargo/commands/fix.rs
+1 −0 src/bin/cargo/commands/generate_lockfile.rs
+1 −0 src/bin/cargo/commands/git_checkout.rs
+1 −0 src/bin/cargo/commands/init.rs
+1 −0 src/bin/cargo/commands/install.rs
+1 −0 src/bin/cargo/commands/locate_project.rs
+1 −0 src/bin/cargo/commands/login.rs
+1 −0 src/bin/cargo/commands/metadata.rs
+1 −0 src/bin/cargo/commands/new.rs
+1 −0 src/bin/cargo/commands/owner.rs
+1 −0 src/bin/cargo/commands/package.rs
+1 −0 src/bin/cargo/commands/pkgid.rs
+1 −0 src/bin/cargo/commands/publish.rs
+1 −0 src/bin/cargo/commands/read_manifest.rs
+1 −0 src/bin/cargo/commands/run.rs
+1 −0 src/bin/cargo/commands/rustc.rs
+1 −0 src/bin/cargo/commands/rustdoc.rs
+1 −0 src/bin/cargo/commands/search.rs
+4 −0 src/bin/cargo/commands/test.rs
+1 −0 src/bin/cargo/commands/uninstall.rs
+1 −0 src/bin/cargo/commands/update.rs
+1 −0 src/bin/cargo/commands/verify_project.rs
+1 −0 src/bin/cargo/commands/version.rs
+1 −0 src/bin/cargo/commands/yank.rs
+2 −2 src/cargo/core/compiler/compilation.rs
+1 −2 src/cargo/core/compiler/context/mod.rs
+40 −27 src/cargo/core/compiler/fingerprint.rs
+21 −0 src/cargo/ops/cargo_compile.rs
+10 −8 src/cargo/ops/cargo_new.rs
+7 −1 src/cargo/ops/cargo_test.rs
+71 −1 tests/testsuite/init.rs
+1 −1 tests/testsuite/new.rs
+10 −0 tests/testsuite/rustdocflags.rs
+34 −0 tests/testsuite/rustflags.rs
+73 −0 tests/testsuite/test.rs

0 comments on commit 719b0d9

Please sign in to comment.