diff --git a/.cargo/config.in b/.cargo/config.in index 03c7875ee30dd7500f99686b8e1cbc04f86d6939..32b8158d99cba8c749f86d1856957e784a1de375 100644 --- a/.cargo/config.in +++ b/.cargo/config.in @@ -62,11 +62,6 @@ git = "https://github.com/badboy/failure" replace-with = "vendored-sources" rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" -[source."https://github.com/alexcrichton/mio-named-pipes"] -branch = "master" -git = "https://github.com/alexcrichton/mio-named-pipes" -replace-with = "vendored-sources" - [source."https://github.com/PLSysSec/rlbox_lucet_sandbox/"] git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/" replace-with = "vendored-sources" diff --git a/Cargo.lock b/Cargo.lock index 7f4619b956ccc47b9d06484f8ad6b2dc2b64257e..e1da431651531b4c44305d4408114e78b9af0d4d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -119,7 +119,7 @@ dependencies = [ [[package]] name = "audioipc" -version = "0.2.4" +version = "0.2.5" dependencies = [ "audio_thread_priority", "bincode", @@ -2558,7 +2558,8 @@ dependencies = [ [[package]] name = "mio-named-pipes" version = "0.1.6" -source = "git+https://github.com/alexcrichton/mio-named-pipes#2072ae0de5b3632dbb065fcd9c8be6c6a2fc39ae" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5e374eff525ce1c5b7687c4cef63943e7686524a387933ad27ca7ec43779cb3" dependencies = [ "log", "mio", diff --git a/media/audioipc/audioipc/Cargo.toml b/media/audioipc/audioipc/Cargo.toml index 7331d6e50c98b88941081c88a83e507de5c90e53..1a50c06cfd3c59dfbe8e101ac83f49afdc0989a2 100644 --- a/media/audioipc/audioipc/Cargo.toml +++ b/media/audioipc/audioipc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "audioipc" -version = "0.2.4" +version = "0.2.5" authors = [ "Matthew Gregan <kinetik@flim.org>", "Dan Glastonbury <dan.glastonbury@gmail.com>" @@ -31,7 +31,7 @@ tokio-reactor = "0.1" [target.'cfg(windows)'.dependencies] mio = "0.6.19" miow = "0.3.3" -mio-named-pipes = { git = "https://github.com/alexcrichton/mio-named-pipes" } +mio-named-pipes = "0.1.6" winapi = { version = "0.3.6", features = ["combaseapi", "objbase"] } [dependencies.error-chain] diff --git a/third_party/rust/mio-named-pipes/.cargo-checksum.json b/third_party/rust/mio-named-pipes/.cargo-checksum.json index e09233335ca8100477cee1aac1c0263120b0f475..56b6b685e7c1b606f5e0b1a1a6c1788b255283fe 100644 --- a/third_party/rust/mio-named-pipes/.cargo-checksum.json +++ b/third_party/rust/mio-named-pipes/.cargo-checksum.json @@ -1 +1 @@ -{"files":{"Cargo.toml":"2e062a21894df50c23cbe4d8ecec92bc7fcd84a71760b034f8052b4dd2dffce3","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"7b08962c6e08aa32089a76af7ba08553fbba42be7efae2e8f935baa7e34394ca","appveyor.yml":"0bd9b8e5a94a36972b37227cc59984fc6ec01b4ee4b617ef20d0e3acd19f44b1","src/from_raw_arc.rs":"c2cee14a0355256beb55a1feb54ccdcc50c8ab2d9abb3b7f114be00ed8a5583f","src/lib.rs":"6a950385c8ac24f2358401e84565cdf1afaf643d66879c0bc0786222fbc32d25","tests/smoke.rs":"567a8913569c03a3603a26a026b7ba4302ce8a33efa6a01b67a3cf531adf9419"},"package":null} \ No newline at end of file +{"files":{"Cargo.toml":"bad54ddc22173d3bcb894ccac64092fe7318d6dd430815f9b9723cee335b49d7","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"df073e581e30a7ebdc09b49a2943dc7b6d51ca865607fe46b8dcc91583bc50d8","appveyor.yml":"0bd9b8e5a94a36972b37227cc59984fc6ec01b4ee4b617ef20d0e3acd19f44b1","src/from_raw_arc.rs":"c2cee14a0355256beb55a1feb54ccdcc50c8ab2d9abb3b7f114be00ed8a5583f","src/lib.rs":"6a950385c8ac24f2358401e84565cdf1afaf643d66879c0bc0786222fbc32d25","tests/smoke.rs":"567a8913569c03a3603a26a026b7ba4302ce8a33efa6a01b67a3cf531adf9419"},"package":"f5e374eff525ce1c5b7687c4cef63943e7686524a387933ad27ca7ec43779cb3"} \ No newline at end of file diff --git a/third_party/rust/mio-named-pipes/Cargo.toml b/third_party/rust/mio-named-pipes/Cargo.toml index ab9410c52304a2fa996db7d7721da93a9a7d746f..966e0a52707c5538142c757adfed355c91ca7eb9 100644 --- a/third_party/rust/mio-named-pipes/Cargo.toml +++ b/third_party/rust/mio-named-pipes/Cargo.toml @@ -1,25 +1,40 @@ +# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO +# +# When uploading crates to the registry Cargo will automatically +# "normalize" Cargo.toml files for maximal compatibility +# with all versions of Cargo and also rewrite `path` dependencies +# to registry (e.g. crates.io) dependencies +# +# If you believe there's an error in this file please file an +# issue against the rust-lang/cargo repository. If you're +# editing this file be aware that the upstream Cargo.toml +# will likely look very different (and much more reasonable) + [package] name = "mio-named-pipes" version = "0.1.6" authors = ["Alex Crichton <alex@alexcrichton.com>"] -license = "MIT/Apache-2.0" -readme = "README.md" -repository = "https://github.com/alexcrichton/mio-named-pipes" +description = "Windows named pipe bindings for mio.\n" homepage = "https://github.com/alexcrichton/mio-named-pipes" documentation = "https://docs.rs/mio-named-pipes/0.1/x86_64-pc-windows-msvc/mio_named_pipes/" -description = """ -Windows named pipe bindings for mio. -""" +readme = "README.md" +license = "MIT/Apache-2.0" +repository = "https://github.com/alexcrichton/mio-named-pipes" +[dev-dependencies.env_logger] +version = "0.4" +default-features = false + +[dev-dependencies.rand] +version = "0.4" +[target."cfg(windows)".dependencies.log] +version = "0.4" -[target.'cfg(windows)'.dependencies] -log = "0.4" -mio = "0.6.5" -miow = "0.3" +[target."cfg(windows)".dependencies.mio] +version = "0.6.5" -[target.'cfg(windows)'.dependencies.winapi] +[target."cfg(windows)".dependencies.miow] version = "0.3" -features = ["winerror", "ioapiset", "minwinbase", "winbase"] -[dev-dependencies] -env_logger = { version = "0.4", default-features = false } -rand = "0.4" +[target."cfg(windows)".dependencies.winapi] +version = "0.3" +features = ["winerror", "ioapiset", "minwinbase", "winbase"] diff --git a/third_party/rust/mio-named-pipes/README.md b/third_party/rust/mio-named-pipes/README.md index 7290c61ae19bfdb6efb3b4c2b37afccdb5ea6123..6619f0b68cc1676693fea5eb4efb2826b86a8920 100644 --- a/third_party/rust/mio-named-pipes/README.md +++ b/third_party/rust/mio-named-pipes/README.md @@ -12,7 +12,7 @@ A library for integrating Windows [Named Pipes] with [mio]. ```toml # Cargo.toml [dependencies] -mio-named-pipes = "0.1" +mio-named-pipes = "0.6" mio = "0.6" ```