Skip to content

Commit 4f79a79

Browse files
authored
Update Bazel tools and dependencies. (#113)
Signed-off-by: Piotr Sikora <[email protected]>
1 parent edb5cd5 commit 4f79a79

14 files changed

+49
-116
lines changed

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.0.0
1+
4.1.0

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@
3030

3131
When updating dependencies, you need to regenerate Bazel `BUILD` files to match updated `Cargo.toml`:
3232
```
33-
cargo install cargo-raze --version 0.11.0
33+
cargo install cargo-raze --version 0.12.0
3434
cargo raze --generate-lockfile
3535
```

WORKSPACE

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,9 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
1414

1515
http_archive(
1616
name = "cargo_raze",
17-
sha256 = "73c5cea8ad3f4ef7788116d491070eeb27819fe0f923dbb6f451f69dd5fa752c",
18-
# v0.11.0 with a few Bazel fixes.
19-
strip_prefix = "cargo-raze-7614085d2748e55ad3032c9b1dca78f6011cb40e",
20-
url = "https://github.com/google/cargo-raze/archive/7614085d2748e55ad3032c9b1dca78f6011cb40e.tar.gz",
17+
sha256 = "0a7986b1a8ec965ee7aa317ac61e82ea08568cfdf36b7ccc4dd3d1aff3b36e0b",
18+
strip_prefix = "cargo-raze-0.12.0",
19+
url = "https://github.com/google/cargo-raze/archive/v0.12.0.tar.gz",
2120
)
2221

2322
load("@cargo_raze//:repositories.bzl", "cargo_raze_repositories")

bazel/cargo/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ alias(
3232

3333
alias(
3434
name = "getrandom",
35-
actual = "@raze__getrandom__0_2_2//:getrandom",
35+
actual = "@raze__getrandom__0_2_3//:getrandom",
3636
tags = [
3737
"cargo-raze",
3838
"manual",

bazel/cargo/Cargo.raze.lock

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# It is not intended for manual editing.
33
[[package]]
44
name = "ahash"
5-
version = "0.7.2"
5+
version = "0.7.4"
66
source = "registry+https://github.com/rust-lang/crates.io-index"
7-
checksum = "7f200cbb1e856866d9eade941cf3aa0c5d7dd36f74311c4273b494f4ef036957"
7+
checksum = "43bb833f0bf979d8475d38fbf09ed3b8a55e1885fe93ad3f93239fc6a4f17b98"
88
dependencies = [
99
"getrandom",
1010
"once_cell",
@@ -44,9 +44,9 @@ dependencies = [
4444

4545
[[package]]
4646
name = "getrandom"
47-
version = "0.2.2"
47+
version = "0.2.3"
4848
source = "registry+https://github.com/rust-lang/crates.io-index"
49-
checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8"
49+
checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
5050
dependencies = [
5151
"cfg-if 1.0.0",
5252
"libc",
@@ -64,9 +64,9 @@ dependencies = [
6464

6565
[[package]]
6666
name = "libc"
67-
version = "0.2.91"
67+
version = "0.2.97"
6868
source = "registry+https://github.com/rust-lang/crates.io-index"
69-
checksum = "8916b1f6ca17130ec6568feccee27c156ad12037880833a3b842a823236502e7"
69+
checksum = "12b8adadd720df158f4d70dfe7ccc6adb0472d7c55ca83445f6a5ab3e36f8fb6"
7070

7171
[[package]]
7272
name = "log"
@@ -104,9 +104,9 @@ dependencies = [
104104

105105
[[package]]
106106
name = "once_cell"
107-
version = "1.7.2"
107+
version = "1.8.0"
108108
source = "registry+https://github.com/rust-lang/crates.io-index"
109-
checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3"
109+
checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56"
110110

111111
[[package]]
112112
name = "proxy-wasm"

bazel/cargo/crates.bzl

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ def raze_fetch_remote_crates():
1313
"""This function defines a collection of repos and should be called in a WORKSPACE file"""
1414
maybe(
1515
http_archive,
16-
name = "raze__ahash__0_7_2",
17-
url = "https://crates.io/api/v1/crates/ahash/0.7.2/download",
16+
name = "raze__ahash__0_7_4",
17+
url = "https://crates.io/api/v1/crates/ahash/0.7.4/download",
1818
type = "tar.gz",
19-
sha256 = "7f200cbb1e856866d9eade941cf3aa0c5d7dd36f74311c4273b494f4ef036957",
20-
strip_prefix = "ahash-0.7.2",
21-
build_file = Label("//bazel/cargo/remote:BUILD.ahash-0.7.2.bazel"),
19+
sha256 = "43bb833f0bf979d8475d38fbf09ed3b8a55e1885fe93ad3f93239fc6a4f17b98",
20+
strip_prefix = "ahash-0.7.4",
21+
build_file = Label("//bazel/cargo/remote:BUILD.ahash-0.7.4.bazel"),
2222
)
2323

2424
maybe(
@@ -53,12 +53,12 @@ def raze_fetch_remote_crates():
5353

5454
maybe(
5555
http_archive,
56-
name = "raze__getrandom__0_2_2",
57-
url = "https://crates.io/api/v1/crates/getrandom/0.2.2/download",
56+
name = "raze__getrandom__0_2_3",
57+
url = "https://crates.io/api/v1/crates/getrandom/0.2.3/download",
5858
type = "tar.gz",
59-
sha256 = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8",
60-
strip_prefix = "getrandom-0.2.2",
61-
build_file = Label("//bazel/cargo/remote:BUILD.getrandom-0.2.2.bazel"),
59+
sha256 = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753",
60+
strip_prefix = "getrandom-0.2.3",
61+
build_file = Label("//bazel/cargo/remote:BUILD.getrandom-0.2.3.bazel"),
6262
)
6363

6464
maybe(
@@ -73,12 +73,12 @@ def raze_fetch_remote_crates():
7373

7474
maybe(
7575
http_archive,
76-
name = "raze__libc__0_2_91",
77-
url = "https://crates.io/api/v1/crates/libc/0.2.91/download",
76+
name = "raze__libc__0_2_97",
77+
url = "https://crates.io/api/v1/crates/libc/0.2.97/download",
7878
type = "tar.gz",
79-
sha256 = "8916b1f6ca17130ec6568feccee27c156ad12037880833a3b842a823236502e7",
80-
strip_prefix = "libc-0.2.91",
81-
build_file = Label("//bazel/cargo/remote:BUILD.libc-0.2.91.bazel"),
79+
sha256 = "12b8adadd720df158f4d70dfe7ccc6adb0472d7c55ca83445f6a5ab3e36f8fb6",
80+
strip_prefix = "libc-0.2.97",
81+
build_file = Label("//bazel/cargo/remote:BUILD.libc-0.2.97.bazel"),
8282
)
8383

8484
maybe(
@@ -113,12 +113,12 @@ def raze_fetch_remote_crates():
113113

114114
maybe(
115115
http_archive,
116-
name = "raze__once_cell__1_7_2",
117-
url = "https://crates.io/api/v1/crates/once_cell/1.7.2/download",
116+
name = "raze__once_cell__1_8_0",
117+
url = "https://crates.io/api/v1/crates/once_cell/1.8.0/download",
118118
type = "tar.gz",
119-
sha256 = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3",
120-
strip_prefix = "once_cell-1.7.2",
121-
build_file = Label("//bazel/cargo/remote:BUILD.once_cell-1.7.2.bazel"),
119+
sha256 = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56",
120+
strip_prefix = "once_cell-1.8.0",
121+
build_file = Label("//bazel/cargo/remote:BUILD.once_cell-1.8.0.bazel"),
122122
)
123123

124124
maybe(

bazel/cargo/remote/BUILD.ahash-0.7.2.bazel renamed to bazel/cargo/remote/BUILD.ahash-0.7.4.bazel

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ cargo_build_script(
5353
"cargo-raze",
5454
"manual",
5555
],
56-
version = "0.7.2",
56+
version = "0.7.4",
5757
visibility = ["//visibility:private"],
5858
deps = [
5959
"@raze__version_check__0_9_3//:version_check",
@@ -114,7 +114,7 @@ rust_library(
114114
"cargo-raze",
115115
"manual",
116116
],
117-
version = "0.7.2",
117+
version = "0.7.4",
118118
# buildifier: leave-alone
119119
deps = [
120120
":ahash_build_script",
@@ -141,8 +141,8 @@ rust_library(
141141
"@rules_rust//rust/platform:x86_64-unknown-freebsd",
142142
"@rules_rust//rust/platform:x86_64-unknown-linux-gnu",
143143
): [
144-
"@raze__getrandom__0_2_2//:getrandom",
145-
"@raze__once_cell__1_7_2//:once_cell",
144+
"@raze__getrandom__0_2_3//:getrandom",
145+
"@raze__once_cell__1_8_0//:once_cell",
146146
],
147147
"//conditions:default": [],
148148
}) + selects.with_or({

bazel/cargo/remote/BUILD.chrono-0.4.19.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ rust_library(
6262
version = "0.4.19",
6363
# buildifier: leave-alone
6464
deps = [
65-
"@raze__libc__0_2_91//:libc",
65+
"@raze__libc__0_2_97//:libc",
6666
"@raze__num_integer__0_1_44//:num_integer",
6767
"@raze__num_traits__0_2_14//:num_traits",
6868
"@raze__time__0_1_43//:time",

bazel/cargo/remote/BUILD.getrandom-0.2.2.bazel renamed to bazel/cargo/remote/BUILD.getrandom-0.2.3.bazel

Lines changed: 2 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -29,71 +29,6 @@ licenses([
2929
])
3030

3131
# Generated Targets
32-
# buildifier: disable=out-of-order-load
33-
# buildifier: disable=load-on-top
34-
load(
35-
"@rules_rust//cargo:cargo_build_script.bzl",
36-
"cargo_build_script",
37-
)
38-
39-
cargo_build_script(
40-
name = "getrandom_build_script",
41-
srcs = glob(["**/*.rs"]),
42-
build_script_env = {
43-
},
44-
crate_features = [
45-
],
46-
crate_root = "build.rs",
47-
data = glob(["**"]),
48-
edition = "2018",
49-
rustc_flags = [
50-
"--cap-lints=allow",
51-
],
52-
tags = [
53-
"cargo-raze",
54-
"manual",
55-
],
56-
version = "0.2.2",
57-
visibility = ["//visibility:private"],
58-
deps = [
59-
] + selects.with_or({
60-
# cfg(all(target_arch = "wasm32", target_os = "unknown"))
61-
(
62-
"@rules_rust//rust/platform:wasm32-unknown-unknown",
63-
): [
64-
],
65-
"//conditions:default": [],
66-
}) + selects.with_or({
67-
# cfg(target_os = "wasi")
68-
(
69-
"@rules_rust//rust/platform:wasm32-wasi",
70-
): [
71-
],
72-
"//conditions:default": [],
73-
}) + selects.with_or({
74-
# cfg(unix)
75-
(
76-
"@rules_rust//rust/platform:aarch64-apple-darwin",
77-
"@rules_rust//rust/platform:aarch64-apple-ios",
78-
"@rules_rust//rust/platform:aarch64-linux-android",
79-
"@rules_rust//rust/platform:aarch64-unknown-linux-gnu",
80-
"@rules_rust//rust/platform:arm-unknown-linux-gnueabi",
81-
"@rules_rust//rust/platform:i686-apple-darwin",
82-
"@rules_rust//rust/platform:i686-linux-android",
83-
"@rules_rust//rust/platform:i686-unknown-freebsd",
84-
"@rules_rust//rust/platform:i686-unknown-linux-gnu",
85-
"@rules_rust//rust/platform:powerpc-unknown-linux-gnu",
86-
"@rules_rust//rust/platform:s390x-unknown-linux-gnu",
87-
"@rules_rust//rust/platform:x86_64-apple-darwin",
88-
"@rules_rust//rust/platform:x86_64-apple-ios",
89-
"@rules_rust//rust/platform:x86_64-linux-android",
90-
"@rules_rust//rust/platform:x86_64-unknown-freebsd",
91-
"@rules_rust//rust/platform:x86_64-unknown-linux-gnu",
92-
): [
93-
],
94-
"//conditions:default": [],
95-
}),
96-
)
9732

9833
# Unsupported target "mod" with type "bench" omitted
9934

@@ -115,10 +50,9 @@ rust_library(
11550
"cargo-raze",
11651
"manual",
11752
],
118-
version = "0.2.2",
53+
version = "0.2.3",
11954
# buildifier: leave-alone
12055
deps = [
121-
":getrandom_build_script",
12256
"@raze__cfg_if__1_0_0//:cfg_if",
12357
] + selects.with_or({
12458
# cfg(all(target_arch = "wasm32", target_os = "unknown"))
@@ -155,7 +89,7 @@ rust_library(
15589
"@rules_rust//rust/platform:x86_64-unknown-freebsd",
15690
"@rules_rust//rust/platform:x86_64-unknown-linux-gnu",
15791
): [
158-
"@raze__libc__0_2_91//:libc",
92+
"@raze__libc__0_2_97//:libc",
15993
],
16094
"//conditions:default": [],
16195
}),

bazel/cargo/remote/BUILD.hashbrown-0.11.2.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ rust_library(
5454
version = "0.11.2",
5555
# buildifier: leave-alone
5656
deps = [
57-
"@raze__ahash__0_7_2//:ahash",
57+
"@raze__ahash__0_7_4//:ahash",
5858
],
5959
)
6060

0 commit comments

Comments
 (0)