From 73eced43926fa2eb1d8cb6be98f0dba4f2ca9525 Mon Sep 17 00:00:00 2001 From: Piotr Sikora Date: Fri, 5 Feb 2021 12:25:40 +0000 Subject: [PATCH 1/2] Update cargo-raze to v0.9.2. Signed-off-by: Piotr Sikora --- .github/workflows/rust.yml | 12 +----- Cargo.toml | 10 +---- README.md | 6 +-- bazel/cargo/BUILD.bazel | 8 ++++ bazel/cargo/{Cargo.lock => Cargo.raze.lock} | 0 bazel/cargo/remote/BUILD.ahash-0.4.7.bazel | 1 + bazel/cargo/remote/BUILD.autocfg-1.0.1.bazel | 1 + bazel/cargo/remote/BUILD.cfg-if-1.0.0.bazel | 1 + bazel/cargo/remote/BUILD.chrono-0.4.19.bazel | 1 + .../cargo/remote/BUILD.getrandom-0.2.2.bazel | 6 ++- .../cargo/remote/BUILD.hashbrown-0.9.1.bazel | 1 + bazel/cargo/remote/BUILD.libc-0.2.85.bazel | 4 +- bazel/cargo/remote/BUILD.log-0.4.14.bazel | 4 +- .../remote/BUILD.num-integer-0.1.44.bazel | 33 ++++++++++++++++- .../remote/BUILD.num-traits-0.2.14.bazel | 31 +++++++++++++++- bazel/cargo/remote/BUILD.time-0.1.43.bazel | 1 + ...D.wasi-0.10.2+wasi-snapshot-preview1.bazel | 1 + bazel/cargo/remote/BUILD.winapi-0.3.9.bazel | 37 ++++++++++++++++++- ...ILD.winapi-i686-pc-windows-gnu-0.4.0.bazel | 30 ++++++++++++++- ...D.winapi-x86_64-pc-windows-gnu-0.4.0.bazel | 30 ++++++++++++++- 20 files changed, 186 insertions(+), 32 deletions(-) rename bazel/cargo/{Cargo.lock => Cargo.raze.lock} (100%) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 8410bf36..93d499db 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -75,11 +75,9 @@ jobs: - name: Format (cargo raze) run: | - cargo install cargo-raze --version 0.7.0 - cp -p bazel/cargo/Cargo.lock . rm -rf bazel/cargo/ - cargo raze --output=bazel/cargo - mv Cargo.lock bazel/cargo/ + cargo install cargo-raze --version 0.9.2 + cargo raze --generate-lockfile --output=bazel/cargo git diff --exit-code stable: @@ -200,12 +198,6 @@ jobs: - name: Run cargo outdated run: cargo outdated --root-deps-only --exit-code 1 - - name: Check freshness of bazel/cargo/Cargo.lock - run: | - cargo generate-lockfile - mv Cargo.lock bazel/cargo/ - git diff --exit-code - audit: runs-on: ubuntu-latest diff --git a/Cargo.toml b/Cargo.toml index 0dff6f1d..dd0937ac 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,18 +29,10 @@ opt-level = 3 panic = "abort" [package.metadata.raze] +package_aliases_dir = "bazel/cargo" workspace_path = "//bazel/cargo" genmode = "Remote" -[package.metadata.raze.crates.getrandom.'=0.2.2'] -gen_buildrs = true - -[package.metadata.raze.crates.libc.'=0.2.85'] -gen_buildrs = true - -[package.metadata.raze.crates.log.'=0.4.14'] -gen_buildrs = true - [[example]] name = "hello_world" path = "examples/hello_world.rs" diff --git a/README.md b/README.md index e708990e..1817bd5a 100644 --- a/README.md +++ b/README.md @@ -30,9 +30,7 @@ When updating dependencies, you need to regenerate Bazel `BUILD` files to match updated `Cargo.toml`: ``` -cargo install cargo-raze --version 0.7.0 -rm -rf bazel/cargo/ -cargo generate-lockfile -cargo raze --output=bazel/cargo +cargo install cargo-raze --version 0.9.2 +cargo raze --generate-lockfile --output=bazel/cargo mv Cargo.lock bazel/cargo/ ``` diff --git a/bazel/cargo/BUILD.bazel b/bazel/cargo/BUILD.bazel index 82578fa2..b9db7826 100644 --- a/bazel/cargo/BUILD.bazel +++ b/bazel/cargo/BUILD.bazel @@ -56,3 +56,11 @@ alias( "manual", ], ) + +# Export file for Stardoc support +exports_files( + [ + "crates.bzl", + ], + visibility = ["//visibility:public"], +) diff --git a/bazel/cargo/Cargo.lock b/bazel/cargo/Cargo.raze.lock similarity index 100% rename from bazel/cargo/Cargo.lock rename to bazel/cargo/Cargo.raze.lock diff --git a/bazel/cargo/remote/BUILD.ahash-0.4.7.bazel b/bazel/cargo/remote/BUILD.ahash-0.4.7.bazel index 99ca0a90..da28b8d0 100644 --- a/bazel/cargo/remote/BUILD.ahash-0.4.7.bazel +++ b/bazel/cargo/remote/BUILD.ahash-0.4.7.bazel @@ -41,6 +41,7 @@ rust_library( ], crate_root = "src/lib.rs", crate_type = "lib", + data = [], edition = "2018", rustc_flags = [ "--cap-lints=allow", diff --git a/bazel/cargo/remote/BUILD.autocfg-1.0.1.bazel b/bazel/cargo/remote/BUILD.autocfg-1.0.1.bazel index e7de20ab..7d390016 100644 --- a/bazel/cargo/remote/BUILD.autocfg-1.0.1.bazel +++ b/bazel/cargo/remote/BUILD.autocfg-1.0.1.bazel @@ -45,6 +45,7 @@ rust_library( ], crate_root = "src/lib.rs", crate_type = "lib", + data = [], edition = "2015", rustc_flags = [ "--cap-lints=allow", diff --git a/bazel/cargo/remote/BUILD.cfg-if-1.0.0.bazel b/bazel/cargo/remote/BUILD.cfg-if-1.0.0.bazel index 6e3db87e..57545ac7 100644 --- a/bazel/cargo/remote/BUILD.cfg-if-1.0.0.bazel +++ b/bazel/cargo/remote/BUILD.cfg-if-1.0.0.bazel @@ -37,6 +37,7 @@ rust_library( ], crate_root = "src/lib.rs", crate_type = "lib", + data = [], edition = "2018", rustc_flags = [ "--cap-lints=allow", diff --git a/bazel/cargo/remote/BUILD.chrono-0.4.19.bazel b/bazel/cargo/remote/BUILD.chrono-0.4.19.bazel index 7420c4cc..199b0697 100644 --- a/bazel/cargo/remote/BUILD.chrono-0.4.19.bazel +++ b/bazel/cargo/remote/BUILD.chrono-0.4.19.bazel @@ -50,6 +50,7 @@ rust_library( ], crate_root = "src/lib.rs", crate_type = "lib", + data = [], edition = "2015", rustc_flags = [ "--cap-lints=allow", diff --git a/bazel/cargo/remote/BUILD.getrandom-0.2.2.bazel b/bazel/cargo/remote/BUILD.getrandom-0.2.2.bazel index 8a46a3ad..04465d5f 100644 --- a/bazel/cargo/remote/BUILD.getrandom-0.2.2.bazel +++ b/bazel/cargo/remote/BUILD.getrandom-0.2.2.bazel @@ -28,7 +28,8 @@ licenses([ "notice", # MIT from expression "MIT OR Apache-2.0" ]) -# Generated Targets# buildifier: disable=load-on-top +# Generated Targets +# buildifier: disable=load-on-top load( "@io_bazel_rules_rust//cargo:cargo_build_script.bzl", "cargo_build_script", @@ -71,6 +72,7 @@ cargo_build_script( }) + selects.with_or({ # cfg(unix) ( + "@io_bazel_rules_rust//rust/platform:aarch64-apple-darwin", "@io_bazel_rules_rust//rust/platform:aarch64-apple-ios", "@io_bazel_rules_rust//rust/platform:aarch64-linux-android", "@io_bazel_rules_rust//rust/platform:aarch64-unknown-linux-gnu", @@ -103,6 +105,7 @@ rust_library( ], crate_root = "src/lib.rs", crate_type = "lib", + data = [], edition = "2018", rustc_flags = [ "--cap-lints=allow", @@ -134,6 +137,7 @@ rust_library( }) + selects.with_or({ # cfg(unix) ( + "@io_bazel_rules_rust//rust/platform:aarch64-apple-darwin", "@io_bazel_rules_rust//rust/platform:aarch64-apple-ios", "@io_bazel_rules_rust//rust/platform:aarch64-linux-android", "@io_bazel_rules_rust//rust/platform:aarch64-unknown-linux-gnu", diff --git a/bazel/cargo/remote/BUILD.hashbrown-0.9.1.bazel b/bazel/cargo/remote/BUILD.hashbrown-0.9.1.bazel index 9cc788fd..4034269b 100644 --- a/bazel/cargo/remote/BUILD.hashbrown-0.9.1.bazel +++ b/bazel/cargo/remote/BUILD.hashbrown-0.9.1.bazel @@ -42,6 +42,7 @@ rust_library( ], crate_root = "src/lib.rs", crate_type = "lib", + data = [], edition = "2018", rustc_flags = [ "--cap-lints=allow", diff --git a/bazel/cargo/remote/BUILD.libc-0.2.85.bazel b/bazel/cargo/remote/BUILD.libc-0.2.85.bazel index 9927ba4a..a9543d07 100644 --- a/bazel/cargo/remote/BUILD.libc-0.2.85.bazel +++ b/bazel/cargo/remote/BUILD.libc-0.2.85.bazel @@ -28,7 +28,8 @@ licenses([ "notice", # MIT from expression "MIT OR Apache-2.0" ]) -# Generated Targets# buildifier: disable=load-on-top +# Generated Targets +# buildifier: disable=load-on-top load( "@io_bazel_rules_rust//cargo:cargo_build_script.bzl", "cargo_build_script", @@ -68,6 +69,7 @@ rust_library( ], crate_root = "src/lib.rs", crate_type = "lib", + data = [], edition = "2015", rustc_flags = [ "--cap-lints=allow", diff --git a/bazel/cargo/remote/BUILD.log-0.4.14.bazel b/bazel/cargo/remote/BUILD.log-0.4.14.bazel index 61bc6926..b66616ec 100644 --- a/bazel/cargo/remote/BUILD.log-0.4.14.bazel +++ b/bazel/cargo/remote/BUILD.log-0.4.14.bazel @@ -28,7 +28,8 @@ licenses([ "notice", # MIT from expression "MIT OR Apache-2.0" ]) -# Generated Targets# buildifier: disable=load-on-top +# Generated Targets +# buildifier: disable=load-on-top load( "@io_bazel_rules_rust//cargo:cargo_build_script.bzl", "cargo_build_script", @@ -66,6 +67,7 @@ rust_library( ], crate_root = "src/lib.rs", crate_type = "lib", + data = [], edition = "2015", rustc_flags = [ "--cap-lints=allow", diff --git a/bazel/cargo/remote/BUILD.num-integer-0.1.44.bazel b/bazel/cargo/remote/BUILD.num-integer-0.1.44.bazel index f498d6a7..dce7b65a 100644 --- a/bazel/cargo/remote/BUILD.num-integer-0.1.44.bazel +++ b/bazel/cargo/remote/BUILD.num-integer-0.1.44.bazel @@ -29,6 +29,35 @@ licenses([ ]) # Generated Targets +# buildifier: disable=load-on-top +load( + "@io_bazel_rules_rust//cargo:cargo_build_script.bzl", + "cargo_build_script", +) + +cargo_build_script( + name = "num_integer_build_script", + srcs = glob(["**/*.rs"]), + build_script_env = { + }, + crate_features = [ + ], + crate_root = "build.rs", + data = glob(["**"]), + edition = "2015", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "manual", + ], + version = "0.1.44", + visibility = ["//visibility:private"], + deps = [ + "@raze__autocfg__1_0_1//:autocfg", + ], +) # Unsupported target "average" with type "bench" omitted @@ -36,8 +65,6 @@ licenses([ # Unsupported target "roots" with type "bench" omitted -# Unsupported target "build-script-build" with type "custom-build" omitted - rust_library( name = "num_integer", srcs = glob(["**/*.rs"]), @@ -45,6 +72,7 @@ rust_library( ], crate_root = "src/lib.rs", crate_type = "lib", + data = [], edition = "2015", rustc_flags = [ "--cap-lints=allow", @@ -56,6 +84,7 @@ rust_library( version = "0.1.44", # buildifier: leave-alone deps = [ + ":num_integer_build_script", "@raze__num_traits__0_2_14//:num_traits", ], ) diff --git a/bazel/cargo/remote/BUILD.num-traits-0.2.14.bazel b/bazel/cargo/remote/BUILD.num-traits-0.2.14.bazel index 683f9d57..b8e710d7 100644 --- a/bazel/cargo/remote/BUILD.num-traits-0.2.14.bazel +++ b/bazel/cargo/remote/BUILD.num-traits-0.2.14.bazel @@ -29,8 +29,35 @@ licenses([ ]) # Generated Targets +# buildifier: disable=load-on-top +load( + "@io_bazel_rules_rust//cargo:cargo_build_script.bzl", + "cargo_build_script", +) -# Unsupported target "build-script-build" with type "custom-build" omitted +cargo_build_script( + name = "num_traits_build_script", + srcs = glob(["**/*.rs"]), + build_script_env = { + }, + crate_features = [ + ], + crate_root = "build.rs", + data = glob(["**"]), + edition = "2015", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "manual", + ], + version = "0.2.14", + visibility = ["//visibility:private"], + deps = [ + "@raze__autocfg__1_0_1//:autocfg", + ], +) rust_library( name = "num_traits", @@ -39,6 +66,7 @@ rust_library( ], crate_root = "src/lib.rs", crate_type = "lib", + data = [], edition = "2015", rustc_flags = [ "--cap-lints=allow", @@ -50,6 +78,7 @@ rust_library( version = "0.2.14", # buildifier: leave-alone deps = [ + ":num_traits_build_script", ], ) diff --git a/bazel/cargo/remote/BUILD.time-0.1.43.bazel b/bazel/cargo/remote/BUILD.time-0.1.43.bazel index 37c141c6..cf14a2dd 100644 --- a/bazel/cargo/remote/BUILD.time-0.1.43.bazel +++ b/bazel/cargo/remote/BUILD.time-0.1.43.bazel @@ -39,6 +39,7 @@ rust_library( ], crate_root = "src/lib.rs", crate_type = "lib", + data = [], edition = "2015", rustc_flags = [ "--cap-lints=allow", diff --git a/bazel/cargo/remote/BUILD.wasi-0.10.2+wasi-snapshot-preview1.bazel b/bazel/cargo/remote/BUILD.wasi-0.10.2+wasi-snapshot-preview1.bazel index 6375caa4..ea01ebc3 100644 --- a/bazel/cargo/remote/BUILD.wasi-0.10.2+wasi-snapshot-preview1.bazel +++ b/bazel/cargo/remote/BUILD.wasi-0.10.2+wasi-snapshot-preview1.bazel @@ -39,6 +39,7 @@ rust_library( ], crate_root = "src/lib.rs", crate_type = "lib", + data = [], edition = "2018", rustc_flags = [ "--cap-lints=allow", diff --git a/bazel/cargo/remote/BUILD.winapi-0.3.9.bazel b/bazel/cargo/remote/BUILD.winapi-0.3.9.bazel index fa325c78..49e0160e 100644 --- a/bazel/cargo/remote/BUILD.winapi-0.3.9.bazel +++ b/bazel/cargo/remote/BUILD.winapi-0.3.9.bazel @@ -29,8 +29,41 @@ licenses([ ]) # Generated Targets +# buildifier: disable=load-on-top +load( + "@io_bazel_rules_rust//cargo:cargo_build_script.bzl", + "cargo_build_script", +) -# Unsupported target "build-script-build" with type "custom-build" omitted +cargo_build_script( + name = "winapi_build_script", + srcs = glob(["**/*.rs"]), + build_script_env = { + }, + crate_features = [ + "minwinbase", + "minwindef", + "ntdef", + "profileapi", + "std", + "sysinfoapi", + "timezoneapi", + ], + crate_root = "build.rs", + data = glob(["**"]), + edition = "2015", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "manual", + ], + version = "0.3.9", + visibility = ["//visibility:private"], + deps = [ + ], +) rust_library( name = "winapi", @@ -46,6 +79,7 @@ rust_library( ], crate_root = "src/lib.rs", crate_type = "lib", + data = [], edition = "2015", rustc_flags = [ "--cap-lints=allow", @@ -57,5 +91,6 @@ rust_library( version = "0.3.9", # buildifier: leave-alone deps = [ + ":winapi_build_script", ], ) diff --git a/bazel/cargo/remote/BUILD.winapi-i686-pc-windows-gnu-0.4.0.bazel b/bazel/cargo/remote/BUILD.winapi-i686-pc-windows-gnu-0.4.0.bazel index 7a0447a4..68773fbd 100644 --- a/bazel/cargo/remote/BUILD.winapi-i686-pc-windows-gnu-0.4.0.bazel +++ b/bazel/cargo/remote/BUILD.winapi-i686-pc-windows-gnu-0.4.0.bazel @@ -29,8 +29,34 @@ licenses([ ]) # Generated Targets +# buildifier: disable=load-on-top +load( + "@io_bazel_rules_rust//cargo:cargo_build_script.bzl", + "cargo_build_script", +) -# Unsupported target "build-script-build" with type "custom-build" omitted +cargo_build_script( + name = "winapi_i686_pc_windows_gnu_build_script", + srcs = glob(["**/*.rs"]), + build_script_env = { + }, + crate_features = [ + ], + crate_root = "build.rs", + data = glob(["**"]), + edition = "2015", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "manual", + ], + version = "0.4.0", + visibility = ["//visibility:private"], + deps = [ + ], +) rust_library( name = "winapi_i686_pc_windows_gnu", @@ -39,6 +65,7 @@ rust_library( ], crate_root = "src/lib.rs", crate_type = "lib", + data = [], edition = "2015", rustc_flags = [ "--cap-lints=allow", @@ -50,5 +77,6 @@ rust_library( version = "0.4.0", # buildifier: leave-alone deps = [ + ":winapi_i686_pc_windows_gnu_build_script", ], ) diff --git a/bazel/cargo/remote/BUILD.winapi-x86_64-pc-windows-gnu-0.4.0.bazel b/bazel/cargo/remote/BUILD.winapi-x86_64-pc-windows-gnu-0.4.0.bazel index 95d47678..5155a8ee 100644 --- a/bazel/cargo/remote/BUILD.winapi-x86_64-pc-windows-gnu-0.4.0.bazel +++ b/bazel/cargo/remote/BUILD.winapi-x86_64-pc-windows-gnu-0.4.0.bazel @@ -29,8 +29,34 @@ licenses([ ]) # Generated Targets +# buildifier: disable=load-on-top +load( + "@io_bazel_rules_rust//cargo:cargo_build_script.bzl", + "cargo_build_script", +) -# Unsupported target "build-script-build" with type "custom-build" omitted +cargo_build_script( + name = "winapi_x86_64_pc_windows_gnu_build_script", + srcs = glob(["**/*.rs"]), + build_script_env = { + }, + crate_features = [ + ], + crate_root = "build.rs", + data = glob(["**"]), + edition = "2015", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "manual", + ], + version = "0.4.0", + visibility = ["//visibility:private"], + deps = [ + ], +) rust_library( name = "winapi_x86_64_pc_windows_gnu", @@ -39,6 +65,7 @@ rust_library( ], crate_root = "src/lib.rs", crate_type = "lib", + data = [], edition = "2015", rustc_flags = [ "--cap-lints=allow", @@ -50,5 +77,6 @@ rust_library( version = "0.4.0", # buildifier: leave-alone deps = [ + ":winapi_x86_64_pc_windows_gnu_build_script", ], ) From ecd77c070ff7adc197979de84ed4fd438a900783 Mon Sep 17 00:00:00 2001 From: Piotr Sikora Date: Fri, 5 Feb 2021 12:33:31 +0000 Subject: [PATCH 2/2] review: missed Cargo.lock changes. Signed-off-by: Piotr Sikora --- .github/workflows/rust.yml | 4 ++-- README.md | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 93d499db..51138d63 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -57,7 +57,7 @@ jobs: ~/.cargo/.crates2.json ~/.cargo/bin ~/.cargo/registry - key: ${{ hashFiles('WORKSPACE', '.bazelrc', '.bazelversion', 'bazel/cargo/Cargo.lock', 'bazel/dependencies.bzl', 'bazel/repositories.bzl') }} + key: ${{ hashFiles('WORKSPACE', '.bazelrc', '.bazelversion', 'bazel/cargo/Cargo.raze.lock', 'bazel/dependencies.bzl', 'bazel/repositories.bzl') }} - name: Build (wasm32-unknown-unknown) run: bazelisk --bazelrc=/dev/null build --platforms=@io_bazel_rules_rust//rust/platform:wasm //... @@ -206,5 +206,5 @@ jobs: - name: Run cargo audit run: | - cp -p bazel/cargo/Cargo.lock . + cp -p bazel/cargo/Cargo.raze.lock . cargo audit diff --git a/README.md b/README.md index 1817bd5a..bb9b5a32 100644 --- a/README.md +++ b/README.md @@ -32,5 +32,4 @@ When updating dependencies, you need to regenerate Bazel `BUILD` files to match ``` cargo install cargo-raze --version 0.9.2 cargo raze --generate-lockfile --output=bazel/cargo -mv Cargo.lock bazel/cargo/ ```