Skip to content

Commit

Permalink
Auto merge of rust-lang#79482 - faern:bump-dependencies-invalidly-ass…
Browse files Browse the repository at this point in the history
…uming-mem-layout, r=Mark-Simulacrum

Bump dependencies invalidly assuming memory layout of SocketAddr

Bumps net2, socket2 and miow.
Helps unblock rust-lang#78802

Done as separate PR since frequent lockfile collisions is a thing... And since the main PR can't be merged until large parts of the ecosystem uses the newer crates only, so we have to start somewhere.
  • Loading branch information
bors committed Nov 29, 2020
2 parents af780e5 + f9220c3 commit 88b8197
Showing 1 changed file with 14 additions and 14 deletions.
28 changes: 14 additions & 14 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ dependencies = [
"libgit2-sys",
"log",
"memchr",
"miow 0.3.5",
"miow 0.3.6",
"num_cpus",
"opener",
"openssl",
Expand Down Expand Up @@ -653,7 +653,7 @@ dependencies = [
"glob",
"lazy_static",
"libc",
"miow 0.3.5",
"miow 0.3.6",
"regex",
"rustfix",
"serde",
Expand All @@ -675,7 +675,7 @@ dependencies = [
"getopts",
"libc",
"log",
"miow 0.3.5",
"miow 0.3.6",
"regex",
"rustfix",
"serde",
Expand Down Expand Up @@ -2065,7 +2065,7 @@ dependencies = [
"kernel32-sys",
"libc",
"log",
"miow 0.2.1",
"miow 0.2.2",
"net2",
"slab",
"winapi 0.2.8",
Expand All @@ -2079,7 +2079,7 @@ checksum = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656"
dependencies = [
"log",
"mio",
"miow 0.3.5",
"miow 0.3.6",
"winapi 0.3.9",
]

Expand All @@ -2096,9 +2096,9 @@ dependencies = [

[[package]]
name = "miow"
version = "0.2.1"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d"
dependencies = [
"kernel32-sys",
"net2",
Expand All @@ -2108,9 +2108,9 @@ dependencies = [

[[package]]
name = "miow"
version = "0.3.5"
version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "07b88fb9795d4d36d62a012dfbf49a8f5cf12751f36d31a9dbe66d528e58979e"
checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897"
dependencies = [
"socket2",
"winapi 0.3.9",
Expand All @@ -2135,9 +2135,9 @@ dependencies = [

[[package]]
name = "net2"
version = "0.2.34"
version = "0.2.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2ba7c918ac76704fb42afcbbb43891e72731f3dcca3bef2a19786297baf14af7"
checksum = "d7cf75f38f16cb05ea017784dc6dbfd354f76c223dba37701734c4f5a9337d02"
dependencies = [
"cfg-if 0.1.10",
"libc",
Expand Down Expand Up @@ -2325,7 +2325,7 @@ dependencies = [
"futures",
"log",
"mio-named-pipes",
"miow 0.3.5",
"miow 0.3.6",
"rand",
"tokio",
"tokio-named-pipes",
Expand Down Expand Up @@ -4618,9 +4618,9 @@ checksum = "da73c8f77aebc0e40c300b93f0a5f1bece7a248a36eee287d4e095f35c7b7d6e"

[[package]]
name = "socket2"
version = "0.3.12"
version = "0.3.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "03088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918"
checksum = "7fd8b795c389288baa5f355489c65e71fd48a02104600d15c4cfbc561e9e429d"
dependencies = [
"cfg-if 0.1.10",
"libc",
Expand Down

0 comments on commit 88b8197

Please sign in to comment.