From 78dd438666c4c63035076358741ffff7f6cd0e76 Mon Sep 17 00:00:00 2001 From: Piotr Sikora Date: Mon, 15 Mar 2021 05:30:49 +0000 Subject: [PATCH] Update hashbrown to v0.11.0. Signed-off-by: Piotr Sikora --- Cargo.toml | 2 +- bazel/cargo/BUILD.bazel | 2 +- bazel/cargo/Cargo.raze.lock | 25 ++- bazel/cargo/crates.bzl | 40 +++-- bazel/cargo/remote/BUILD.ahash-0.7.2.bazel | 162 ++++++++++++++++++ ...9.1.bazel => BUILD.hashbrown-0.11.0.bazel} | 4 +- .../cargo/remote/BUILD.once_cell-1.7.2.bazel | 72 ++++++++ ....bazel => BUILD.version_check-0.9.2.bazel} | 16 +- 8 files changed, 292 insertions(+), 31 deletions(-) create mode 100644 bazel/cargo/remote/BUILD.ahash-0.7.2.bazel rename bazel/cargo/remote/{BUILD.hashbrown-0.9.1.bazel => BUILD.hashbrown-0.11.0.bazel} (95%) create mode 100644 bazel/cargo/remote/BUILD.once_cell-1.7.2.bazel rename bazel/cargo/remote/{BUILD.ahash-0.4.7.bazel => BUILD.version_check-0.9.2.bazel} (73%) diff --git a/Cargo.toml b/Cargo.toml index dd0937ac..88bb0d7c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,7 @@ edition = "2018" wee-alloc = ["wee_alloc"] [dependencies] -hashbrown = "0.9" +hashbrown = "0.11" log = "0.4" wee_alloc = { version = "0.4", optional = true } diff --git a/bazel/cargo/BUILD.bazel b/bazel/cargo/BUILD.bazel index b9db7826..e4466ae4 100644 --- a/bazel/cargo/BUILD.bazel +++ b/bazel/cargo/BUILD.bazel @@ -41,7 +41,7 @@ alias( alias( name = "hashbrown", - actual = "@raze__hashbrown__0_9_1//:hashbrown", + actual = "@raze__hashbrown__0_11_0//:hashbrown", tags = [ "cargo-raze", "manual", diff --git a/bazel/cargo/Cargo.raze.lock b/bazel/cargo/Cargo.raze.lock index a24e6975..df94447e 100644 --- a/bazel/cargo/Cargo.raze.lock +++ b/bazel/cargo/Cargo.raze.lock @@ -2,9 +2,14 @@ # It is not intended for manual editing. [[package]] name = "ahash" -version = "0.4.7" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e" +checksum = "7f200cbb1e856866d9eade941cf3aa0c5d7dd36f74311c4273b494f4ef036957" +dependencies = [ + "getrandom", + "once_cell", + "version_check", +] [[package]] name = "autocfg" @@ -50,9 +55,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.9.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" +checksum = "362385356d610bd1e5a408ddf8d022041774b683f345a1d2cfcb4f60f8ae2db5" dependencies = [ "ahash", ] @@ -97,6 +102,12 @@ dependencies = [ "autocfg", ] +[[package]] +name = "once_cell" +version = "1.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" + [[package]] name = "proxy-wasm" version = "0.1.3" @@ -119,6 +130,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "version_check" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" + [[package]] name = "wasi" version = "0.10.2+wasi-snapshot-preview1" diff --git a/bazel/cargo/crates.bzl b/bazel/cargo/crates.bzl index 4761233c..1c049b61 100644 --- a/bazel/cargo/crates.bzl +++ b/bazel/cargo/crates.bzl @@ -13,12 +13,12 @@ def raze_fetch_remote_crates(): """This function defines a collection of repos and should be called in a WORKSPACE file""" maybe( http_archive, - name = "raze__ahash__0_4_7", - url = "https://crates.io/api/v1/crates/ahash/0.4.7/download", + name = "raze__ahash__0_7_2", + url = "https://crates.io/api/v1/crates/ahash/0.7.2/download", type = "tar.gz", - sha256 = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e", - strip_prefix = "ahash-0.4.7", - build_file = Label("//bazel/cargo/remote:BUILD.ahash-0.4.7.bazel"), + sha256 = "7f200cbb1e856866d9eade941cf3aa0c5d7dd36f74311c4273b494f4ef036957", + strip_prefix = "ahash-0.7.2", + build_file = Label("//bazel/cargo/remote:BUILD.ahash-0.7.2.bazel"), ) maybe( @@ -63,12 +63,12 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__hashbrown__0_9_1", - url = "https://crates.io/api/v1/crates/hashbrown/0.9.1/download", + name = "raze__hashbrown__0_11_0", + url = "https://crates.io/api/v1/crates/hashbrown/0.11.0/download", type = "tar.gz", - sha256 = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04", - strip_prefix = "hashbrown-0.9.1", - build_file = Label("//bazel/cargo/remote:BUILD.hashbrown-0.9.1.bazel"), + sha256 = "362385356d610bd1e5a408ddf8d022041774b683f345a1d2cfcb4f60f8ae2db5", + strip_prefix = "hashbrown-0.11.0", + build_file = Label("//bazel/cargo/remote:BUILD.hashbrown-0.11.0.bazel"), ) maybe( @@ -111,6 +111,16 @@ def raze_fetch_remote_crates(): build_file = Label("//bazel/cargo/remote:BUILD.num-traits-0.2.14.bazel"), ) + maybe( + http_archive, + name = "raze__once_cell__1_7_2", + url = "https://crates.io/api/v1/crates/once_cell/1.7.2/download", + type = "tar.gz", + sha256 = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3", + strip_prefix = "once_cell-1.7.2", + build_file = Label("//bazel/cargo/remote:BUILD.once_cell-1.7.2.bazel"), + ) + maybe( http_archive, name = "raze__time__0_1_43", @@ -121,6 +131,16 @@ def raze_fetch_remote_crates(): build_file = Label("//bazel/cargo/remote:BUILD.time-0.1.43.bazel"), ) + maybe( + http_archive, + name = "raze__version_check__0_9_2", + url = "https://crates.io/api/v1/crates/version_check/0.9.2/download", + type = "tar.gz", + sha256 = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed", + strip_prefix = "version_check-0.9.2", + build_file = Label("//bazel/cargo/remote:BUILD.version_check-0.9.2.bazel"), + ) + maybe( http_archive, name = "raze__wasi__0_10_2_wasi_snapshot_preview1", diff --git a/bazel/cargo/remote/BUILD.ahash-0.7.2.bazel b/bazel/cargo/remote/BUILD.ahash-0.7.2.bazel new file mode 100644 index 00000000..ec6e7a57 --- /dev/null +++ b/bazel/cargo/remote/BUILD.ahash-0.7.2.bazel @@ -0,0 +1,162 @@ +""" +@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:rust.bzl", + "rust_binary", + "rust_library", + "rust_test", +) + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//bazel/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 = "ahash_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.7.2", + visibility = ["//visibility:private"], + deps = [ + "@raze__version_check__0_9_2//:version_check", + ] + selects.with_or({ + # cfg(any(target_os = "linux", target_os = "android", target_os = "windows", target_os = "macos", target_os = "ios", target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonfly", target_os = "solaris", target_os = "illumos", target_os = "fuchsia", target_os = "redox", target_os = "cloudabi", target_os = "haiku", target_os = "vxworks", target_os = "emscripten", target_os = "wasi")) + ( + "@rules_rust//rust/platform:aarch64-apple-darwin", + "@rules_rust//rust/platform:aarch64-apple-ios", + "@rules_rust//rust/platform:aarch64-linux-android", + "@rules_rust//rust/platform:aarch64-unknown-linux-gnu", + "@rules_rust//rust/platform:arm-unknown-linux-gnueabi", + "@rules_rust//rust/platform:i686-apple-darwin", + "@rules_rust//rust/platform:i686-linux-android", + "@rules_rust//rust/platform:i686-pc-windows-msvc", + "@rules_rust//rust/platform:i686-unknown-freebsd", + "@rules_rust//rust/platform:i686-unknown-linux-gnu", + "@rules_rust//rust/platform:powerpc-unknown-linux-gnu", + "@rules_rust//rust/platform:s390x-unknown-linux-gnu", + "@rules_rust//rust/platform:wasm32-wasi", + "@rules_rust//rust/platform:x86_64-apple-darwin", + "@rules_rust//rust/platform:x86_64-apple-ios", + "@rules_rust//rust/platform:x86_64-linux-android", + "@rules_rust//rust/platform:x86_64-pc-windows-msvc", + "@rules_rust//rust/platform:x86_64-unknown-freebsd", + "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", + ): [ + ], + "//conditions:default": [], + }) + selects.with_or({ + # cfg(not(any(target_os = "linux", target_os = "android", target_os = "windows", target_os = "macos", target_os = "ios", target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonfly", target_os = "solaris", target_os = "illumos", target_os = "fuchsia", target_os = "redox", target_os = "cloudabi", target_os = "haiku", target_os = "vxworks", target_os = "emscripten", target_os = "wasi"))) + ( + "@rules_rust//rust/platform:wasm32-unknown-unknown", + ): [ + ], + "//conditions:default": [], + }), +) + +# Unsupported target "ahash" with type "bench" omitted + +# Unsupported target "map" with type "bench" omitted + +rust_library( + name = "ahash", + srcs = glob(["**/*.rs"]), + aliases = { + }, + crate_features = [ + ], + crate_root = "src/lib.rs", + crate_type = "lib", + data = [], + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "manual", + ], + version = "0.7.2", + # buildifier: leave-alone + deps = [ + ":ahash_build_script", + ] + selects.with_or({ + # cfg(any(target_os = "linux", target_os = "android", target_os = "windows", target_os = "macos", target_os = "ios", target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonfly", target_os = "solaris", target_os = "illumos", target_os = "fuchsia", target_os = "redox", target_os = "cloudabi", target_os = "haiku", target_os = "vxworks", target_os = "emscripten", target_os = "wasi")) + ( + "@rules_rust//rust/platform:aarch64-apple-darwin", + "@rules_rust//rust/platform:aarch64-apple-ios", + "@rules_rust//rust/platform:aarch64-linux-android", + "@rules_rust//rust/platform:aarch64-unknown-linux-gnu", + "@rules_rust//rust/platform:arm-unknown-linux-gnueabi", + "@rules_rust//rust/platform:i686-apple-darwin", + "@rules_rust//rust/platform:i686-linux-android", + "@rules_rust//rust/platform:i686-pc-windows-msvc", + "@rules_rust//rust/platform:i686-unknown-freebsd", + "@rules_rust//rust/platform:i686-unknown-linux-gnu", + "@rules_rust//rust/platform:powerpc-unknown-linux-gnu", + "@rules_rust//rust/platform:s390x-unknown-linux-gnu", + "@rules_rust//rust/platform:wasm32-wasi", + "@rules_rust//rust/platform:x86_64-apple-darwin", + "@rules_rust//rust/platform:x86_64-apple-ios", + "@rules_rust//rust/platform:x86_64-linux-android", + "@rules_rust//rust/platform:x86_64-pc-windows-msvc", + "@rules_rust//rust/platform:x86_64-unknown-freebsd", + "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", + ): [ + "@raze__getrandom__0_2_2//:getrandom", + "@raze__once_cell__1_7_2//:once_cell", + ], + "//conditions:default": [], + }) + selects.with_or({ + # cfg(not(any(target_os = "linux", target_os = "android", target_os = "windows", target_os = "macos", target_os = "ios", target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonfly", target_os = "solaris", target_os = "illumos", target_os = "fuchsia", target_os = "redox", target_os = "cloudabi", target_os = "haiku", target_os = "vxworks", target_os = "emscripten", target_os = "wasi"))) + ( + "@rules_rust//rust/platform:wasm32-unknown-unknown", + ): [ + ], + "//conditions:default": [], + }), +) + +# Unsupported target "bench" with type "test" omitted + +# Unsupported target "map_tests" with type "test" omitted + +# Unsupported target "nopanic" with type "test" omitted diff --git a/bazel/cargo/remote/BUILD.hashbrown-0.9.1.bazel b/bazel/cargo/remote/BUILD.hashbrown-0.11.0.bazel similarity index 95% rename from bazel/cargo/remote/BUILD.hashbrown-0.9.1.bazel rename to bazel/cargo/remote/BUILD.hashbrown-0.11.0.bazel index 348c8f38..b5a5dfb1 100644 --- a/bazel/cargo/remote/BUILD.hashbrown-0.9.1.bazel +++ b/bazel/cargo/remote/BUILD.hashbrown-0.11.0.bazel @@ -51,10 +51,10 @@ rust_library( "cargo-raze", "manual", ], - version = "0.9.1", + version = "0.11.0", # buildifier: leave-alone deps = [ - "@raze__ahash__0_4_7//:ahash", + "@raze__ahash__0_7_2//:ahash", ], ) diff --git a/bazel/cargo/remote/BUILD.once_cell-1.7.2.bazel b/bazel/cargo/remote/BUILD.once_cell-1.7.2.bazel new file mode 100644 index 00000000..d3a24768 --- /dev/null +++ b/bazel/cargo/remote/BUILD.once_cell-1.7.2.bazel @@ -0,0 +1,72 @@ +""" +@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:rust.bzl", + "rust_binary", + "rust_library", + "rust_test", +) + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//bazel/cargo", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # MIT from expression "MIT OR Apache-2.0" +]) + +# Generated Targets + +# Unsupported target "bench" with type "example" omitted + +# Unsupported target "bench_acquire" with type "example" omitted + +# Unsupported target "bench_vs_lazy_static" with type "example" omitted + +# Unsupported target "lazy_static" with type "example" omitted + +# Unsupported target "reentrant_init_deadlocks" with type "example" omitted + +# Unsupported target "regex" with type "example" omitted + +# Unsupported target "test_synchronization" with type "example" omitted + +rust_library( + name = "once_cell", + srcs = glob(["**/*.rs"]), + crate_features = [ + "alloc", + "race", + "unstable", + ], + crate_root = "src/lib.rs", + crate_type = "lib", + data = [], + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "manual", + ], + version = "1.7.2", + # buildifier: leave-alone + deps = [ + ], +) + +# Unsupported target "it" with type "test" omitted diff --git a/bazel/cargo/remote/BUILD.ahash-0.4.7.bazel b/bazel/cargo/remote/BUILD.version_check-0.9.2.bazel similarity index 73% rename from bazel/cargo/remote/BUILD.ahash-0.4.7.bazel rename to bazel/cargo/remote/BUILD.version_check-0.9.2.bazel index 656cc999..606117bd 100644 --- a/bazel/cargo/remote/BUILD.ahash-0.4.7.bazel +++ b/bazel/cargo/remote/BUILD.version_check-0.9.2.bazel @@ -30,19 +30,15 @@ licenses([ # Generated Targets -# Unsupported target "ahash" with type "bench" omitted - -# Unsupported target "map" with type "bench" omitted - rust_library( - name = "ahash", + name = "version_check", srcs = glob(["**/*.rs"]), crate_features = [ ], crate_root = "src/lib.rs", crate_type = "lib", data = [], - edition = "2018", + edition = "2015", rustc_flags = [ "--cap-lints=allow", ], @@ -50,14 +46,8 @@ rust_library( "cargo-raze", "manual", ], - version = "0.4.7", + version = "0.9.2", # buildifier: leave-alone deps = [ ], ) - -# Unsupported target "bench" with type "test" omitted - -# Unsupported target "map_tests" with type "test" omitted - -# Unsupported target "nopanic" with type "test" omitted