Skip to content

Commit ddfb7c3

Browse files
committed
fix: First attempt at cargo-raze -> crate_universe
Had to update platforms for crate_universe compatibility. Had to update Abseil due to local build issues. Wasmsign is not quite working yet (wasmtime not tried yet): ``` $ bazelisk test --verbose_failures --test_output=errors --define engine=null --config=clang -- //test/... ... ERROR: /usr/local/google/home/mstevenson/git/proxy-wasm-cpp-host/test/test_data/BUILD:22:17: in (an implicit dependency) attribute of wasm_rust_binary_rule rule //test/test_data:abi_export.wasm: @crates_vendor__wasmsign-0.1.2//:wasmsign does not refer to a valid executable target. Since this rule was created by the macro 'wasm_rust_binary', the error might have been caused by the macro implementation ERROR: /usr/local/google/home/mstevenson/git/proxy-wasm-cpp-host/test/test_data/BUILD:22:17: Analysis of target '//test/test_data:abi_export.wasm' failed ``` Signed-off-by: Martijn Stevenson <[email protected]>
1 parent 611d5d9 commit ddfb7c3

File tree

272 files changed

+12288
-11950
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

272 files changed

+12288
-11950
lines changed

bazel/cargo/wasmsign/BUILD.bazel

Lines changed: 28 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,34 @@
1-
"""
2-
@generated
3-
cargo-raze generated Bazel file.
1+
# Copyright 2024 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
414

5-
DO NOT EDIT! Replaced on runs of cargo-raze
6-
"""
15+
load("@rules_rust//crate_universe:defs.bzl", "crates_vendor")
716

8-
package(default_visibility = ["//visibility:public"])
9-
10-
licenses([
11-
"notice", # See individual crates for specific licenses
12-
])
13-
14-
# Aliased targets
15-
alias(
16-
name = "cargo_bin_wasmsign",
17-
actual = "@wasmsign__wasmsign__0_1_2//:cargo_bin_wasmsign",
18-
tags = [
19-
"cargo-raze",
20-
"manual",
21-
],
22-
)
23-
24-
alias(
25-
name = "wasmsign",
26-
actual = "@wasmsign__wasmsign__0_1_2//:wasmsign",
27-
tags = [
28-
"cargo-raze",
29-
"manual",
30-
],
31-
)
32-
33-
# Export file for Stardoc support
3417
exports_files(
3518
[
36-
"crates.bzl",
19+
"Cargo.toml",
20+
"Cargo.Bazel.lock",
3721
],
38-
visibility = ["//visibility:public"],
22+
)
23+
24+
# Run this target to regenerate cargo_lockfile and vendor_path/*.
25+
# $ bazelisk run bazel/cargo/wasmsign:crates_vendor -- --repin
26+
crates_vendor(
27+
name = "crates_vendor",
28+
cargo_lockfile = "//bazel/cargo/wasmsign:Cargo.Bazel.lock",
29+
generate_target_compatible_with = False,
30+
manifests = ["//bazel/cargo/wasmsign:Cargo.toml"],
31+
mode = "remote",
32+
tags = ["manual"],
33+
vendor_path = "//bazel/cargo/wasmsign/remote",
3934
)

bazel/cargo/wasmsign/Cargo.raze.lock renamed to bazel/cargo/wasmsign/Cargo.Bazel.lock

Lines changed: 42 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# This file is automatically @generated by Cargo.
22
# It is not intended for manual editing.
3+
version = 3
4+
35
[[package]]
46
name = "ansi_term"
57
version = "0.12.1"
@@ -11,9 +13,9 @@ dependencies = [
1113

1214
[[package]]
1315
name = "anyhow"
14-
version = "1.0.53"
16+
version = "1.0.86"
1517
source = "registry+https://github.com/rust-lang/crates.io-index"
16-
checksum = "94a45b455c14666b85fc40a019e8ab9eb75e3a124e05494f5397122bc9eb06e0"
18+
checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
1719

1820
[[package]]
1921
name = "atty"
@@ -34,9 +36,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
3436

3537
[[package]]
3638
name = "byteorder"
37-
version = "1.4.3"
39+
version = "1.5.0"
3840
source = "registry+https://github.com/rust-lang/crates.io-index"
39-
checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
41+
checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
4042

4143
[[package]]
4244
name = "cfg-if"
@@ -59,20 +61,27 @@ dependencies = [
5961
"vec_map",
6062
]
6163

64+
[[package]]
65+
name = "ct-codecs"
66+
version = "1.1.1"
67+
source = "registry+https://github.com/rust-lang/crates.io-index"
68+
checksum = "f3b7eb4404b8195a9abb6356f4ac07d8ba267045c8d6d220ac4dc992e6cc75df"
69+
6270
[[package]]
6371
name = "ed25519-compact"
64-
version = "1.0.8"
72+
version = "1.0.16"
6573
source = "registry+https://github.com/rust-lang/crates.io-index"
66-
checksum = "302ea73924517e9952bf08b505536f757e28dca8372cbf8b20723a0e2bab6c01"
74+
checksum = "e18997d4604542d0736fae2c5ad6de987f0a50530cbcc14a7ce5a685328a252d"
6775
dependencies = [
76+
"ct-codecs",
6877
"getrandom",
6978
]
7079

7180
[[package]]
7281
name = "getrandom"
73-
version = "0.2.4"
82+
version = "0.2.15"
7483
source = "registry+https://github.com/rust-lang/crates.io-index"
75-
checksum = "418d37c8b1d42553c93648be529cb70f920d3baf8ef469b74b9638df426e0b4c"
84+
checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
7685
dependencies = [
7786
"cfg-if",
7887
"libc",
@@ -90,15 +99,15 @@ dependencies = [
9099

91100
[[package]]
92101
name = "hmac-sha512"
93-
version = "1.1.1"
102+
version = "1.1.5"
94103
source = "registry+https://github.com/rust-lang/crates.io-index"
95-
checksum = "6b2ce076d8070f292037093a825343f6341fe0ce873268c2477e2f49abd57b10"
104+
checksum = "e4ce1f4656bae589a3fab938f9f09bf58645b7ed01a2c5f8a3c238e01a4ef78a"
96105

97106
[[package]]
98107
name = "libc"
99-
version = "0.2.114"
108+
version = "0.2.155"
100109
source = "registry+https://github.com/rust-lang/crates.io-index"
101-
checksum = "b0005d08a8f7b65fb8073cb697aa0b12b631ed251ce73d862ce50eeb52ce3b50"
110+
checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
102111

103112
[[package]]
104113
name = "parity-wasm"
@@ -108,18 +117,18 @@ checksum = "be5e13c266502aadf83426d87d81a0f5d1ef45b8027f5a471c360abfe4bfae92"
108117

109118
[[package]]
110119
name = "proc-macro2"
111-
version = "1.0.36"
120+
version = "1.0.86"
112121
source = "registry+https://github.com/rust-lang/crates.io-index"
113-
checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029"
122+
checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
114123
dependencies = [
115-
"unicode-xid",
124+
"unicode-ident",
116125
]
117126

118127
[[package]]
119128
name = "quote"
120-
version = "1.0.15"
129+
version = "1.0.36"
121130
source = "registry+https://github.com/rust-lang/crates.io-index"
122-
checksum = "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145"
131+
checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
123132
dependencies = [
124133
"proc-macro2",
125134
]
@@ -132,13 +141,13 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
132141

133142
[[package]]
134143
name = "syn"
135-
version = "1.0.86"
144+
version = "2.0.72"
136145
source = "registry+https://github.com/rust-lang/crates.io-index"
137-
checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b"
146+
checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
138147
dependencies = [
139148
"proc-macro2",
140149
"quote",
141-
"unicode-xid",
150+
"unicode-ident",
142151
]
143152

144153
[[package]]
@@ -152,35 +161,35 @@ dependencies = [
152161

153162
[[package]]
154163
name = "thiserror"
155-
version = "1.0.30"
164+
version = "1.0.63"
156165
source = "registry+https://github.com/rust-lang/crates.io-index"
157-
checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417"
166+
checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
158167
dependencies = [
159168
"thiserror-impl",
160169
]
161170

162171
[[package]]
163172
name = "thiserror-impl"
164-
version = "1.0.30"
173+
version = "1.0.63"
165174
source = "registry+https://github.com/rust-lang/crates.io-index"
166-
checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b"
175+
checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
167176
dependencies = [
168177
"proc-macro2",
169178
"quote",
170179
"syn",
171180
]
172181

173182
[[package]]
174-
name = "unicode-width"
175-
version = "0.1.9"
183+
name = "unicode-ident"
184+
version = "1.0.12"
176185
source = "registry+https://github.com/rust-lang/crates.io-index"
177-
checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
186+
checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
178187

179188
[[package]]
180-
name = "unicode-xid"
181-
version = "0.2.2"
189+
name = "unicode-width"
190+
version = "0.1.13"
182191
source = "registry+https://github.com/rust-lang/crates.io-index"
183-
checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
192+
checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
184193

185194
[[package]]
186195
name = "vec_map"
@@ -190,14 +199,14 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
190199

191200
[[package]]
192201
name = "wasi"
193-
version = "0.10.2+wasi-snapshot-preview1"
202+
version = "0.11.0+wasi-snapshot-preview1"
194203
source = "registry+https://github.com/rust-lang/crates.io-index"
195-
checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
204+
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
196205

197206
[[package]]
198207
name = "wasmsign"
199208
version = "0.1.2"
200-
source = "git+https://github.com/jedisct1/wasmsign#dfbc0aabe81885d59e88e667aa9c1e6a62dfe9cc"
209+
source = "git+https://github.com/jedisct1/wasmsign#6a6ef1c6f99063a5bd4ef9efc2ee41c5ea8f4f96"
201210
dependencies = [
202211
"anyhow",
203212
"byteorder",

bazel/cargo/wasmsign/Cargo.toml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,3 @@ path = "fake_lib.rs"
88

99
[dependencies]
1010
wasmsign = {git = "https://github.com/jedisct1/wasmsign", revision = "fa4d5598f778390df09be94232972b5b865a56b8"}
11-
12-
[package.metadata.raze]
13-
rust_rules_workspace_name = "rules_rust"
14-
gen_workspace_prefix = "wasmsign"
15-
genmode = "Remote"
16-
package_aliases_dir = "."
17-
workspace_path = "//bazel/cargo/wasmsign"
18-
19-
[package.metadata.raze.crates.wasmsign.'*']
20-
extra_aliased_targets = ["cargo_bin_wasmsign"]

0 commit comments

Comments
 (0)