diff --git a/Cargo.lock b/Cargo.lock index aab1cdf3e..a01280e99 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1376,9 +1376,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.7.14" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" +checksum = "ba272f85fa0b41fc91872be579b3bbe0f56b792aa361a380eb669469f68dafb2" dependencies = [ "libc", "log", @@ -1574,7 +1574,17 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", "lock_api", - "parking_lot_core", + "parking_lot_core 0.8.5", +] + +[[package]] +name = "parking_lot" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58" +dependencies = [ + "lock_api", + "parking_lot_core 0.9.1", ] [[package]] @@ -1591,6 +1601,19 @@ dependencies = [ "winapi", ] +[[package]] +name = "parking_lot_core" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28141e0cc4143da2443301914478dc976a61ffdb3f043058310c70df2fed8954" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-sys", +] + [[package]] name = "paste" version = "0.1.18" @@ -1915,7 +1938,7 @@ dependencies = [ "cfg-if", "indoc", "libc", - "parking_lot", + "parking_lot 0.11.2", "paste", "pyo3-build-config", "pyo3-macros", @@ -2594,7 +2617,7 @@ checksum = "33994d0838dc2d152d17a62adf608a869b5e846b65b389af7f3dbc1de45c5b26" dependencies = [ "lazy_static", "new_debug_unreachable", - "parking_lot", + "parking_lot 0.11.2", "phf_shared 0.10.0", "precomputed-hash", "serde", @@ -2808,9 +2831,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.16.1" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c27a64b625de6d309e8c57716ba93021dccf1b3b5c97edd6d3dd2d2135afc0a" +checksum = "2af73ac49756f3f7c01172e34a23e5d0216f6c32333757c2c61feb2bbff5a5ee" dependencies = [ "bytes", "libc", @@ -2818,9 +2841,10 @@ dependencies = [ "mio", "num_cpus", "once_cell", - "parking_lot", + "parking_lot 0.12.0", "pin-project-lite", "signal-hook-registry", + "socket2", "tokio-macros", "winapi", ] @@ -3312,6 +3336,49 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows-sys" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3df6e476185f92a12c072be4a189a0210dcdcf512a1891d6dff9edb874deadc6" +dependencies = [ + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_msvc" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5" + +[[package]] +name = "windows_i686_gnu" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615" + +[[package]] +name = "windows_i686_msvc" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316" + [[package]] name = "winreg" version = "0.7.0" diff --git a/cargo/BUILD.bazel b/cargo/BUILD.bazel index d12d19d9f..a416a4628 100644 --- a/cargo/BUILD.bazel +++ b/cargo/BUILD.bazel @@ -482,7 +482,7 @@ alias( alias( name = "tokio", - actual = "@raze__tokio__1_16_1//:tokio", + actual = "@raze__tokio__1_17_0//:tokio", tags = [ "cargo-raze", "manual", diff --git a/cargo/BUILD.reqwest.native.bazel b/cargo/BUILD.reqwest.native.bazel index bb00e8cb6..60a72643a 100644 --- a/cargo/BUILD.reqwest.native.bazel +++ b/cargo/BUILD.reqwest.native.bazel @@ -109,7 +109,7 @@ rust_library( "@raze__native_tls__0_2_8//:native_tls", "@raze__percent_encoding__2_1_0//:percent_encoding", "@raze__pin_project_lite__0_2_8//:pin_project_lite", - "@raze__tokio__1_16_1//:tokio", + "@raze__tokio__1_17_0//:tokio", "@raze__tokio_native_tls__0_3_0//:tokio_native_tls", "@raze__tokio_socks__0_5_1//:tokio_socks", ], diff --git a/cargo/BUILD.reqwest.rustls.bazel b/cargo/BUILD.reqwest.rustls.bazel index c1b55de04..ce8760f7b 100644 --- a/cargo/BUILD.reqwest.rustls.bazel +++ b/cargo/BUILD.reqwest.rustls.bazel @@ -112,7 +112,7 @@ rust_library( "@raze__pin_project_lite__0_2_8//:pin_project_lite", "@raze__rustls__0_19_1//:rustls", "@raze__rustls_native_certs__0_5_0//:rustls_native_certs", - "@raze__tokio__1_16_1//:tokio", + "@raze__tokio__1_17_0//:tokio", "@raze__tokio_rustls__0_22_0//:tokio_rustls", "@raze__tokio_socks__0_5_1//:tokio_socks", "@raze__webpki_roots__0_21_1//:webpki_roots", diff --git a/cargo/crates.bzl b/cargo/crates.bzl index b1394f8b5..5e73ab2b0 100644 --- a/cargo/crates.bzl +++ b/cargo/crates.bzl @@ -1233,12 +1233,12 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__mio__0_7_14", - url = "https://crates.io/api/v1/crates/mio/0.7.14/download", + name = "raze__mio__0_8_0", + url = "https://crates.io/api/v1/crates/mio/0.8.0/download", type = "tar.gz", - sha256 = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc", - strip_prefix = "mio-0.7.14", - build_file = Label("//cargo/remote:BUILD.mio-0.7.14.bazel"), + sha256 = "ba272f85fa0b41fc91872be579b3bbe0f56b792aa361a380eb669469f68dafb2", + strip_prefix = "mio-0.8.0", + build_file = Label("//cargo/remote:BUILD.mio-0.8.0.bazel"), ) maybe( @@ -1431,6 +1431,16 @@ def raze_fetch_remote_crates(): build_file = Label("//cargo/remote:BUILD.parking_lot-0.11.2.bazel"), ) + maybe( + http_archive, + name = "raze__parking_lot__0_12_0", + url = "https://crates.io/api/v1/crates/parking_lot/0.12.0/download", + type = "tar.gz", + sha256 = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58", + strip_prefix = "parking_lot-0.12.0", + build_file = Label("//cargo/remote:BUILD.parking_lot-0.12.0.bazel"), + ) + maybe( http_archive, name = "raze__parking_lot_core__0_8_5", @@ -1441,6 +1451,16 @@ def raze_fetch_remote_crates(): build_file = Label("//cargo/remote:BUILD.parking_lot_core-0.8.5.bazel"), ) + maybe( + http_archive, + name = "raze__parking_lot_core__0_9_1", + url = "https://crates.io/api/v1/crates/parking_lot_core/0.9.1/download", + type = "tar.gz", + sha256 = "28141e0cc4143da2443301914478dc976a61ffdb3f043058310c70df2fed8954", + strip_prefix = "parking_lot_core-0.9.1", + build_file = Label("//cargo/remote:BUILD.parking_lot_core-0.9.1.bazel"), + ) + maybe( http_archive, name = "raze__paste__0_1_18", @@ -2563,12 +2583,12 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__tokio__1_16_1", - url = "https://crates.io/api/v1/crates/tokio/1.16.1/download", + name = "raze__tokio__1_17_0", + url = "https://crates.io/api/v1/crates/tokio/1.17.0/download", type = "tar.gz", - sha256 = "0c27a64b625de6d309e8c57716ba93021dccf1b3b5c97edd6d3dd2d2135afc0a", - strip_prefix = "tokio-1.16.1", - build_file = Label("//cargo/remote:BUILD.tokio-1.16.1.bazel"), + sha256 = "2af73ac49756f3f7c01172e34a23e5d0216f6c32333757c2c61feb2bbff5a5ee", + strip_prefix = "tokio-1.17.0", + build_file = Label("//cargo/remote:BUILD.tokio-1.17.0.bazel"), ) maybe( @@ -3121,6 +3141,66 @@ def raze_fetch_remote_crates(): build_file = Label("//cargo/remote:BUILD.winapi-x86_64-pc-windows-gnu-0.4.0.bazel"), ) + maybe( + http_archive, + name = "raze__windows_sys__0_32_0", + url = "https://crates.io/api/v1/crates/windows-sys/0.32.0/download", + type = "tar.gz", + sha256 = "3df6e476185f92a12c072be4a189a0210dcdcf512a1891d6dff9edb874deadc6", + strip_prefix = "windows-sys-0.32.0", + build_file = Label("//cargo/remote:BUILD.windows-sys-0.32.0.bazel"), + ) + + maybe( + http_archive, + name = "raze__windows_aarch64_msvc__0_32_0", + url = "https://crates.io/api/v1/crates/windows_aarch64_msvc/0.32.0/download", + type = "tar.gz", + sha256 = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5", + strip_prefix = "windows_aarch64_msvc-0.32.0", + build_file = Label("//cargo/remote:BUILD.windows_aarch64_msvc-0.32.0.bazel"), + ) + + maybe( + http_archive, + name = "raze__windows_i686_gnu__0_32_0", + url = "https://crates.io/api/v1/crates/windows_i686_gnu/0.32.0/download", + type = "tar.gz", + sha256 = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615", + strip_prefix = "windows_i686_gnu-0.32.0", + build_file = Label("//cargo/remote:BUILD.windows_i686_gnu-0.32.0.bazel"), + ) + + maybe( + http_archive, + name = "raze__windows_i686_msvc__0_32_0", + url = "https://crates.io/api/v1/crates/windows_i686_msvc/0.32.0/download", + type = "tar.gz", + sha256 = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172", + strip_prefix = "windows_i686_msvc-0.32.0", + build_file = Label("//cargo/remote:BUILD.windows_i686_msvc-0.32.0.bazel"), + ) + + maybe( + http_archive, + name = "raze__windows_x86_64_gnu__0_32_0", + url = "https://crates.io/api/v1/crates/windows_x86_64_gnu/0.32.0/download", + type = "tar.gz", + sha256 = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc", + strip_prefix = "windows_x86_64_gnu-0.32.0", + build_file = Label("//cargo/remote:BUILD.windows_x86_64_gnu-0.32.0.bazel"), + ) + + maybe( + http_archive, + name = "raze__windows_x86_64_msvc__0_32_0", + url = "https://crates.io/api/v1/crates/windows_x86_64_msvc/0.32.0/download", + type = "tar.gz", + sha256 = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316", + strip_prefix = "windows_x86_64_msvc-0.32.0", + build_file = Label("//cargo/remote:BUILD.windows_x86_64_msvc-0.32.0.bazel"), + ) + maybe( http_archive, name = "raze__winreg__0_7_0", diff --git a/cargo/licenses.json b/cargo/licenses.json index 50eafd8e3..b3f9d9bfd 100644 --- a/cargo/licenses.json +++ b/cargo/licenses.json @@ -982,7 +982,7 @@ }, { "name": "mio", - "version": "0.7.14", + "version": "0.8.0", "authors": "Carl Lerche |Thomas de Zeeuw |Tokio Contributors ", "repository": "https://github.com/tokio-rs/mio", "license": "MIT", @@ -1160,6 +1160,15 @@ "license_file": null, "description": "More compact and efficient implementations of the standard synchronization primitives." }, + { + "name": "parking_lot", + "version": "0.12.0", + "authors": "Amanieu d'Antras ", + "repository": "https://github.com/Amanieu/parking_lot", + "license": "Apache-2.0 OR MIT", + "license_file": null, + "description": "More compact and efficient implementations of the standard synchronization primitives." + }, { "name": "parking_lot_core", "version": "0.8.5", @@ -1169,6 +1178,15 @@ "license_file": null, "description": "An advanced API for creating custom synchronization primitives." }, + { + "name": "parking_lot_core", + "version": "0.9.1", + "authors": "Amanieu d'Antras ", + "repository": "https://github.com/Amanieu/parking_lot", + "license": "Apache-2.0 OR MIT", + "license_file": null, + "description": "An advanced API for creating custom synchronization primitives." + }, { "name": "pct-str", "version": "1.1.0", @@ -2062,7 +2080,7 @@ }, { "name": "tokio", - "version": "1.16.1", + "version": "1.17.0", "authors": "Tokio Contributors ", "repository": "https://github.com/tokio-rs/tokio", "license": "MIT", @@ -2546,6 +2564,60 @@ "license_file": null, "description": "Import libraries for the x86_64-pc-windows-gnu target. Please don't use this crate directly, depend on winapi instead." }, + { + "name": "windows-sys", + "version": "0.32.0", + "authors": "Microsoft", + "repository": "https://github.com/microsoft/windows-rs", + "license": "Apache-2.0 OR MIT", + "license_file": null, + "description": "Rust for Windows" + }, + { + "name": "windows_aarch64_msvc", + "version": "0.32.0", + "authors": "Microsoft", + "repository": null, + "license": "Apache-2.0 OR MIT", + "license_file": null, + "description": "Code gen support for the windows crate" + }, + { + "name": "windows_i686_gnu", + "version": "0.32.0", + "authors": "Microsoft", + "repository": null, + "license": "Apache-2.0 OR MIT", + "license_file": null, + "description": "Code gen support for the windows crate" + }, + { + "name": "windows_i686_msvc", + "version": "0.32.0", + "authors": "Microsoft", + "repository": null, + "license": "Apache-2.0 OR MIT", + "license_file": null, + "description": "Code gen support for the windows crate" + }, + { + "name": "windows_x86_64_gnu", + "version": "0.32.0", + "authors": "Microsoft", + "repository": null, + "license": "Apache-2.0 OR MIT", + "license_file": null, + "description": "Code gen support for the windows crate" + }, + { + "name": "windows_x86_64_msvc", + "version": "0.32.0", + "authors": "Microsoft", + "repository": null, + "license": "Apache-2.0 OR MIT", + "license_file": null, + "description": "Code gen support for the windows crate" + }, { "name": "winreg", "version": "0.7.0", diff --git a/cargo/remote/BUILD.h2-0.3.11.bazel b/cargo/remote/BUILD.h2-0.3.11.bazel index 6db9376d5..6ff740010 100644 --- a/cargo/remote/BUILD.h2-0.3.11.bazel +++ b/cargo/remote/BUILD.h2-0.3.11.bazel @@ -64,7 +64,7 @@ rust_library( "@raze__http__0_2_6//:http", "@raze__indexmap__1_8_0//:indexmap", "@raze__slab__0_4_5//:slab", - "@raze__tokio__1_16_1//:tokio", + "@raze__tokio__1_17_0//:tokio", "@raze__tokio_util__0_6_9//:tokio_util", "@raze__tracing__0_1_31//:tracing", ], diff --git a/cargo/remote/BUILD.hyper-0.14.17.bazel b/cargo/remote/BUILD.hyper-0.14.17.bazel index ff561ace5..c742ea14c 100644 --- a/cargo/remote/BUILD.hyper-0.14.17.bazel +++ b/cargo/remote/BUILD.hyper-0.14.17.bazel @@ -114,7 +114,7 @@ rust_library( "@raze__itoa__1_0_1//:itoa", "@raze__pin_project_lite__0_2_8//:pin_project_lite", "@raze__socket2__0_4_4//:socket2", - "@raze__tokio__1_16_1//:tokio", + "@raze__tokio__1_17_0//:tokio", "@raze__tower_service__0_3_1//:tower_service", "@raze__tracing__0_1_31//:tracing", "@raze__want__0_3_0//:want", diff --git a/cargo/remote/BUILD.hyper-rustls-0.22.1.bazel b/cargo/remote/BUILD.hyper-rustls-0.22.1.bazel index 488a4233e..596415c97 100644 --- a/cargo/remote/BUILD.hyper-rustls-0.22.1.bazel +++ b/cargo/remote/BUILD.hyper-rustls-0.22.1.bazel @@ -58,7 +58,7 @@ rust_library( "@raze__hyper__0_14_17//:hyper", "@raze__log__0_4_14//:log", "@raze__rustls__0_19_1//:rustls", - "@raze__tokio__1_16_1//:tokio", + "@raze__tokio__1_17_0//:tokio", "@raze__tokio_rustls__0_22_0//:tokio_rustls", "@raze__webpki__0_21_4//:webpki", ], diff --git a/cargo/remote/BUILD.hyper-timeout-0.4.1.bazel b/cargo/remote/BUILD.hyper-timeout-0.4.1.bazel index 70ac38976..e29e5726a 100644 --- a/cargo/remote/BUILD.hyper-timeout-0.4.1.bazel +++ b/cargo/remote/BUILD.hyper-timeout-0.4.1.bazel @@ -54,7 +54,7 @@ rust_library( deps = [ "@raze__hyper__0_14_17//:hyper", "@raze__pin_project_lite__0_2_8//:pin_project_lite", - "@raze__tokio__1_16_1//:tokio", + "@raze__tokio__1_17_0//:tokio", "@raze__tokio_io_timeout__1_1_1//:tokio_io_timeout", ], ) diff --git a/cargo/remote/BUILD.hyper-tls-0.5.0.bazel b/cargo/remote/BUILD.hyper-tls-0.5.0.bazel index 423fe752f..1aebdcdc5 100644 --- a/cargo/remote/BUILD.hyper-tls-0.5.0.bazel +++ b/cargo/remote/BUILD.hyper-tls-0.5.0.bazel @@ -55,7 +55,7 @@ rust_library( "@raze__bytes__1_1_0//:bytes", "@raze__hyper__0_14_17//:hyper", "@raze__native_tls__0_2_8//:native_tls", - "@raze__tokio__1_16_1//:tokio", + "@raze__tokio__1_17_0//:tokio", "@raze__tokio_native_tls__0_3_0//:tokio_native_tls", ], ) diff --git a/cargo/remote/BUILD.mio-0.7.14.bazel b/cargo/remote/BUILD.mio-0.8.0.bazel similarity index 96% rename from cargo/remote/BUILD.mio-0.7.14.bazel rename to cargo/remote/BUILD.mio-0.8.0.bazel index 9935e6177..c341e10d2 100644 --- a/cargo/remote/BUILD.mio-0.7.14.bazel +++ b/cargo/remote/BUILD.mio-0.8.0.bazel @@ -45,10 +45,6 @@ rust_library( "net", "os-ext", "os-poll", - "os-util", - "tcp", - "udp", - "uds", ], crate_root = "src/lib.rs", data = [], @@ -61,7 +57,7 @@ rust_library( "crate-name=mio", "manual", ], - version = "0.7.14", + version = "0.8.0", # buildifier: leave-alone deps = [ "@raze__log__0_4_14//:log", diff --git a/cargo/remote/BUILD.parking_lot-0.12.0.bazel b/cargo/remote/BUILD.parking_lot-0.12.0.bazel new file mode 100644 index 000000000..f6314f1f9 --- /dev/null +++ b/cargo/remote/BUILD.parking_lot-0.12.0.bazel @@ -0,0 +1,59 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +# buildifier: disable=load +load( + "@rules_rust//rust:defs.bzl", + "rust_binary", + "rust_library", + "rust_proc_macro", + "rust_test", +) + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//cargo", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # Apache-2.0 from expression "Apache-2.0 OR MIT" +]) + +# Generated Targets + +rust_library( + name = "parking_lot", + srcs = glob(["**/*.rs"]), + crate_features = [ + "default", + ], + crate_root = "src/lib.rs", + data = [], + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "crate-name=parking_lot", + "manual", + ], + version = "0.12.0", + # buildifier: leave-alone + deps = [ + "@raze__lock_api__0_4_6//:lock_api", + "@raze__parking_lot_core__0_9_1//:parking_lot_core", + ], +) + +# Unsupported target "issue_203" with type "test" omitted diff --git a/cargo/remote/BUILD.parking_lot_core-0.9.1.bazel b/cargo/remote/BUILD.parking_lot_core-0.9.1.bazel new file mode 100644 index 000000000..508cd43c8 --- /dev/null +++ b/cargo/remote/BUILD.parking_lot_core-0.9.1.bazel @@ -0,0 +1,129 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +# buildifier: disable=load +load( + "@rules_rust//rust:defs.bzl", + "rust_binary", + "rust_library", + "rust_proc_macro", + "rust_test", +) + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//cargo", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # Apache-2.0 from expression "Apache-2.0 OR MIT" +]) + +# Generated Targets +# buildifier: disable=out-of-order-load +# buildifier: disable=load-on-top +load( + "@rules_rust//cargo:cargo_build_script.bzl", + "cargo_build_script", +) + +cargo_build_script( + name = "parking_lot_core_build_script", + srcs = glob(["**/*.rs"]), + build_script_env = { + }, + crate_features = [ + ], + crate_root = "build.rs", + data = glob(["**"]), + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "manual", + ], + version = "0.9.1", + visibility = ["//visibility:private"], + deps = [ + ] + selects.with_or({ + # cfg(unix) + ( + "@rules_rust//rust/platform:x86_64-apple-darwin", + "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", + "@rules_rust//rust/platform:aarch64-apple-darwin", + "@rules_rust//rust/platform:aarch64-apple-ios", + "@rules_rust//rust/platform:aarch64-unknown-linux-gnu", + "@rules_rust//rust/platform:x86_64-apple-ios", + ): [ + ], + "//conditions:default": [], + }) + selects.with_or({ + # cfg(windows) + ( + "@rules_rust//rust/platform:x86_64-pc-windows-msvc", + ): [ + "@raze__windows_sys__0_32_0//:windows_sys", + ], + "//conditions:default": [], + }), +) + +rust_library( + name = "parking_lot_core", + srcs = glob(["**/*.rs"]), + aliases = { + }, + crate_features = [ + ], + crate_root = "src/lib.rs", + data = [], + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "crate-name=parking_lot_core", + "manual", + ], + version = "0.9.1", + # buildifier: leave-alone + deps = [ + ":parking_lot_core_build_script", + "@raze__cfg_if__1_0_0//:cfg_if", + "@raze__smallvec__1_8_0//:smallvec", + ] + selects.with_or({ + # cfg(unix) + ( + "@rules_rust//rust/platform:x86_64-apple-darwin", + "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", + "@rules_rust//rust/platform:aarch64-apple-darwin", + "@rules_rust//rust/platform:aarch64-apple-ios", + "@rules_rust//rust/platform:aarch64-unknown-linux-gnu", + "@rules_rust//rust/platform:x86_64-apple-ios", + ): [ + "@raze__libc__0_2_119//:libc", + ], + "//conditions:default": [], + }) + selects.with_or({ + # cfg(windows) + ( + "@rules_rust//rust/platform:x86_64-pc-windows-msvc", + ): [ + "@raze__windows_sys__0_32_0//:windows_sys", + ], + "//conditions:default": [], + }), +) diff --git a/cargo/remote/BUILD.reqwest-0.11.3.bazel b/cargo/remote/BUILD.reqwest-0.11.3.bazel index 8bc397d3d..228746b81 100644 --- a/cargo/remote/BUILD.reqwest-0.11.3.bazel +++ b/cargo/remote/BUILD.reqwest-0.11.3.bazel @@ -124,7 +124,7 @@ rust_library( "@raze__pin_project_lite__0_2_8//:pin_project_lite", "@raze__rustls__0_19_1//:rustls", "@raze__rustls_native_certs__0_5_0//:rustls_native_certs", - "@raze__tokio__1_16_1//:tokio", + "@raze__tokio__1_17_0//:tokio", "@raze__tokio_native_tls__0_3_0//:tokio_native_tls", "@raze__tokio_rustls__0_22_0//:tokio_rustls", "@raze__tokio_socks__0_5_1//:tokio_socks", diff --git a/cargo/remote/BUILD.socket2-0.4.4.bazel b/cargo/remote/BUILD.socket2-0.4.4.bazel index 130070e5e..96f1fbe86 100644 --- a/cargo/remote/BUILD.socket2-0.4.4.bazel +++ b/cargo/remote/BUILD.socket2-0.4.4.bazel @@ -37,6 +37,7 @@ rust_library( aliases = { }, crate_features = [ + "all", ], crate_root = "src/lib.rs", data = [], diff --git a/cargo/remote/BUILD.tokio-1.16.1.bazel b/cargo/remote/BUILD.tokio-1.17.0.bazel similarity index 96% rename from cargo/remote/BUILD.tokio-1.16.1.bazel rename to cargo/remote/BUILD.tokio-1.17.0.bazel index 4ce6387c8..3fda0e546 100644 --- a/cargo/remote/BUILD.tokio-1.16.1.bazel +++ b/cargo/remote/BUILD.tokio-1.17.0.bazel @@ -56,6 +56,7 @@ rust_library( "rt-multi-thread", "signal", "signal-hook-registry", + "socket2", "sync", "time", "tokio-macros", @@ -75,16 +76,17 @@ rust_library( "crate-name=tokio", "manual", ], - version = "1.16.1", + version = "1.17.0", # buildifier: leave-alone deps = [ "@raze__bytes__1_1_0//:bytes", "@raze__memchr__2_4_1//:memchr", - "@raze__mio__0_7_14//:mio", + "@raze__mio__0_8_0//:mio", "@raze__num_cpus__1_13_1//:num_cpus", "@raze__once_cell__1_9_0//:once_cell", - "@raze__parking_lot__0_11_2//:parking_lot", + "@raze__parking_lot__0_12_0//:parking_lot", "@raze__pin_project_lite__0_2_8//:pin_project_lite", + "@raze__socket2__0_4_4//:socket2", ] + selects.with_or({ # cfg(unix) ( @@ -182,6 +184,8 @@ rust_library( # Unsupported target "io_write_int" with type "test" omitted +# Unsupported target "join_handle_panic" with type "test" omitted + # Unsupported target "macros_join" with type "test" omitted # Unsupported target "macros_pin" with type "test" omitted @@ -272,6 +276,8 @@ rust_library( # Unsupported target "task_builder" with type "test" omitted +# Unsupported target "task_join_set" with type "test" omitted + # Unsupported target "task_local" with type "test" omitted # Unsupported target "task_local_set" with type "test" omitted diff --git a/cargo/remote/BUILD.tokio-io-timeout-1.1.1.bazel b/cargo/remote/BUILD.tokio-io-timeout-1.1.1.bazel index 1639df7d5..f1e730fcf 100644 --- a/cargo/remote/BUILD.tokio-io-timeout-1.1.1.bazel +++ b/cargo/remote/BUILD.tokio-io-timeout-1.1.1.bazel @@ -51,6 +51,6 @@ rust_library( # buildifier: leave-alone deps = [ "@raze__pin_project_lite__0_2_8//:pin_project_lite", - "@raze__tokio__1_16_1//:tokio", + "@raze__tokio__1_17_0//:tokio", ], ) diff --git a/cargo/remote/BUILD.tokio-native-tls-0.3.0.bazel b/cargo/remote/BUILD.tokio-native-tls-0.3.0.bazel index 8ab0e6c3c..515e1c1e6 100644 --- a/cargo/remote/BUILD.tokio-native-tls-0.3.0.bazel +++ b/cargo/remote/BUILD.tokio-native-tls-0.3.0.bazel @@ -55,7 +55,7 @@ rust_library( # buildifier: leave-alone deps = [ "@raze__native_tls__0_2_8//:native_tls", - "@raze__tokio__1_16_1//:tokio", + "@raze__tokio__1_17_0//:tokio", ], ) diff --git a/cargo/remote/BUILD.tokio-rustls-0.22.0.bazel b/cargo/remote/BUILD.tokio-rustls-0.22.0.bazel index 1a0b6403f..1fc21b3d4 100644 --- a/cargo/remote/BUILD.tokio-rustls-0.22.0.bazel +++ b/cargo/remote/BUILD.tokio-rustls-0.22.0.bazel @@ -51,7 +51,7 @@ rust_library( # buildifier: leave-alone deps = [ "@raze__rustls__0_19_1//:rustls", - "@raze__tokio__1_16_1//:tokio", + "@raze__tokio__1_17_0//:tokio", "@raze__webpki__0_21_4//:webpki", ], ) diff --git a/cargo/remote/BUILD.tokio-socks-0.5.1.bazel b/cargo/remote/BUILD.tokio-socks-0.5.1.bazel index 7a99bf409..07ac653dc 100644 --- a/cargo/remote/BUILD.tokio-socks-0.5.1.bazel +++ b/cargo/remote/BUILD.tokio-socks-0.5.1.bazel @@ -59,7 +59,7 @@ rust_library( "@raze__either__1_6_1//:either", "@raze__futures_util__0_3_21//:futures_util", "@raze__thiserror__1_0_30//:thiserror", - "@raze__tokio__1_16_1//:tokio", + "@raze__tokio__1_17_0//:tokio", ], ) diff --git a/cargo/remote/BUILD.tokio-util-0.6.9.bazel b/cargo/remote/BUILD.tokio-util-0.6.9.bazel index bb81372dc..5e426285b 100644 --- a/cargo/remote/BUILD.tokio-util-0.6.9.bazel +++ b/cargo/remote/BUILD.tokio-util-0.6.9.bazel @@ -58,7 +58,7 @@ rust_library( "@raze__futures_sink__0_3_21//:futures_sink", "@raze__log__0_4_14//:log", "@raze__pin_project_lite__0_2_8//:pin_project_lite", - "@raze__tokio__1_16_1//:tokio", + "@raze__tokio__1_17_0//:tokio", ], ) diff --git a/cargo/remote/BUILD.winapi-0.3.9.bazel b/cargo/remote/BUILD.winapi-0.3.9.bazel index 6beb6cfd5..bdacd95c9 100644 --- a/cargo/remote/BUILD.winapi-0.3.9.bazel +++ b/cargo/remote/BUILD.winapi-0.3.9.bazel @@ -59,7 +59,6 @@ cargo_build_script( "minschannel", "minwinbase", "minwindef", - "mstcpip", "mswsock", "namedpipeapi", "ntdef", @@ -127,7 +126,6 @@ rust_library( "minschannel", "minwinbase", "minwindef", - "mstcpip", "mswsock", "namedpipeapi", "ntdef", diff --git a/cargo/remote/BUILD.windows-sys-0.32.0.bazel b/cargo/remote/BUILD.windows-sys-0.32.0.bazel new file mode 100644 index 000000000..1a87145c3 --- /dev/null +++ b/cargo/remote/BUILD.windows-sys-0.32.0.bazel @@ -0,0 +1,71 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +# buildifier: disable=load +load( + "@rules_rust//rust:defs.bzl", + "rust_binary", + "rust_library", + "rust_proc_macro", + "rust_test", +) + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//cargo", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # MIT from expression "MIT OR Apache-2.0" +]) + +# Generated Targets + +rust_library( + name = "windows_sys", + srcs = glob(["**/*.rs"]), + aliases = { + }, + crate_features = [ + "Win32", + "Win32_Foundation", + "Win32_System", + "Win32_System_LibraryLoader", + "Win32_System_SystemServices", + "Win32_System_WindowsProgramming", + "default", + ], + crate_root = "src/lib.rs", + data = [], + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "crate-name=windows-sys", + "manual", + ], + version = "0.32.0", + # buildifier: leave-alone + deps = [ + ] + selects.with_or({ + # x86_64-pc-windows-msvc + ( + "@rules_rust//rust/platform:x86_64-pc-windows-msvc", + ): [ + "@raze__windows_x86_64_msvc__0_32_0//:windows_x86_64_msvc", + ], + "//conditions:default": [], + }), +) diff --git a/cargo/remote/BUILD.windows_aarch64_msvc-0.32.0.bazel b/cargo/remote/BUILD.windows_aarch64_msvc-0.32.0.bazel new file mode 100644 index 000000000..efc75aefe --- /dev/null +++ b/cargo/remote/BUILD.windows_aarch64_msvc-0.32.0.bazel @@ -0,0 +1,84 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +# buildifier: disable=load +load( + "@rules_rust//rust:defs.bzl", + "rust_binary", + "rust_library", + "rust_proc_macro", + "rust_test", +) + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//cargo", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # MIT from expression "MIT OR Apache-2.0" +]) + +# Generated Targets +# buildifier: disable=out-of-order-load +# buildifier: disable=load-on-top +load( + "@rules_rust//cargo:cargo_build_script.bzl", + "cargo_build_script", +) + +cargo_build_script( + name = "windows_aarch64_msvc_build_script", + srcs = glob(["**/*.rs"]), + build_script_env = { + }, + crate_features = [ + ], + crate_root = "build.rs", + data = glob(["**"]), + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "manual", + ], + version = "0.32.0", + visibility = ["//visibility:private"], + deps = [ + ], +) + +rust_library( + name = "windows_aarch64_msvc", + srcs = glob(["**/*.rs"]), + crate_features = [ + ], + crate_root = "src/lib.rs", + data = [], + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "crate-name=windows_aarch64_msvc", + "manual", + ], + version = "0.32.0", + # buildifier: leave-alone + deps = [ + ":windows_aarch64_msvc_build_script", + ], +) diff --git a/cargo/remote/BUILD.windows_i686_gnu-0.32.0.bazel b/cargo/remote/BUILD.windows_i686_gnu-0.32.0.bazel new file mode 100644 index 000000000..31fefc2dd --- /dev/null +++ b/cargo/remote/BUILD.windows_i686_gnu-0.32.0.bazel @@ -0,0 +1,84 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +# buildifier: disable=load +load( + "@rules_rust//rust:defs.bzl", + "rust_binary", + "rust_library", + "rust_proc_macro", + "rust_test", +) + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//cargo", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # MIT from expression "MIT OR Apache-2.0" +]) + +# Generated Targets +# buildifier: disable=out-of-order-load +# buildifier: disable=load-on-top +load( + "@rules_rust//cargo:cargo_build_script.bzl", + "cargo_build_script", +) + +cargo_build_script( + name = "windows_i686_gnu_build_script", + srcs = glob(["**/*.rs"]), + build_script_env = { + }, + crate_features = [ + ], + crate_root = "build.rs", + data = glob(["**"]), + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "manual", + ], + version = "0.32.0", + visibility = ["//visibility:private"], + deps = [ + ], +) + +rust_library( + name = "windows_i686_gnu", + srcs = glob(["**/*.rs"]), + crate_features = [ + ], + crate_root = "src/lib.rs", + data = [], + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "crate-name=windows_i686_gnu", + "manual", + ], + version = "0.32.0", + # buildifier: leave-alone + deps = [ + ":windows_i686_gnu_build_script", + ], +) diff --git a/cargo/remote/BUILD.windows_i686_msvc-0.32.0.bazel b/cargo/remote/BUILD.windows_i686_msvc-0.32.0.bazel new file mode 100644 index 000000000..7a349281f --- /dev/null +++ b/cargo/remote/BUILD.windows_i686_msvc-0.32.0.bazel @@ -0,0 +1,84 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +# buildifier: disable=load +load( + "@rules_rust//rust:defs.bzl", + "rust_binary", + "rust_library", + "rust_proc_macro", + "rust_test", +) + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//cargo", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # MIT from expression "MIT OR Apache-2.0" +]) + +# Generated Targets +# buildifier: disable=out-of-order-load +# buildifier: disable=load-on-top +load( + "@rules_rust//cargo:cargo_build_script.bzl", + "cargo_build_script", +) + +cargo_build_script( + name = "windows_i686_msvc_build_script", + srcs = glob(["**/*.rs"]), + build_script_env = { + }, + crate_features = [ + ], + crate_root = "build.rs", + data = glob(["**"]), + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "manual", + ], + version = "0.32.0", + visibility = ["//visibility:private"], + deps = [ + ], +) + +rust_library( + name = "windows_i686_msvc", + srcs = glob(["**/*.rs"]), + crate_features = [ + ], + crate_root = "src/lib.rs", + data = [], + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "crate-name=windows_i686_msvc", + "manual", + ], + version = "0.32.0", + # buildifier: leave-alone + deps = [ + ":windows_i686_msvc_build_script", + ], +) diff --git a/cargo/remote/BUILD.windows_x86_64_gnu-0.32.0.bazel b/cargo/remote/BUILD.windows_x86_64_gnu-0.32.0.bazel new file mode 100644 index 000000000..608350902 --- /dev/null +++ b/cargo/remote/BUILD.windows_x86_64_gnu-0.32.0.bazel @@ -0,0 +1,84 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +# buildifier: disable=load +load( + "@rules_rust//rust:defs.bzl", + "rust_binary", + "rust_library", + "rust_proc_macro", + "rust_test", +) + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//cargo", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # MIT from expression "MIT OR Apache-2.0" +]) + +# Generated Targets +# buildifier: disable=out-of-order-load +# buildifier: disable=load-on-top +load( + "@rules_rust//cargo:cargo_build_script.bzl", + "cargo_build_script", +) + +cargo_build_script( + name = "windows_x86_64_gnu_build_script", + srcs = glob(["**/*.rs"]), + build_script_env = { + }, + crate_features = [ + ], + crate_root = "build.rs", + data = glob(["**"]), + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "manual", + ], + version = "0.32.0", + visibility = ["//visibility:private"], + deps = [ + ], +) + +rust_library( + name = "windows_x86_64_gnu", + srcs = glob(["**/*.rs"]), + crate_features = [ + ], + crate_root = "src/lib.rs", + data = [], + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "crate-name=windows_x86_64_gnu", + "manual", + ], + version = "0.32.0", + # buildifier: leave-alone + deps = [ + ":windows_x86_64_gnu_build_script", + ], +) diff --git a/cargo/remote/BUILD.windows_x86_64_msvc-0.32.0.bazel b/cargo/remote/BUILD.windows_x86_64_msvc-0.32.0.bazel new file mode 100644 index 000000000..a00b33cde --- /dev/null +++ b/cargo/remote/BUILD.windows_x86_64_msvc-0.32.0.bazel @@ -0,0 +1,84 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +# buildifier: disable=load +load( + "@rules_rust//rust:defs.bzl", + "rust_binary", + "rust_library", + "rust_proc_macro", + "rust_test", +) + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//cargo", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # MIT from expression "MIT OR Apache-2.0" +]) + +# Generated Targets +# buildifier: disable=out-of-order-load +# buildifier: disable=load-on-top +load( + "@rules_rust//cargo:cargo_build_script.bzl", + "cargo_build_script", +) + +cargo_build_script( + name = "windows_x86_64_msvc_build_script", + srcs = glob(["**/*.rs"]), + build_script_env = { + }, + crate_features = [ + ], + crate_root = "build.rs", + data = glob(["**"]), + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "manual", + ], + version = "0.32.0", + visibility = ["//visibility:private"], + deps = [ + ], +) + +rust_library( + name = "windows_x86_64_msvc", + srcs = glob(["**/*.rs"]), + crate_features = [ + ], + crate_root = "src/lib.rs", + data = [], + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "crate-name=windows_x86_64_msvc", + "manual", + ], + version = "0.32.0", + # buildifier: leave-alone + deps = [ + ":windows_x86_64_msvc_build_script", + ], +) diff --git a/defs.bzl b/defs.bzl index 1486f1429..ee63a1ed0 100644 --- a/defs.bzl +++ b/defs.bzl @@ -20,6 +20,7 @@ def setup_deps(): rust_repositories( edition = "2021", include_rustc_srcs = False, + version = "1.58.1", ) raze_fetch_remote_crates() diff --git a/pylib/rsbridge/cargo/BUILD.bazel b/pylib/rsbridge/cargo/BUILD.bazel index ce3b7b372..5c53f75b4 100644 --- a/pylib/rsbridge/cargo/BUILD.bazel +++ b/pylib/rsbridge/cargo/BUILD.bazel @@ -482,7 +482,7 @@ alias( alias( name = "tokio", - actual = "@raze__tokio__1_16_1//:tokio", + actual = "@raze__tokio__1_17_0//:tokio", tags = [ "cargo-raze", "manual", diff --git a/repos.bzl b/repos.bzl index 285940f4b..9cfc900c7 100644 --- a/repos.bzl +++ b/repos.bzl @@ -33,11 +33,11 @@ def register_repos(): maybe( http_archive, name = "rules_rust", - strip_prefix = "rules_rust-67adb4c03feeb30d9af0d56f65fa2c9071b5e9a4", + strip_prefix = "rules_rust-adf2790f3ff063d909acd70aacdd2832756113a5", urls = [ - "https://github.com/bazelbuild/rules_rust/archive/67adb4c03feeb30d9af0d56f65fa2c9071b5e9a4.zip", + "https://github.com/bazelbuild/rules_rust/archive/adf2790f3ff063d909acd70aacdd2832756113a5.zip", ], - sha256 = "126c6e2de9996116932b976f17421f459a2d5443db0e881633c9d12e45d76fb0", + sha256 = "7277e9e58ec157c233fa571e27f684402c1c0711370ef8bf379af63bd31cbe8b", ) # maybe( diff --git a/rslib/Cargo.toml b/rslib/Cargo.toml index 15bd5d451..ea044f5a4 100644 --- a/rslib/Cargo.toml +++ b/rslib/Cargo.toml @@ -26,14 +26,13 @@ prost-build = "0.9.0" [dev-dependencies] env_logger = "0.9.0" -tokio = { version = "=1.16.1", features = ["macros"] } +tokio = { version = "1.17", features = ["macros"] } [dependencies] # pinned as any changes could invalidate sqlite indexes unicase = "=2.6.0" -# pinned due to windows_sys build failure on Windows+Bazel -tokio = { version = "=1.16.1", features = ["fs", "rt-multi-thread"] } +tokio = { version = "1.17", features = ["fs", "rt-multi-thread"] } anki_i18n = { path="i18n" } diff --git a/rslib/cargo/BUILD.bazel b/rslib/cargo/BUILD.bazel index ce3b7b372..5c53f75b4 100644 --- a/rslib/cargo/BUILD.bazel +++ b/rslib/cargo/BUILD.bazel @@ -482,7 +482,7 @@ alias( alias( name = "tokio", - actual = "@raze__tokio__1_16_1//:tokio", + actual = "@raze__tokio__1_17_0//:tokio", tags = [ "cargo-raze", "manual", diff --git a/rslib/i18n/cargo/BUILD.bazel b/rslib/i18n/cargo/BUILD.bazel index ce3b7b372..5c53f75b4 100644 --- a/rslib/i18n/cargo/BUILD.bazel +++ b/rslib/i18n/cargo/BUILD.bazel @@ -482,7 +482,7 @@ alias( alias( name = "tokio", - actual = "@raze__tokio__1_16_1//:tokio", + actual = "@raze__tokio__1_17_0//:tokio", tags = [ "cargo-raze", "manual", diff --git a/rslib/i18n_helpers/cargo/BUILD.bazel b/rslib/i18n_helpers/cargo/BUILD.bazel index ce3b7b372..5c53f75b4 100644 --- a/rslib/i18n_helpers/cargo/BUILD.bazel +++ b/rslib/i18n_helpers/cargo/BUILD.bazel @@ -482,7 +482,7 @@ alias( alias( name = "tokio", - actual = "@raze__tokio__1_16_1//:tokio", + actual = "@raze__tokio__1_17_0//:tokio", tags = [ "cargo-raze", "manual", diff --git a/rslib/linkchecker/cargo/BUILD.bazel b/rslib/linkchecker/cargo/BUILD.bazel index ce3b7b372..5c53f75b4 100644 --- a/rslib/linkchecker/cargo/BUILD.bazel +++ b/rslib/linkchecker/cargo/BUILD.bazel @@ -482,7 +482,7 @@ alias( alias( name = "tokio", - actual = "@raze__tokio__1_16_1//:tokio", + actual = "@raze__tokio__1_17_0//:tokio", tags = [ "cargo-raze", "manual", diff --git a/rslib/rustfmt.bzl b/rslib/rustfmt.bzl index d5bbdb8f5..15690632f 100644 --- a/rslib/rustfmt.bzl +++ b/rslib/rustfmt.bzl @@ -4,7 +4,7 @@ def _rustfmt_impl(ctx): toolchain = ctx.toolchains["@rules_rust//rust:toolchain"] script_name = ctx.label.name + "_script" - rustfmt = toolchain.rustfmt.path + rustfmt = toolchain.rustfmt.short_path if ctx.attr.is_windows: script_name += ".bat" rustfmt = "@" + rustfmt.replace("/", "\\")