diff --git a/third_party/rust_crates/BUILD.gn b/third_party/rust_crates/BUILD.gn index 180315d25d91..604d952e85ea 100644 --- a/third_party/rust_crates/BUILD.gn +++ b/third_party/rust_crates/BUILD.gn @@ -1528,7 +1528,7 @@ rust_library("async-fs-v1_6_0") { rust_library("async-io-v1_12_0") { crate_name = "async_io" - crate_root = "//third_party/rust_crates/vendor/async-io-1.12.0/src/lib.rs" + crate_root = "//third_party/rust_crates/forks/async-io/src/lib.rs" output_name = "async_io-8cea39e881d5ae1e" configs -= [ "//build/config/rust:2018_idioms" ] diff --git a/third_party/rust_crates/Cargo.lock b/third_party/rust_crates/Cargo.lock index 283a25526afa..34c022d8a0ec 100644 --- a/third_party/rust_crates/Cargo.lock +++ b/third_party/rust_crates/Cargo.lock @@ -182,8 +182,6 @@ dependencies = [ [[package]] name = "async-io" version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c374dda1ed3e7d8f0d9ba58715f924862c63eae6849c92d3a18e7fbde9e2794" dependencies = [ "async-lock", "autocfg 1.1.0", diff --git a/third_party/rust_crates/Cargo.toml b/third_party/rust_crates/Cargo.toml index e47e496f3e32..3e60d7d40e28 100644 --- a/third_party/rust_crates/Cargo.toml +++ b/third_party/rust_crates/Cargo.toml @@ -341,6 +341,7 @@ windows = { path = "empty/windows" } windows-sys = { path = "empty/windows-sys" } ### Forks: vendored crates whose code doesn't match the upstream version +async-io = { path = "forks/async-io" } fatfs = { path = "forks/fatfs" } fuse3 = { path = "forks/fuse3" } hound = { path = "forks/hound" } diff --git a/third_party/rust_crates/vendor/async-io-1.12.0/.cargo-checksum.json b/third_party/rust_crates/forks/async-io/.cargo-checksum.json similarity index 100% rename from third_party/rust_crates/vendor/async-io-1.12.0/.cargo-checksum.json rename to third_party/rust_crates/forks/async-io/.cargo-checksum.json diff --git a/third_party/rust_crates/vendor/async-io-1.12.0/CHANGELOG.md b/third_party/rust_crates/forks/async-io/CHANGELOG.md similarity index 100% rename from third_party/rust_crates/vendor/async-io-1.12.0/CHANGELOG.md rename to third_party/rust_crates/forks/async-io/CHANGELOG.md diff --git a/third_party/rust_crates/vendor/async-io-1.12.0/Cargo.lock b/third_party/rust_crates/forks/async-io/Cargo.lock similarity index 100% rename from third_party/rust_crates/vendor/async-io-1.12.0/Cargo.lock rename to third_party/rust_crates/forks/async-io/Cargo.lock diff --git a/third_party/rust_crates/vendor/async-io-1.12.0/Cargo.toml b/third_party/rust_crates/forks/async-io/Cargo.toml similarity index 100% rename from third_party/rust_crates/vendor/async-io-1.12.0/Cargo.toml rename to third_party/rust_crates/forks/async-io/Cargo.toml diff --git a/third_party/rust_crates/vendor/async-io-1.12.0/LICENSE-APACHE b/third_party/rust_crates/forks/async-io/LICENSE-APACHE similarity index 100% rename from third_party/rust_crates/vendor/async-io-1.12.0/LICENSE-APACHE rename to third_party/rust_crates/forks/async-io/LICENSE-APACHE diff --git a/third_party/rust_crates/vendor/async-io-1.12.0/LICENSE-MIT b/third_party/rust_crates/forks/async-io/LICENSE-MIT similarity index 100% rename from third_party/rust_crates/vendor/async-io-1.12.0/LICENSE-MIT rename to third_party/rust_crates/forks/async-io/LICENSE-MIT diff --git a/third_party/rust_crates/vendor/async-io-1.12.0/OWNERS b/third_party/rust_crates/forks/async-io/OWNERS similarity index 100% rename from third_party/rust_crates/vendor/async-io-1.12.0/OWNERS rename to third_party/rust_crates/forks/async-io/OWNERS diff --git a/third_party/rust_crates/forks/async-io/README.fuchsia b/third_party/rust_crates/forks/async-io/README.fuchsia new file mode 100644 index 000000000000..9506808e6c66 --- /dev/null +++ b/third_party/rust_crates/forks/async-io/README.fuchsia @@ -0,0 +1,17 @@ +Name: async-io +License File: LICENSE-APACHE +Description: + +async-io is used only on the host side to provide async usage of *nix IO primitives. + +This is mainline, but will soon incorporate the patch from +https://github.com/smol-rs/async-io/pull/79/commits/71cd97d34ed8c652074b61ed4093b475e2fb4fdd +. + +This will be async-io mainline (~1.12.0) with a patch. + +There is nothing else special about this release the fork is cut from mainline. + +This fork can be removed if the pull request is rolled into mainline and a +release is cut, but upstream is in a semi-abandoned state so this may not happen +soon. diff --git a/third_party/rust_crates/vendor/async-io-1.12.0/README.md b/third_party/rust_crates/forks/async-io/README.md similarity index 100% rename from third_party/rust_crates/vendor/async-io-1.12.0/README.md rename to third_party/rust_crates/forks/async-io/README.md diff --git a/third_party/rust_crates/vendor/async-io-1.12.0/benches/io.rs b/third_party/rust_crates/forks/async-io/benches/io.rs similarity index 100% rename from third_party/rust_crates/vendor/async-io-1.12.0/benches/io.rs rename to third_party/rust_crates/forks/async-io/benches/io.rs diff --git a/third_party/rust_crates/vendor/async-io-1.12.0/build.rs b/third_party/rust_crates/forks/async-io/build.rs similarity index 100% rename from third_party/rust_crates/vendor/async-io-1.12.0/build.rs rename to third_party/rust_crates/forks/async-io/build.rs diff --git a/third_party/rust_crates/vendor/async-io-1.12.0/examples/linux-inotify.rs b/third_party/rust_crates/forks/async-io/examples/linux-inotify.rs similarity index 100% rename from third_party/rust_crates/vendor/async-io-1.12.0/examples/linux-inotify.rs rename to third_party/rust_crates/forks/async-io/examples/linux-inotify.rs diff --git a/third_party/rust_crates/vendor/async-io-1.12.0/examples/linux-timerfd.rs b/third_party/rust_crates/forks/async-io/examples/linux-timerfd.rs similarity index 100% rename from third_party/rust_crates/vendor/async-io-1.12.0/examples/linux-timerfd.rs rename to third_party/rust_crates/forks/async-io/examples/linux-timerfd.rs diff --git a/third_party/rust_crates/vendor/async-io-1.12.0/examples/unix-signal.rs b/third_party/rust_crates/forks/async-io/examples/unix-signal.rs similarity index 100% rename from third_party/rust_crates/vendor/async-io-1.12.0/examples/unix-signal.rs rename to third_party/rust_crates/forks/async-io/examples/unix-signal.rs diff --git a/third_party/rust_crates/vendor/async-io-1.12.0/examples/windows-uds.rs b/third_party/rust_crates/forks/async-io/examples/windows-uds.rs similarity index 100% rename from third_party/rust_crates/vendor/async-io-1.12.0/examples/windows-uds.rs rename to third_party/rust_crates/forks/async-io/examples/windows-uds.rs diff --git a/third_party/rust_crates/vendor/async-io-1.12.0/src/driver.rs b/third_party/rust_crates/forks/async-io/src/driver.rs similarity index 100% rename from third_party/rust_crates/vendor/async-io-1.12.0/src/driver.rs rename to third_party/rust_crates/forks/async-io/src/driver.rs diff --git a/third_party/rust_crates/vendor/async-io-1.12.0/src/lib.rs b/third_party/rust_crates/forks/async-io/src/lib.rs similarity index 100% rename from third_party/rust_crates/vendor/async-io-1.12.0/src/lib.rs rename to third_party/rust_crates/forks/async-io/src/lib.rs diff --git a/third_party/rust_crates/vendor/async-io-1.12.0/src/reactor.rs b/third_party/rust_crates/forks/async-io/src/reactor.rs similarity index 100% rename from third_party/rust_crates/vendor/async-io-1.12.0/src/reactor.rs rename to third_party/rust_crates/forks/async-io/src/reactor.rs diff --git a/third_party/rust_crates/vendor/async-io-1.12.0/tests/async.rs b/third_party/rust_crates/forks/async-io/tests/async.rs similarity index 100% rename from third_party/rust_crates/vendor/async-io-1.12.0/tests/async.rs rename to third_party/rust_crates/forks/async-io/tests/async.rs diff --git a/third_party/rust_crates/vendor/async-io-1.12.0/tests/timer.rs b/third_party/rust_crates/forks/async-io/tests/timer.rs similarity index 100% rename from third_party/rust_crates/vendor/async-io-1.12.0/tests/timer.rs rename to third_party/rust_crates/forks/async-io/tests/timer.rs