Skip to content

Commit

Permalink
Auto merge of rust-lang#77953 - ehuss:update-beta-cargo, r=Mark-Simul…
Browse files Browse the repository at this point in the history
…acrum

[beta] Update cargo

1 commits in 75615f8e69f748d7ef0df7bc0b064a9b1f5c78b2..65cbdd2dc0b7e877577474b98b7d071308d0bb6f
2020-09-29 18:42:19 +0000 to 2020-10-14 16:10:15 +0000
- [beta] backport libgit2 (rust-lang/cargo#8780)

This is primarily to bring in a fix for rust-lang/cargo#8517 which is starting to show up on rust-lang/rust's CI again.
  • Loading branch information
bors committed Oct 15, 2020
2 parents 212e76c + e21ccdc commit 4708ac7
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
16 changes: 8 additions & 8 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1249,9 +1249,9 @@ dependencies = [

[[package]]
name = "git2"
version = "0.13.8"
version = "0.13.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e6ac22e49b7d886b6802c66662b12609452248b1bc9e87d6d83ecea3db96f557"
checksum = "ca6f1a0238d7f8f8fd5ee642f4ebac4dbc03e03d1f78fbe7a3ede35dcf7e2224"
dependencies = [
"bitflags",
"libc",
Expand Down Expand Up @@ -1669,9 +1669,9 @@ dependencies = [

[[package]]
name = "libgit2-sys"
version = "0.12.9+1.0.1"
version = "0.12.14+1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b33bf3d9d4c45b48ae1ea7c334be69994624dc0a69f833d5d9f7605f24b552b"
checksum = "8f25af58e6495f7caf2919d08f212de550cfa3ed2f5e744988938ea292b9f549"
dependencies = [
"cc",
"libc",
Expand All @@ -1693,9 +1693,9 @@ dependencies = [

[[package]]
name = "libssh2-sys"
version = "0.2.18"
version = "0.2.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eafa907407504b0e683786d4aba47acf250f114d37357d56608333fd167dd0fc"
checksum = "ca46220853ba1c512fc82826d0834d87b06bcd3c2a42241b7de72f3d2fe17056"
dependencies = [
"cc",
"libc",
Expand Down Expand Up @@ -5076,9 +5076,9 @@ dependencies = [

[[package]]
name = "toml"
version = "0.5.6"
version = "0.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a"
checksum = "75cf45bb0bef80604d001caaec0d09da99611b3c0fd39d3080468875cdb65645"
dependencies = [
"serde",
]
Expand Down
2 changes: 1 addition & 1 deletion src/tools/cargo
2 changes: 1 addition & 1 deletion src/tools/publish_toolstate.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
'rust-by-example': {'steveklabnik', 'marioidival'},
'embedded-book': {'adamgreig', 'andre-richter', 'jamesmunns', 'therealprof'},
'edition-guide': {'ehuss', 'steveklabnik'},
'rustc-dev-guide': {'mark-i-m', 'spastorino', 'amanjeev', 'JohnTitor'},
'rustc-dev-guide': {'spastorino', 'amanjeev', 'JohnTitor'},
}

LABELS = {
Expand Down

0 comments on commit 4708ac7

Please sign in to comment.