Skip to content

Commit 6470169

Browse files
committed
Auto merge of #71642 - ehuss:update-cargo, r=ehuss
Update cargo 11 commits in 8751eb3010d4cdb5329b5a6bd2b6d765c95b0dca..90931d9b31e8b854522fed00916504a3ac6d8619 2020-04-21 18:04:35 +0000 to 2020-04-28 01:56:59 +0000 - Use associated constants directly on primitive types instead of modules (rust-lang/cargo#8077) - Clear `RUSTDOCFLAGS` before running tests (rust-lang/cargo#8168) - Fix warning for `resolve` mismatch in workspace. (rust-lang/cargo#8169) - Fix flaky linking_interrupted test. (rust-lang/cargo#8162) - Fixed some unnecessary borrows and clones. (rust-lang/cargo#8146) - Added warning when using restricted names in Windows. (rust-lang/cargo#8136) - Add changelog about dylib uplift. (rust-lang/cargo#8161) - Mention that cargo_metadata can parse json messages (rust-lang/cargo#8158) - Re-enable rustc-info-cache test again (rust-lang/cargo#8155) - Updates to path source walking. (rust-lang/cargo#8095) - Bump to 0.46.0, update changelog (rust-lang/cargo#8153)
2 parents db98d32 + f23db01 commit 6470169

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

Cargo.lock

+5-5
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ dependencies = [
292292

293293
[[package]]
294294
name = "cargo"
295-
version = "0.45.0"
295+
version = "0.46.0"
296296
dependencies = [
297297
"anyhow",
298298
"atty",
@@ -1251,9 +1251,9 @@ dependencies = [
12511251

12521252
[[package]]
12531253
name = "git2"
1254-
version = "0.13.2"
1254+
version = "0.13.5"
12551255
source = "registry+https://github.com/rust-lang/crates.io-index"
1256-
checksum = "2cfb93ca10f2934069c3aaafb753fbe0663f08ee009a01b6d62e062391447b15"
1256+
checksum = "e1e02a51cd90229028c9bd8be0a0364f85b6b3199cccaa0ef39005ddbd5ac165"
12571257
dependencies = [
12581258
"bitflags",
12591259
"libc",
@@ -1795,9 +1795,9 @@ dependencies = [
17951795

17961796
[[package]]
17971797
name = "libgit2-sys"
1798-
version = "0.12.3+1.0.0"
1798+
version = "0.12.5+1.0.0"
17991799
source = "registry+https://github.com/rust-lang/crates.io-index"
1800-
checksum = "7637dc15e7f05a16011723e0448655081fc01a374bcd368e2c9b9c7f5c5ab3ea"
1800+
checksum = "3eadeec65514971355bf7134967a543f71372f35b53ac6c7143e7bd157f07535"
18011801
dependencies = [
18021802
"cc",
18031803
"libc",

0 commit comments

Comments
 (0)