diff options
| author | bors <bors@rust-lang.org> | 2019-03-13 18:26:45 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-03-13 18:26:45 +0000 |
| commit | 719b0d9849dab698c1ff0630313d068c7d561eae (patch) | |
| tree | b88369d16861b8a1c7ad165c3445cc672308fcbb | |
| parent | 8bf1f1c8f4100247c1f9b3d9b7aecea5c970263e (diff) | |
| parent | 4543245621ee788e52fe3c4f9e3a008eba9f80b1 (diff) | |
Auto merge of #59143 - ehuss:update-cargo, r=ehuss
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)
| -rw-r--r-- | Cargo.lock | 6 | ||||
| m--------- | src/tools/cargo | 0 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Cargo.lock b/Cargo.lock index 39ecc880097..27f7f59165b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -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)", @@ -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]] @@ -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" diff --git a/src/tools/cargo b/src/tools/cargo -Subproject 95b45eca19ac785263fed98ecefe540bb47337a +Subproject 0e35bd8af0ec72d3225c4819b330b94628f0e9d |