Skip to content

Update cargo-raze to v0.14.1. #213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 6, 2022
Merged

Update cargo-raze to v0.14.1. #213

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca7279f
Update cargo-raze to v0.14.1.
PiotrSikora Jan 5, 2022
032868a
Merge branch 'master' into raze_v0.14.1
PiotrSikora Jan 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/cargo.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ jobs:
- name: Format (cargo raze)
working-directory: bazel/cargo
run: |
cargo install cargo-raze --version 0.12.0
cargo install cargo-raze --version 0.14.1
cargo raze
# Ignore manual changes in "cpufeatures, errno and rustix" crate until fixed in cargo-raze.
# Ignore manual changes in "errno" crate until fixed in cargo-raze.
# See: https://github.com/google/cargo-raze/issues/451
git diff --exit-code -- ':!remote/BUILD.errno-0.2.8.bazel' ':!remote/BUILD.rustix-0.26.2.bazel'
git diff --exit-code -- ':!remote/BUILD.errno-0.2.8.bazel'
10 changes: 4 additions & 6 deletions bazel/cargo/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,19 +40,17 @@ alias(
)

alias(
name = "wasmsign",
actual = "@proxy_wasm_cpp_host__wasmsign__0_1_2//:wasmsign",
name = "cargo_bin_wasmsign",
actual = "@proxy_wasm_cpp_host__wasmsign__0_1_2//:cargo_bin_wasmsign",
tags = [
"cargo-raze",
"manual",
],
)

alias(
# Extra aliased target, from raze configuration
# N.B.: The exact form of this is subject to change.
name = "cargo_bin_wasmsign",
actual = "@proxy_wasm_cpp_host__wasmsign__0_1_2//:cargo_bin_wasmsign",
name = "wasmsign",
actual = "@proxy_wasm_cpp_host__wasmsign__0_1_2//:wasmsign",
tags = [
"cargo-raze",
"manual",
Expand Down
5 changes: 3 additions & 2 deletions bazel/cargo/remote/BUILD.addr2line-0.17.0.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects")

# buildifier: disable=load
load(
"@rules_rust//rust:rust.bzl",
"@rules_rust//rust:defs.bzl",
"rust_binary",
"rust_library",
"rust_proc_macro",
"rust_test",
)

Expand All @@ -38,14 +39,14 @@ rust_library(
crate_features = [
],
crate_root = "src/lib.rs",
crate_type = "lib",
data = [],
edition = "2015",
rustc_flags = [
"--cap-lints=allow",
],
tags = [
"cargo-raze",
"crate-name=addr2line",
"manual",
],
version = "0.17.0",
Expand Down
5 changes: 3 additions & 2 deletions bazel/cargo/remote/BUILD.adler-1.0.2.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects")

# buildifier: disable=load
load(
"@rules_rust//rust:rust.bzl",
"@rules_rust//rust:defs.bzl",
"rust_binary",
"rust_library",
"rust_proc_macro",
"rust_test",
)

Expand All @@ -38,14 +39,14 @@ rust_library(
crate_features = [
],
crate_root = "src/lib.rs",
crate_type = "lib",
data = [],
edition = "2015",
rustc_flags = [
"--cap-lints=allow",
],
tags = [
"cargo-raze",
"crate-name=adler",
"manual",
],
version = "1.0.2",
Expand Down
5 changes: 3 additions & 2 deletions bazel/cargo/remote/BUILD.aho-corasick-0.7.18.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects")

# buildifier: disable=load
load(
"@rules_rust//rust:rust.bzl",
"@rules_rust//rust:defs.bzl",
"rust_binary",
"rust_library",
"rust_proc_macro",
"rust_test",
)

Expand All @@ -38,14 +39,14 @@ rust_library(
"std",
],
crate_root = "src/lib.rs",
crate_type = "lib",
data = [],
edition = "2018",
rustc_flags = [
"--cap-lints=allow",
],
tags = [
"cargo-raze",
"crate-name=aho_corasick",
"manual",
],
version = "0.7.18",
Expand Down
5 changes: 3 additions & 2 deletions bazel/cargo/remote/BUILD.ansi_term-0.12.1.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects")

# buildifier: disable=load
load(
"@rules_rust//rust:rust.bzl",
"@rules_rust//rust:defs.bzl",
"rust_binary",
"rust_library",
"rust_proc_macro",
"rust_test",
)

Expand Down Expand Up @@ -44,14 +45,14 @@ rust_library(
crate_features = [
],
crate_root = "src/lib.rs",
crate_type = "lib",
data = [],
edition = "2015",
rustc_flags = [
"--cap-lints=allow",
],
tags = [
"cargo-raze",
"crate-name=ansi_term",
"manual",
],
version = "0.12.1",
Expand Down
5 changes: 3 additions & 2 deletions bazel/cargo/remote/BUILD.anyhow-1.0.52.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects")

# buildifier: disable=load
load(
"@rules_rust//rust:rust.bzl",
"@rules_rust//rust:defs.bzl",
"rust_binary",
"rust_library",
"rust_proc_macro",
"rust_test",
)

Expand Down Expand Up @@ -69,14 +70,14 @@ rust_library(
"std",
],
crate_root = "src/lib.rs",
crate_type = "lib",
data = [],
edition = "2018",
rustc_flags = [
"--cap-lints=allow",
],
tags = [
"cargo-raze",
"crate-name=anyhow",
"manual",
],
version = "1.0.52",
Expand Down
13 changes: 7 additions & 6 deletions bazel/cargo/remote/BUILD.atty-0.2.14.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects")

# buildifier: disable=load
load(
"@rules_rust//rust:rust.bzl",
"@rules_rust//rust:defs.bzl",
"rust_binary",
"rust_library",
"rust_proc_macro",
"rust_test",
)

Expand Down Expand Up @@ -40,14 +41,14 @@ rust_library(
crate_features = [
],
crate_root = "src/lib.rs",
crate_type = "lib",
data = [],
edition = "2015",
rustc_flags = [
"--cap-lints=allow",
],
tags = [
"cargo-raze",
"crate-name=atty",
"manual",
],
version = "0.2.14",
Expand All @@ -56,22 +57,22 @@ rust_library(
] + selects.with_or({
# cfg(unix)
(
"@rules_rust//rust/platform:i686-apple-darwin",
"@rules_rust//rust/platform:i686-unknown-linux-gnu",
"@rules_rust//rust/platform:x86_64-apple-darwin",
"@rules_rust//rust/platform:x86_64-unknown-linux-gnu",
"@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-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: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-unknown-freebsd",
"@rules_rust//rust/platform:x86_64-unknown-linux-gnu",
): [
"@proxy_wasm_cpp_host__libc__0_2_112//:libc",
],
Expand Down
5 changes: 3 additions & 2 deletions bazel/cargo/remote/BUILD.autocfg-1.0.1.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects")

# buildifier: disable=load
load(
"@rules_rust//rust:rust.bzl",
"@rules_rust//rust:defs.bzl",
"rust_binary",
"rust_library",
"rust_proc_macro",
"rust_test",
)

Expand Down Expand Up @@ -44,14 +45,14 @@ rust_library(
crate_features = [
],
crate_root = "src/lib.rs",
crate_type = "lib",
data = [],
edition = "2015",
rustc_flags = [
"--cap-lints=allow",
],
tags = [
"cargo-raze",
"crate-name=autocfg",
"manual",
],
version = "1.0.1",
Expand Down
27 changes: 5 additions & 22 deletions bazel/cargo/remote/BUILD.backtrace-0.3.63.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects")

# buildifier: disable=load
load(
"@rules_rust//rust:rust.bzl",
"@rules_rust//rust:defs.bzl",
"rust_binary",
"rust_library",
"rust_proc_macro",
"rust_test",
)

Expand Down Expand Up @@ -59,15 +60,7 @@ cargo_build_script(
visibility = ["//visibility:private"],
deps = [
"@proxy_wasm_cpp_host__cc__1_0_72//:cc",
] + selects.with_or({
# cfg(windows)
(
"@rules_rust//rust/platform:i686-pc-windows-msvc",
"@rules_rust//rust/platform:x86_64-pc-windows-msvc",
): [
],
"//conditions:default": [],
}),
],
)

# Unsupported target "benchmarks" with type "bench" omitted
Expand All @@ -79,21 +72,19 @@ cargo_build_script(
rust_library(
name = "backtrace",
srcs = glob(["**/*.rs"]),
aliases = {
},
crate_features = [
"default",
"std",
],
crate_root = "src/lib.rs",
crate_type = "lib",
data = [],
edition = "2018",
rustc_flags = [
"--cap-lints=allow",
],
tags = [
"cargo-raze",
"crate-name=backtrace",
"manual",
],
version = "0.3.63",
Expand All @@ -106,15 +97,7 @@ rust_library(
"@proxy_wasm_cpp_host__miniz_oxide__0_4_4//:miniz_oxide",
"@proxy_wasm_cpp_host__object__0_27_1//:object",
"@proxy_wasm_cpp_host__rustc_demangle__0_1_21//:rustc_demangle",
] + selects.with_or({
# cfg(windows)
(
"@rules_rust//rust/platform:i686-pc-windows-msvc",
"@rules_rust//rust/platform:x86_64-pc-windows-msvc",
): [
],
"//conditions:default": [],
}),
],
)

# Unsupported target "accuracy" with type "test" omitted
Expand Down
5 changes: 3 additions & 2 deletions bazel/cargo/remote/BUILD.bincode-1.3.3.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects")

# buildifier: disable=load
load(
"@rules_rust//rust:rust.bzl",
"@rules_rust//rust:defs.bzl",
"rust_binary",
"rust_library",
"rust_proc_macro",
"rust_test",
)

Expand All @@ -36,14 +37,14 @@ rust_library(
crate_features = [
],
crate_root = "src/lib.rs",
crate_type = "lib",
data = [],
edition = "2015",
rustc_flags = [
"--cap-lints=allow",
],
tags = [
"cargo-raze",
"crate-name=bincode",
"manual",
],
version = "1.3.3",
Expand Down
5 changes: 3 additions & 2 deletions bazel/cargo/remote/BUILD.bitflags-1.3.2.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects")

# buildifier: disable=load
load(
"@rules_rust//rust:rust.bzl",
"@rules_rust//rust:defs.bzl",
"rust_binary",
"rust_library",
"rust_proc_macro",
"rust_test",
)

Expand All @@ -37,14 +38,14 @@ rust_library(
"default",
],
crate_root = "src/lib.rs",
crate_type = "lib",
data = [],
edition = "2018",
rustc_flags = [
"--cap-lints=allow",
],
tags = [
"cargo-raze",
"crate-name=bitflags",
"manual",
],
version = "1.3.2",
Expand Down
Loading