Skip to content

Commit fed0214

Browse files
PiotrSikoraPiotrSikora
authored
Update hashbrown to v0.14. (#195)
While there, fix instructions for regenerating Bazel rules. Signed-off-by: Piotr Sikora <[email protected]>
1 parent 5638704 commit fed0214

10 files changed

+201
-101
lines changed

‎Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ edition = "2018"
1111
build = "build.rs"
1212

1313
[dependencies]
14-
hashbrown = "0.13"
14+
hashbrown = "0.14"
1515
log = "0.4"
1616

1717
[profile.release]

‎README.md

+1-3
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,5 @@
3232
When updating dependencies, you need to regenerate Bazel `BUILD` files to match updated `Cargo.toml`:
3333

3434
```sh
35-
cargo generate-lockfile
36-
mv Cargo.lock bazel/cargo/Cargo.Bazel.lock
37-
bazel run //bazel/cargo:crates_vendor
35+
bazel run //bazel/cargo:crates_vendor -- --repin
3836
```

‎bazel/cargo/Cargo.Bazel.lock

+15-11
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,21 @@ version = 3
44

55
[[package]]
66
name = "ahash"
7-
version = "0.8.2"
7+
version = "0.8.3"
88
source = "registry+https://github.com/rust-lang/crates.io-index"
9-
checksum = "bf6ccdb167abbf410dcb915cabd428929d7f6a04980b54a11f26a39f1c7f7107"
9+
checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
1010
dependencies = [
1111
"cfg-if",
1212
"once_cell",
1313
"version_check",
1414
]
1515

16+
[[package]]
17+
name = "allocator-api2"
18+
version = "0.2.14"
19+
source = "registry+https://github.com/rust-lang/crates.io-index"
20+
checksum = "c4f263788a35611fba42eb41ff811c5d0360c58b97402570312a350736e2542e"
21+
1622
[[package]]
1723
name = "cfg-if"
1824
version = "1.0.0"
@@ -21,27 +27,25 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
2127

2228
[[package]]
2329
name = "hashbrown"
24-
version = "0.13.1"
30+
version = "0.14.0"
2531
source = "registry+https://github.com/rust-lang/crates.io-index"
26-
checksum = "33ff8ae62cd3a9102e5637afc8452c55acf3844001bd5374e0b0bd7b6616c038"
32+
checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
2733
dependencies = [
2834
"ahash",
35+
"allocator-api2",
2936
]
3037

3138
[[package]]
3239
name = "log"
33-
version = "0.4.16"
40+
version = "0.4.18"
3441
source = "registry+https://github.com/rust-lang/crates.io-index"
35-
checksum = "6389c490849ff5bc16be905ae24bc913a9c8892e19b2341dbc175e14c341c2b8"
36-
dependencies = [
37-
"cfg-if",
38-
]
42+
checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de"
3943

4044
[[package]]
4145
name = "once_cell"
42-
version = "1.16.0"
46+
version = "1.18.0"
4347
source = "registry+https://github.com/rust-lang/crates.io-index"
44-
checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860"
48+
checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
4549

4650
[[package]]
4751
name = "proxy-wasm"

‎bazel/cargo/remote/BUILD.ahash-0.8.2.bazel renamed to ‎bazel/cargo/remote/BUILD.ahash-0.8.3.bazel

+55-55
Original file line numberDiff line numberDiff line change
@@ -82,141 +82,141 @@ rust_library(
8282
"noclippy",
8383
"norustfmt",
8484
],
85-
version = "0.8.2",
85+
version = "0.8.3",
8686
deps = [
8787
] + select({
8888
"@rules_rust//rust/platform:aarch64-apple-darwin": [
89-
"@crates_vendor__ahash-0.8.2//:build_script_build", # common dependency
89+
"@crates_vendor__ahash-0.8.3//:build_script_build", # common dependency
9090
"@crates_vendor__cfg-if-1.0.0//:cfg_if", # common dependency
91-
"@crates_vendor__once_cell-1.16.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
91+
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
9292
],
9393
"@rules_rust//rust/platform:aarch64-apple-ios": [
94-
"@crates_vendor__ahash-0.8.2//:build_script_build", # common dependency
94+
"@crates_vendor__ahash-0.8.3//:build_script_build", # common dependency
9595
"@crates_vendor__cfg-if-1.0.0//:cfg_if", # common dependency
96-
"@crates_vendor__once_cell-1.16.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
96+
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
9797
],
9898
"@rules_rust//rust/platform:aarch64-apple-ios-sim": [
99-
"@crates_vendor__ahash-0.8.2//:build_script_build", # common dependency
99+
"@crates_vendor__ahash-0.8.3//:build_script_build", # common dependency
100100
"@crates_vendor__cfg-if-1.0.0//:cfg_if", # common dependency
101-
"@crates_vendor__once_cell-1.16.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
101+
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
102102
],
103103
"@rules_rust//rust/platform:aarch64-linux-android": [
104-
"@crates_vendor__ahash-0.8.2//:build_script_build", # common dependency
104+
"@crates_vendor__ahash-0.8.3//:build_script_build", # common dependency
105105
"@crates_vendor__cfg-if-1.0.0//:cfg_if", # common dependency
106-
"@crates_vendor__once_cell-1.16.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
106+
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
107107
],
108108
"@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
109-
"@crates_vendor__ahash-0.8.2//:build_script_build", # common dependency
109+
"@crates_vendor__ahash-0.8.3//:build_script_build", # common dependency
110110
"@crates_vendor__cfg-if-1.0.0//:cfg_if", # common dependency
111-
"@crates_vendor__once_cell-1.16.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
111+
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
112112
],
113113
"@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
114-
"@crates_vendor__ahash-0.8.2//:build_script_build", # common dependency
114+
"@crates_vendor__ahash-0.8.3//:build_script_build", # common dependency
115115
"@crates_vendor__cfg-if-1.0.0//:cfg_if", # common dependency
116-
"@crates_vendor__once_cell-1.16.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
116+
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
117117
],
118118
"@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
119-
"@crates_vendor__ahash-0.8.2//:build_script_build", # common dependency
119+
"@crates_vendor__ahash-0.8.3//:build_script_build", # common dependency
120120
"@crates_vendor__cfg-if-1.0.0//:cfg_if", # common dependency
121-
"@crates_vendor__once_cell-1.16.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
121+
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
122122
],
123123
"@rules_rust//rust/platform:armv7-linux-androideabi": [
124-
"@crates_vendor__ahash-0.8.2//:build_script_build", # common dependency
124+
"@crates_vendor__ahash-0.8.3//:build_script_build", # common dependency
125125
"@crates_vendor__cfg-if-1.0.0//:cfg_if", # common dependency
126-
"@crates_vendor__once_cell-1.16.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
126+
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
127127
],
128128
"@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
129-
"@crates_vendor__ahash-0.8.2//:build_script_build", # common dependency
129+
"@crates_vendor__ahash-0.8.3//:build_script_build", # common dependency
130130
"@crates_vendor__cfg-if-1.0.0//:cfg_if", # common dependency
131-
"@crates_vendor__once_cell-1.16.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
131+
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
132132
],
133133
"@rules_rust//rust/platform:i686-apple-darwin": [
134-
"@crates_vendor__ahash-0.8.2//:build_script_build", # common dependency
134+
"@crates_vendor__ahash-0.8.3//:build_script_build", # common dependency
135135
"@crates_vendor__cfg-if-1.0.0//:cfg_if", # common dependency
136-
"@crates_vendor__once_cell-1.16.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
136+
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
137137
],
138138
"@rules_rust//rust/platform:i686-linux-android": [
139-
"@crates_vendor__ahash-0.8.2//:build_script_build", # common dependency
139+
"@crates_vendor__ahash-0.8.3//:build_script_build", # common dependency
140140
"@crates_vendor__cfg-if-1.0.0//:cfg_if", # common dependency
141-
"@crates_vendor__once_cell-1.16.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
141+
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
142142
],
143143
"@rules_rust//rust/platform:i686-pc-windows-msvc": [
144-
"@crates_vendor__ahash-0.8.2//:build_script_build", # common dependency
144+
"@crates_vendor__ahash-0.8.3//:build_script_build", # common dependency
145145
"@crates_vendor__cfg-if-1.0.0//:cfg_if", # common dependency
146-
"@crates_vendor__once_cell-1.16.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
146+
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
147147
],
148148
"@rules_rust//rust/platform:i686-unknown-freebsd": [
149-
"@crates_vendor__ahash-0.8.2//:build_script_build", # common dependency
149+
"@crates_vendor__ahash-0.8.3//:build_script_build", # common dependency
150150
"@crates_vendor__cfg-if-1.0.0//:cfg_if", # common dependency
151-
"@crates_vendor__once_cell-1.16.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
151+
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
152152
],
153153
"@rules_rust//rust/platform:i686-unknown-linux-gnu": [
154-
"@crates_vendor__ahash-0.8.2//:build_script_build", # common dependency
154+
"@crates_vendor__ahash-0.8.3//:build_script_build", # common dependency
155155
"@crates_vendor__cfg-if-1.0.0//:cfg_if", # common dependency
156-
"@crates_vendor__once_cell-1.16.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
156+
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
157157
],
158158
"@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
159-
"@crates_vendor__ahash-0.8.2//:build_script_build", # common dependency
159+
"@crates_vendor__ahash-0.8.3//:build_script_build", # common dependency
160160
"@crates_vendor__cfg-if-1.0.0//:cfg_if", # common dependency
161-
"@crates_vendor__once_cell-1.16.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
161+
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
162162
],
163163
"@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [
164-
"@crates_vendor__ahash-0.8.2//:build_script_build", # common dependency
164+
"@crates_vendor__ahash-0.8.3//:build_script_build", # common dependency
165165
"@crates_vendor__cfg-if-1.0.0//:cfg_if", # common dependency
166-
"@crates_vendor__once_cell-1.16.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
166+
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
167167
],
168168
"@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [
169-
"@crates_vendor__ahash-0.8.2//:build_script_build", # common dependency
169+
"@crates_vendor__ahash-0.8.3//:build_script_build", # common dependency
170170
"@crates_vendor__cfg-if-1.0.0//:cfg_if", # common dependency
171-
"@crates_vendor__once_cell-1.16.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
171+
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
172172
],
173173
"@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
174-
"@crates_vendor__ahash-0.8.2//:build_script_build", # common dependency
174+
"@crates_vendor__ahash-0.8.3//:build_script_build", # common dependency
175175
"@crates_vendor__cfg-if-1.0.0//:cfg_if", # common dependency
176-
"@crates_vendor__once_cell-1.16.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
176+
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
177177
],
178178
"@rules_rust//rust/platform:wasm32-unknown-unknown": [
179-
"@crates_vendor__ahash-0.8.2//:build_script_build", # common dependency
179+
"@crates_vendor__ahash-0.8.3//:build_script_build", # common dependency
180180
"@crates_vendor__cfg-if-1.0.0//:cfg_if", # common dependency
181-
"@crates_vendor__once_cell-1.16.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
181+
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
182182
],
183183
"@rules_rust//rust/platform:wasm32-wasi": [
184-
"@crates_vendor__ahash-0.8.2//:build_script_build", # common dependency
184+
"@crates_vendor__ahash-0.8.3//:build_script_build", # common dependency
185185
"@crates_vendor__cfg-if-1.0.0//:cfg_if", # common dependency
186-
"@crates_vendor__once_cell-1.16.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
186+
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
187187
],
188188
"@rules_rust//rust/platform:x86_64-apple-darwin": [
189-
"@crates_vendor__ahash-0.8.2//:build_script_build", # common dependency
189+
"@crates_vendor__ahash-0.8.3//:build_script_build", # common dependency
190190
"@crates_vendor__cfg-if-1.0.0//:cfg_if", # common dependency
191-
"@crates_vendor__once_cell-1.16.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
191+
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
192192
],
193193
"@rules_rust//rust/platform:x86_64-apple-ios": [
194-
"@crates_vendor__ahash-0.8.2//:build_script_build", # common dependency
194+
"@crates_vendor__ahash-0.8.3//:build_script_build", # common dependency
195195
"@crates_vendor__cfg-if-1.0.0//:cfg_if", # common dependency
196-
"@crates_vendor__once_cell-1.16.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
196+
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
197197
],
198198
"@rules_rust//rust/platform:x86_64-linux-android": [
199-
"@crates_vendor__ahash-0.8.2//:build_script_build", # common dependency
199+
"@crates_vendor__ahash-0.8.3//:build_script_build", # common dependency
200200
"@crates_vendor__cfg-if-1.0.0//:cfg_if", # common dependency
201-
"@crates_vendor__once_cell-1.16.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
201+
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
202202
],
203203
"@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
204-
"@crates_vendor__ahash-0.8.2//:build_script_build", # common dependency
204+
"@crates_vendor__ahash-0.8.3//:build_script_build", # common dependency
205205
"@crates_vendor__cfg-if-1.0.0//:cfg_if", # common dependency
206-
"@crates_vendor__once_cell-1.16.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
206+
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
207207
],
208208
"@rules_rust//rust/platform:x86_64-unknown-freebsd": [
209-
"@crates_vendor__ahash-0.8.2//:build_script_build", # common dependency
209+
"@crates_vendor__ahash-0.8.3//:build_script_build", # common dependency
210210
"@crates_vendor__cfg-if-1.0.0//:cfg_if", # common dependency
211-
"@crates_vendor__once_cell-1.16.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
211+
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
212212
],
213213
"@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
214-
"@crates_vendor__ahash-0.8.2//:build_script_build", # common dependency
214+
"@crates_vendor__ahash-0.8.3//:build_script_build", # common dependency
215215
"@crates_vendor__cfg-if-1.0.0//:cfg_if", # common dependency
216-
"@crates_vendor__once_cell-1.16.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
216+
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
217217
],
218218
"//conditions:default": [
219-
"@crates_vendor__ahash-0.8.2//:build_script_build",
219+
"@crates_vendor__ahash-0.8.3//:build_script_build",
220220
"@crates_vendor__cfg-if-1.0.0//:cfg_if",
221221
],
222222
}),
@@ -288,7 +288,7 @@ cargo_build_script(
288288
"//conditions:default": [
289289
],
290290
}),
291-
version = "0.8.2",
291+
version = "0.8.3",
292292
visibility = ["//visibility:private"],
293293
deps = [
294294
] + select({

‎bazel/cargo/remote/BUILD.allocator-api2-0.2.14.bazel

+87
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
###############################################################################
2+
# @generated
3+
# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
4+
# regenerate this file, run the following:
5+
#
6+
# bazel run //bazel/cargo:crates_vendor
7+
###############################################################################
8+
9+
# buildifier: disable=bzl-visibility
10+
load("@rules_rust//crate_universe/private:selects.bzl", "select_with_or")
11+
load(
12+
"@rules_rust//rust:defs.bzl",
13+
"rust_library",
14+
)
15+
16+
package(default_visibility = ["//visibility:public"])
17+
18+
# licenses([
19+
# "TODO", # MIT OR Apache-2.0
20+
# ])
21+
22+
rust_library(
23+
name = "allocator_api2",
24+
srcs = glob(
25+
include = [
26+
"**/*.rs",
27+
],
28+
exclude = [
29+
],
30+
),
31+
aliases = select({
32+
"//conditions:default": {
33+
},
34+
}),
35+
compile_data = glob(
36+
include = ["**"],
37+
exclude = [
38+
"**/* *",
39+
"BUILD.bazel",
40+
"BUILD",
41+
"WORKSPACE.bazel",
42+
"WORKSPACE",
43+
],
44+
) + select_with_or({
45+
"//conditions:default": [
46+
],
47+
}),
48+
crate_features = [
49+
"alloc",
50+
],
51+
crate_root = "src/lib.rs",
52+
data = select_with_or({
53+
"//conditions:default": [
54+
],
55+
}),
56+
edition = "2018",
57+
proc_macro_deps = [
58+
] + select({
59+
"//conditions:default": [
60+
],
61+
}),
62+
rustc_env = {
63+
},
64+
rustc_env_files = select_with_or({
65+
"//conditions:default": [
66+
],
67+
}),
68+
rustc_flags = [
69+
# In most cases, warnings in 3rd party crates are not interesting as
70+
# they're out of the control of consumers. The flag here silences
71+
# warnings. For more details see:
72+
# https://doc.rust-lang.org/rustc/lints/levels.html
73+
"--cap-lints=allow",
74+
],
75+
tags = [
76+
"cargo-bazel",
77+
"manual",
78+
"noclippy",
79+
"norustfmt",
80+
],
81+
version = "0.2.14",
82+
deps = [
83+
] + select({
84+
"//conditions:default": [
85+
],
86+
}),
87+
)

‎bazel/cargo/remote/BUILD.bazel

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ filegroup(
2929
# Workspace Member Dependencies
3030
alias(
3131
name = "hashbrown",
32-
actual = "@crates_vendor__hashbrown-0.13.1//:hashbrown",
32+
actual = "@crates_vendor__hashbrown-0.14.0//:hashbrown",
3333
tags = ["manual"],
3434
)
3535

3636
alias(
3737
name = "log",
38-
actual = "@crates_vendor__log-0.4.16//:log",
38+
actual = "@crates_vendor__log-0.4.18//:log",
3939
tags = ["manual"],
4040
)
4141

0 commit comments

Comments
 (0)