Skip to content

Commit 0df1224

Browse files
PiotrSikoraPiotrSikora
authored
Update cargo-raze to v0.14.1. (proxy-wasm#213)
Signed-off-by: Piotr Sikora <[email protected]>
1 parent af1728e commit 0df1224

File tree

99 files changed

+380
-395
lines changed

Some content is hidden

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

99 files changed

+380
-395
lines changed

‎.github/workflows/cargo.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ jobs:
3838
- name: Format (cargo raze)
3939
working-directory: bazel/cargo
4040
run: |
41-
cargo install cargo-raze --version 0.12.0
41+
cargo install cargo-raze --version 0.14.1
4242
cargo raze
43-
# Ignore manual changes in "cpufeatures, errno and rustix" crate until fixed in cargo-raze.
43+
# Ignore manual changes in "errno" crate until fixed in cargo-raze.
4444
# See: https://github.com/google/cargo-raze/issues/451
45-
git diff --exit-code -- ':!remote/BUILD.errno-0.2.8.bazel' ':!remote/BUILD.rustix-0.26.2.bazel'
45+
git diff --exit-code -- ':!remote/BUILD.errno-0.2.8.bazel'

‎bazel/cargo/BUILD.bazel

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,19 +40,17 @@ alias(
4040
)
4141

4242
alias(
43-
name = "wasmsign",
44-
actual = "@proxy_wasm_cpp_host__wasmsign__0_1_2//:wasmsign",
43+
name = "cargo_bin_wasmsign",
44+
actual = "@proxy_wasm_cpp_host__wasmsign__0_1_2//:cargo_bin_wasmsign",
4545
tags = [
4646
"cargo-raze",
4747
"manual",
4848
],
4949
)
5050

5151
alias(
52-
# Extra aliased target, from raze configuration
53-
# N.B.: The exact form of this is subject to change.
54-
name = "cargo_bin_wasmsign",
55-
actual = "@proxy_wasm_cpp_host__wasmsign__0_1_2//:cargo_bin_wasmsign",
52+
name = "wasmsign",
53+
actual = "@proxy_wasm_cpp_host__wasmsign__0_1_2//:wasmsign",
5654
tags = [
5755
"cargo-raze",
5856
"manual",

‎bazel/cargo/remote/BUILD.addr2line-0.17.0.bazel

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects")
1010

1111
# buildifier: disable=load
1212
load(
13-
"@rules_rust//rust:rust.bzl",
13+
"@rules_rust//rust:defs.bzl",
1414
"rust_binary",
1515
"rust_library",
16+
"rust_proc_macro",
1617
"rust_test",
1718
)
1819

@@ -38,14 +39,14 @@ rust_library(
3839
crate_features = [
3940
],
4041
crate_root = "src/lib.rs",
41-
crate_type = "lib",
4242
data = [],
4343
edition = "2015",
4444
rustc_flags = [
4545
"--cap-lints=allow",
4646
],
4747
tags = [
4848
"cargo-raze",
49+
"crate-name=addr2line",
4950
"manual",
5051
],
5152
version = "0.17.0",

‎bazel/cargo/remote/BUILD.adler-1.0.2.bazel

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects")
1010

1111
# buildifier: disable=load
1212
load(
13-
"@rules_rust//rust:rust.bzl",
13+
"@rules_rust//rust:defs.bzl",
1414
"rust_binary",
1515
"rust_library",
16+
"rust_proc_macro",
1617
"rust_test",
1718
)
1819

@@ -38,14 +39,14 @@ rust_library(
3839
crate_features = [
3940
],
4041
crate_root = "src/lib.rs",
41-
crate_type = "lib",
4242
data = [],
4343
edition = "2015",
4444
rustc_flags = [
4545
"--cap-lints=allow",
4646
],
4747
tags = [
4848
"cargo-raze",
49+
"crate-name=adler",
4950
"manual",
5051
],
5152
version = "1.0.2",

‎bazel/cargo/remote/BUILD.aho-corasick-0.7.18.bazel

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects")
1010

1111
# buildifier: disable=load
1212
load(
13-
"@rules_rust//rust:rust.bzl",
13+
"@rules_rust//rust:defs.bzl",
1414
"rust_binary",
1515
"rust_library",
16+
"rust_proc_macro",
1617
"rust_test",
1718
)
1819

@@ -38,14 +39,14 @@ rust_library(
3839
"std",
3940
],
4041
crate_root = "src/lib.rs",
41-
crate_type = "lib",
4242
data = [],
4343
edition = "2018",
4444
rustc_flags = [
4545
"--cap-lints=allow",
4646
],
4747
tags = [
4848
"cargo-raze",
49+
"crate-name=aho_corasick",
4950
"manual",
5051
],
5152
version = "0.7.18",

‎bazel/cargo/remote/BUILD.ansi_term-0.12.1.bazel

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects")
1010

1111
# buildifier: disable=load
1212
load(
13-
"@rules_rust//rust:rust.bzl",
13+
"@rules_rust//rust:defs.bzl",
1414
"rust_binary",
1515
"rust_library",
16+
"rust_proc_macro",
1617
"rust_test",
1718
)
1819

@@ -44,14 +45,14 @@ rust_library(
4445
crate_features = [
4546
],
4647
crate_root = "src/lib.rs",
47-
crate_type = "lib",
4848
data = [],
4949
edition = "2015",
5050
rustc_flags = [
5151
"--cap-lints=allow",
5252
],
5353
tags = [
5454
"cargo-raze",
55+
"crate-name=ansi_term",
5556
"manual",
5657
],
5758
version = "0.12.1",

‎bazel/cargo/remote/BUILD.anyhow-1.0.52.bazel

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects")
1010

1111
# buildifier: disable=load
1212
load(
13-
"@rules_rust//rust:rust.bzl",
13+
"@rules_rust//rust:defs.bzl",
1414
"rust_binary",
1515
"rust_library",
16+
"rust_proc_macro",
1617
"rust_test",
1718
)
1819

@@ -69,14 +70,14 @@ rust_library(
6970
"std",
7071
],
7172
crate_root = "src/lib.rs",
72-
crate_type = "lib",
7373
data = [],
7474
edition = "2018",
7575
rustc_flags = [
7676
"--cap-lints=allow",
7777
],
7878
tags = [
7979
"cargo-raze",
80+
"crate-name=anyhow",
8081
"manual",
8182
],
8283
version = "1.0.52",

‎bazel/cargo/remote/BUILD.atty-0.2.14.bazel

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects")
1010

1111
# buildifier: disable=load
1212
load(
13-
"@rules_rust//rust:rust.bzl",
13+
"@rules_rust//rust:defs.bzl",
1414
"rust_binary",
1515
"rust_library",
16+
"rust_proc_macro",
1617
"rust_test",
1718
)
1819

@@ -40,14 +41,14 @@ rust_library(
4041
crate_features = [
4142
],
4243
crate_root = "src/lib.rs",
43-
crate_type = "lib",
4444
data = [],
4545
edition = "2015",
4646
rustc_flags = [
4747
"--cap-lints=allow",
4848
],
4949
tags = [
5050
"cargo-raze",
51+
"crate-name=atty",
5152
"manual",
5253
],
5354
version = "0.2.14",
@@ -56,22 +57,22 @@ rust_library(
5657
] + selects.with_or({
5758
# cfg(unix)
5859
(
60+
"@rules_rust//rust/platform:i686-apple-darwin",
61+
"@rules_rust//rust/platform:i686-unknown-linux-gnu",
62+
"@rules_rust//rust/platform:x86_64-apple-darwin",
63+
"@rules_rust//rust/platform:x86_64-unknown-linux-gnu",
5964
"@rules_rust//rust/platform:aarch64-apple-darwin",
6065
"@rules_rust//rust/platform:aarch64-apple-ios",
6166
"@rules_rust//rust/platform:aarch64-linux-android",
6267
"@rules_rust//rust/platform:aarch64-unknown-linux-gnu",
6368
"@rules_rust//rust/platform:arm-unknown-linux-gnueabi",
64-
"@rules_rust//rust/platform:i686-apple-darwin",
6569
"@rules_rust//rust/platform:i686-linux-android",
6670
"@rules_rust//rust/platform:i686-unknown-freebsd",
67-
"@rules_rust//rust/platform:i686-unknown-linux-gnu",
6871
"@rules_rust//rust/platform:powerpc-unknown-linux-gnu",
6972
"@rules_rust//rust/platform:s390x-unknown-linux-gnu",
70-
"@rules_rust//rust/platform:x86_64-apple-darwin",
7173
"@rules_rust//rust/platform:x86_64-apple-ios",
7274
"@rules_rust//rust/platform:x86_64-linux-android",
7375
"@rules_rust//rust/platform:x86_64-unknown-freebsd",
74-
"@rules_rust//rust/platform:x86_64-unknown-linux-gnu",
7576
): [
7677
"@proxy_wasm_cpp_host__libc__0_2_112//:libc",
7778
],

‎bazel/cargo/remote/BUILD.autocfg-1.0.1.bazel

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects")
1010

1111
# buildifier: disable=load
1212
load(
13-
"@rules_rust//rust:rust.bzl",
13+
"@rules_rust//rust:defs.bzl",
1414
"rust_binary",
1515
"rust_library",
16+
"rust_proc_macro",
1617
"rust_test",
1718
)
1819

@@ -44,14 +45,14 @@ rust_library(
4445
crate_features = [
4546
],
4647
crate_root = "src/lib.rs",
47-
crate_type = "lib",
4848
data = [],
4949
edition = "2015",
5050
rustc_flags = [
5151
"--cap-lints=allow",
5252
],
5353
tags = [
5454
"cargo-raze",
55+
"crate-name=autocfg",
5556
"manual",
5657
],
5758
version = "1.0.1",

‎bazel/cargo/remote/BUILD.backtrace-0.3.63.bazel

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects")
1010

1111
# buildifier: disable=load
1212
load(
13-
"@rules_rust//rust:rust.bzl",
13+
"@rules_rust//rust:defs.bzl",
1414
"rust_binary",
1515
"rust_library",
16+
"rust_proc_macro",
1617
"rust_test",
1718
)
1819

@@ -59,15 +60,7 @@ cargo_build_script(
5960
visibility = ["//visibility:private"],
6061
deps = [
6162
"@proxy_wasm_cpp_host__cc__1_0_72//:cc",
62-
] + selects.with_or({
63-
# cfg(windows)
64-
(
65-
"@rules_rust//rust/platform:i686-pc-windows-msvc",
66-
"@rules_rust//rust/platform:x86_64-pc-windows-msvc",
67-
): [
68-
],
69-
"//conditions:default": [],
70-
}),
63+
],
7164
)
7265

7366
# Unsupported target "benchmarks" with type "bench" omitted
@@ -79,21 +72,19 @@ cargo_build_script(
7972
rust_library(
8073
name = "backtrace",
8174
srcs = glob(["**/*.rs"]),
82-
aliases = {
83-
},
8475
crate_features = [
8576
"default",
8677
"std",
8778
],
8879
crate_root = "src/lib.rs",
89-
crate_type = "lib",
9080
data = [],
9181
edition = "2018",
9282
rustc_flags = [
9383
"--cap-lints=allow",
9484
],
9585
tags = [
9686
"cargo-raze",
87+
"crate-name=backtrace",
9788
"manual",
9889
],
9990
version = "0.3.63",
@@ -106,15 +97,7 @@ rust_library(
10697
"@proxy_wasm_cpp_host__miniz_oxide__0_4_4//:miniz_oxide",
10798
"@proxy_wasm_cpp_host__object__0_27_1//:object",
10899
"@proxy_wasm_cpp_host__rustc_demangle__0_1_21//:rustc_demangle",
109-
] + selects.with_or({
110-
# cfg(windows)
111-
(
112-
"@rules_rust//rust/platform:i686-pc-windows-msvc",
113-
"@rules_rust//rust/platform:x86_64-pc-windows-msvc",
114-
): [
115-
],
116-
"//conditions:default": [],
117-
}),
100+
],
118101
)
119102

120103
# Unsupported target "accuracy" with type "test" omitted

‎bazel/cargo/remote/BUILD.bincode-1.3.3.bazel

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects")
1010

1111
# buildifier: disable=load
1212
load(
13-
"@rules_rust//rust:rust.bzl",
13+
"@rules_rust//rust:defs.bzl",
1414
"rust_binary",
1515
"rust_library",
16+
"rust_proc_macro",
1617
"rust_test",
1718
)
1819

@@ -36,14 +37,14 @@ rust_library(
3637
crate_features = [
3738
],
3839
crate_root = "src/lib.rs",
39-
crate_type = "lib",
4040
data = [],
4141
edition = "2015",
4242
rustc_flags = [
4343
"--cap-lints=allow",
4444
],
4545
tags = [
4646
"cargo-raze",
47+
"crate-name=bincode",
4748
"manual",
4849
],
4950
version = "1.3.3",

‎bazel/cargo/remote/BUILD.bitflags-1.3.2.bazel

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects")
1010

1111
# buildifier: disable=load
1212
load(
13-
"@rules_rust//rust:rust.bzl",
13+
"@rules_rust//rust:defs.bzl",
1414
"rust_binary",
1515
"rust_library",
16+
"rust_proc_macro",
1617
"rust_test",
1718
)
1819

@@ -37,14 +38,14 @@ rust_library(
3738
"default",
3839
],
3940
crate_root = "src/lib.rs",
40-
crate_type = "lib",
4141
data = [],
4242
edition = "2018",
4343
rustc_flags = [
4444
"--cap-lints=allow",
4545
],
4646
tags = [
4747
"cargo-raze",
48+
"crate-name=bitflags",
4849
"manual",
4950
],
5051
version = "1.3.2",

0 commit comments

Comments
 (0)