From 3bae1487096655bcda128d775f28a9c56174bd6d Mon Sep 17 00:00:00 2001 From: UebelAndre Date: Wed, 11 Sep 2024 06:38:53 -0700 Subject: [PATCH] Update crate universe to generate build script targets with compile data (#2855) https://github.com/bazelbuild/rules_rust/pull/2826 ended up introducing a regression for crates with build scripts that require extra data at compile time. This change adds a default glob for all `cargo_build_script` targets generated by `crate_universe` and also introduces an `annotation.build_script_compile_data` attribute to add custom targets to generated outputs. --- .../crates/BUILD.bindgen-0.69.1.bazel | 12 ++ .../crates/BUILD.clang-sys-1.6.1.bazel | 12 ++ .../3rdparty/crates/BUILD.libc-0.2.146.bazel | 12 ++ .../crates/BUILD.rustix-0.37.20.bazel | 12 ++ .../3rdparty/crates/BUILD.winapi-0.3.9.bazel | 12 ++ .../3rdparty/crates/BUILD.anyhow-1.0.75.bazel | 12 ++ .../3rdparty/crates/BUILD.camino-1.1.6.bazel | 12 ++ .../crates/BUILD.chrono-tz-0.8.4.bazel | 12 ++ .../crates/BUILD.crc32fast-1.3.2.bazel | 12 ++ .../crates/BUILD.crossbeam-epoch-0.9.15.bazel | 12 ++ .../crates/BUILD.crossbeam-queue-0.3.8.bazel | 12 ++ .../crates/BUILD.crossbeam-utils-0.8.16.bazel | 12 ++ .../crates/BUILD.errno-dragonfly-0.1.2.bazel | 12 ++ .../crates/BUILD.generic-array-0.14.7.bazel | 12 ++ .../BUILD.iana-time-zone-haiku-0.1.2.bazel | 12 ++ .../crates/BUILD.io-lifetimes-1.0.11.bazel | 12 ++ .../3rdparty/crates/BUILD.libc-0.2.149.bazel | 12 ++ .../3rdparty/crates/BUILD.libm-0.2.7.bazel | 12 ++ .../crates/BUILD.lock_api-0.4.11.bazel | 12 ++ .../crates/BUILD.memoffset-0.9.0.bazel | 12 ++ .../crates/BUILD.num-integer-0.1.45.bazel | 12 ++ .../crates/BUILD.num-iter-0.1.43.bazel | 12 ++ .../crates/BUILD.num-traits-0.2.15.bazel | 12 ++ .../crates/BUILD.parking_lot_core-0.9.9.bazel | 12 ++ .../crates/BUILD.proc-macro2-1.0.64.bazel | 12 ++ .../3rdparty/crates/BUILD.quote-1.0.29.bazel | 12 ++ .../crates/BUILD.rayon-core-1.12.0.bazel | 12 ++ .../crates/BUILD.rustix-0.37.23.bazel | 12 ++ .../crates/BUILD.rustix-0.38.21.bazel | 12 ++ .../3rdparty/crates/BUILD.semver-1.0.20.bazel | 12 ++ .../3rdparty/crates/BUILD.serde-1.0.190.bazel | 12 ++ .../crates/BUILD.serde_json-1.0.108.bazel | 12 ++ .../3rdparty/crates/BUILD.syn-1.0.109.bazel | 12 ++ .../crates/BUILD.thiserror-1.0.50.bazel | 12 ++ .../crates/BUILD.typenum-1.16.0.bazel | 12 ++ .../crates/BUILD.valuable-0.1.0.bazel | 12 ++ .../crates/BUILD.wasm-bindgen-0.2.87.bazel | 12 ++ .../BUILD.wasm-bindgen-shared-0.2.87.bazel | 12 ++ .../3rdparty/crates/BUILD.winapi-0.3.9.bazel | 12 ++ ...ILD.winapi-i686-pc-windows-gnu-0.4.0.bazel | 12 ++ ...D.winapi-x86_64-pc-windows-gnu-0.4.0.bazel | 12 ++ ...BUILD.windows_aarch64_gnullvm-0.48.0.bazel | 12 ++ .../BUILD.windows_aarch64_msvc-0.48.0.bazel | 12 ++ .../BUILD.windows_i686_gnu-0.48.0.bazel | 12 ++ .../BUILD.windows_i686_msvc-0.48.0.bazel | 12 ++ .../BUILD.windows_x86_64_gnu-0.48.0.bazel | 12 ++ .../BUILD.windows_x86_64_gnullvm-0.48.0.bazel | 12 ++ .../BUILD.windows_x86_64_msvc-0.48.0.bazel | 12 ++ crate_universe/private/crate.bzl | 3 + crate_universe/src/config.rs | 5 + crate_universe/src/context/crate_context.rs | 11 ++ crate_universe/src/lockfile.rs | 2 +- crate_universe/src/rendering.rs | 5 +- crate_universe/src/utils/starlark.rs | 3 +- docs/src/crate_universe.md | 15 +- ...zel-lock_global_alias_annotation_none.json | 5 +- ...azel-lock_global_alias_annotation_opt.json | 5 +- ...el-lock_global_custom_annotation_none.json | 5 +- ...-lock_global_dbg_annotation_fastbuild.json | 5 +- ...azel-lock_global_opt_annotation_alias.json | 5 +- ...-bazel-lock_global_opt_annotation_dbg.json | 5 +- ...bazel-lock_global_opt_annotation_none.json | 5 +- .../cargo_aliases/cargo-bazel-lock.json | 47 +++++- .../cargo-bazel-lock.json | 8 +- .../cargo_workspace/cargo-bazel-lock.json | 17 +- .../cargo-bazel-lock.json | 53 ++++++- .../multi_package/cargo-bazel-lock.json | 149 +++++++++++++++++- .../no_cargo_manifests/cargo-bazel-lock.json | 92 ++++++++++- .../override_target/cargo-bazel-lock.json | 2 +- .../using_cxx/cargo-bazel-lock.json | 11 +- .../using_cxx/cxxbridge-cmd.Cargo.Bazel.lock | 14 +- .../crates/BUILD.indexmap-1.8.0.bazel | 12 ++ .../crates/BUILD.libc-0.2.119.bazel | 12 ++ .../crates/BUILD.memchr-2.4.1.bazel | 12 ++ .../crates/BUILD.proc-macro-error-1.0.4.bazel | 12 ++ .../BUILD.proc-macro-error-attr-1.0.4.bazel | 12 ++ .../crates/BUILD.proc-macro2-1.0.36.bazel | 12 ++ .../crates/BUILD.pulldown-cmark-0.8.0.bazel | 12 ++ .../crates/BUILD.semver-1.0.6.bazel | 12 ++ .../crates/BUILD.serde-1.0.136.bazel | 12 ++ .../crates/BUILD.syn-1.0.86.bazel | 12 ++ .../crates/BUILD.unicase-2.6.0.bazel | 12 ++ .../crates/BUILD.winapi-0.3.9.bazel | 12 ++ ...ILD.winapi-i686-pc-windows-gnu-0.4.0.bazel | 12 ++ ...D.winapi-x86_64-pc-windows-gnu-0.4.0.bazel | 12 ++ .../crates/libc-0.2.158/BUILD.bazel | 12 ++ .../crates/lock_api-0.4.12/BUILD.bazel | 12 ++ .../parking_lot_core-0.9.10/BUILD.bazel | 12 ++ .../crates/proc-macro2-1.0.86/BUILD.bazel | 12 ++ .../crates/rustix-0.38.36/BUILD.bazel | 12 ++ .../BUILD.bazel | 12 ++ .../windows_aarch64_msvc-0.52.6/BUILD.bazel | 12 ++ .../windows_i686_gnu-0.52.6/BUILD.bazel | 12 ++ .../windows_i686_gnullvm-0.52.6/BUILD.bazel | 12 ++ .../windows_i686_msvc-0.52.6/BUILD.bazel | 12 ++ .../windows_x86_64_gnu-0.52.6/BUILD.bazel | 12 ++ .../windows_x86_64_gnullvm-0.52.6/BUILD.bazel | 12 ++ .../windows_x86_64_msvc-0.52.6/BUILD.bazel | 12 ++ .../crates/httparse-1.9.4/BUILD.bazel | 12 ++ .../crates/libc-0.2.158/BUILD.bazel | 12 ++ .../crates/lock_api-0.4.12/BUILD.bazel | 12 ++ .../parking_lot_core-0.9.10/BUILD.bazel | 12 ++ .../crates/proc-macro2-1.0.86/BUILD.bazel | 12 ++ .../crates/serde-1.0.210/BUILD.bazel | 12 ++ .../crates/serde_json-1.0.128/BUILD.bazel | 12 ++ .../crates/slab-0.4.9/BUILD.bazel | 12 ++ .../crates/valuable-0.1.0/BUILD.bazel | 12 ++ .../crates/winapi-0.3.9/BUILD.bazel | 12 ++ .../BUILD.bazel | 12 ++ .../BUILD.bazel | 12 ++ .../BUILD.bazel | 12 ++ .../windows_aarch64_msvc-0.52.6/BUILD.bazel | 12 ++ .../windows_i686_gnu-0.52.6/BUILD.bazel | 12 ++ .../windows_i686_gnullvm-0.52.6/BUILD.bazel | 12 ++ .../windows_i686_msvc-0.52.6/BUILD.bazel | 12 ++ .../windows_x86_64_gnu-0.52.6/BUILD.bazel | 12 ++ .../windows_x86_64_gnullvm-0.52.6/BUILD.bazel | 12 ++ .../windows_x86_64_msvc-0.52.6/BUILD.bazel | 12 ++ .../crates/BUILD.libc-0.2.158.bazel | 12 ++ .../crates/BUILD.lock_api-0.4.12.bazel | 12 ++ .../BUILD.parking_lot_core-0.9.10.bazel | 12 ++ .../crates/BUILD.proc-macro2-1.0.86.bazel | 12 ++ .../crates/BUILD.rustix-0.38.36.bazel | 12 ++ ...BUILD.windows_aarch64_gnullvm-0.52.6.bazel | 12 ++ .../BUILD.windows_aarch64_msvc-0.52.6.bazel | 12 ++ .../BUILD.windows_i686_gnu-0.52.6.bazel | 12 ++ .../BUILD.windows_i686_gnullvm-0.52.6.bazel | 12 ++ .../BUILD.windows_i686_msvc-0.52.6.bazel | 12 ++ .../BUILD.windows_x86_64_gnu-0.52.6.bazel | 12 ++ .../BUILD.windows_x86_64_gnullvm-0.52.6.bazel | 12 ++ .../BUILD.windows_x86_64_msvc-0.52.6.bazel | 12 ++ .../crates/BUILD.httparse-1.9.4.bazel | 12 ++ .../crates/BUILD.libc-0.2.158.bazel | 12 ++ .../crates/BUILD.lock_api-0.4.12.bazel | 12 ++ .../BUILD.parking_lot_core-0.9.10.bazel | 12 ++ .../crates/BUILD.proc-macro2-1.0.86.bazel | 12 ++ .../crates/BUILD.serde-1.0.210.bazel | 12 ++ .../crates/BUILD.serde_json-1.0.128.bazel | 12 ++ .../crates/BUILD.slab-0.4.9.bazel | 12 ++ .../crates/BUILD.valuable-0.1.0.bazel | 12 ++ .../crates/BUILD.winapi-0.3.9.bazel | 12 ++ ...ILD.winapi-i686-pc-windows-gnu-0.4.0.bazel | 12 ++ ...D.winapi-x86_64-pc-windows-gnu-0.4.0.bazel | 12 ++ ...BUILD.windows_aarch64_gnullvm-0.52.6.bazel | 12 ++ .../BUILD.windows_aarch64_msvc-0.52.6.bazel | 12 ++ .../BUILD.windows_i686_gnu-0.52.6.bazel | 12 ++ .../BUILD.windows_i686_gnullvm-0.52.6.bazel | 12 ++ .../BUILD.windows_i686_msvc-0.52.6.bazel | 12 ++ .../BUILD.windows_x86_64_gnu-0.52.6.bazel | 12 ++ .../BUILD.windows_x86_64_gnullvm-0.52.6.bazel | 12 ++ .../BUILD.windows_x86_64_msvc-0.52.6.bazel | 12 ++ .../Cargo.Bazel.lock.json | 107 ++++++++++++- .../bazel/cargo/cargo-bazel-lock.json | 2 +- .../3rdparty/crates/BUILD.anyhow-1.0.86.bazel | 12 ++ .../3rdparty/crates/BUILD.axum-0.7.5.bazel | 12 ++ .../crates/BUILD.axum-core-0.4.3.bazel | 12 ++ .../crates/BUILD.backtrace-0.3.73.bazel | 12 ++ .../crates/BUILD.httparse-1.9.4.bazel | 12 ++ .../crates/BUILD.indexmap-1.9.3.bazel | 12 ++ .../3rdparty/crates/BUILD.libc-0.2.158.bazel | 12 ++ .../crates/BUILD.lock_api-0.4.12.bazel | 12 ++ .../BUILD.parking_lot_core-0.9.10.bazel | 12 ++ .../crates/BUILD.prettyplease-0.2.22.bazel | 12 ++ .../crates/BUILD.proc-macro2-1.0.86.bazel | 12 ++ .../crates/BUILD.rustix-0.38.34.bazel | 12 ++ .../crates/BUILD.rustversion-1.0.17.bazel | 12 ++ .../3rdparty/crates/BUILD.serde-1.0.209.bazel | 12 ++ .../3rdparty/crates/BUILD.slab-0.4.9.bazel | 12 ++ ...BUILD.windows_aarch64_gnullvm-0.52.6.bazel | 12 ++ .../BUILD.windows_aarch64_msvc-0.52.6.bazel | 12 ++ .../BUILD.windows_i686_gnu-0.52.6.bazel | 12 ++ .../BUILD.windows_i686_gnullvm-0.52.6.bazel | 12 ++ .../BUILD.windows_i686_msvc-0.52.6.bazel | 12 ++ .../BUILD.windows_x86_64_gnu-0.52.6.bazel | 12 ++ .../BUILD.windows_x86_64_gnullvm-0.52.6.bazel | 12 ++ .../BUILD.windows_x86_64_msvc-0.52.6.bazel | 12 ++ .../crates/BUILD.crossbeam-epoch-0.8.2.bazel | 12 ++ .../crates/BUILD.crossbeam-utils-0.7.2.bazel | 12 ++ .../3rdparty/crates/BUILD.httpbis-0.7.0.bazel | 12 ++ .../crates/BUILD.kernel32-sys-0.2.2.bazel | 12 ++ .../3rdparty/crates/BUILD.libc-0.2.139.bazel | 12 ++ .../3rdparty/crates/BUILD.log-0.4.17.bazel | 12 ++ .../crates/BUILD.maybe-uninit-2.0.0.bazel | 12 ++ .../crates/BUILD.memoffset-0.5.6.bazel | 12 ++ .../crates/BUILD.parking_lot-0.9.0.bazel | 12 ++ .../crates/BUILD.parking_lot_core-0.6.3.bazel | 12 ++ .../crates/BUILD.protobuf-2.8.2.bazel | 12 ++ .../3rdparty/crates/BUILD.slab-0.4.7.bazel | 12 ++ .../3rdparty/crates/BUILD.winapi-0.3.9.bazel | 12 ++ ...ILD.winapi-i686-pc-windows-gnu-0.4.0.bazel | 12 ++ ...D.winapi-x86_64-pc-windows-gnu-0.4.0.bazel | 12 ++ .../crates/BUILD.ws2_32-sys-0.2.1.bazel | 12 ++ .../crates/BUILD.proc-macro2-1.0.86.bazel | 12 ++ .../3rdparty/crates/BUILD.serde-1.0.210.bazel | 12 ++ .../crates/BUILD.serde_json-1.0.128.bazel | 12 ++ .../3rdparty/crates/BUILD.anyhow-1.0.71.bazel | 12 ++ .../crates/BUILD.errno-dragonfly-0.1.2.bazel | 12 ++ .../crates/BUILD.io-lifetimes-1.0.11.bazel | 12 ++ .../3rdparty/crates/BUILD.libc-0.2.147.bazel | 12 ++ .../3rdparty/crates/BUILD.memchr-2.5.0.bazel | 12 ++ .../crates/BUILD.proc-macro2-1.0.64.bazel | 12 ++ .../3rdparty/crates/BUILD.quote-1.0.29.bazel | 12 ++ .../crates/BUILD.rustix-0.37.23.bazel | 12 ++ .../3rdparty/crates/BUILD.serde-1.0.171.bazel | 12 ++ .../crates/BUILD.serde_json-1.0.102.bazel | 12 ++ .../3rdparty/crates/BUILD.winapi-0.3.9.bazel | 12 ++ ...ILD.winapi-i686-pc-windows-gnu-0.4.0.bazel | 12 ++ ...D.winapi-x86_64-pc-windows-gnu-0.4.0.bazel | 12 ++ ...BUILD.windows_aarch64_gnullvm-0.48.0.bazel | 12 ++ .../BUILD.windows_aarch64_msvc-0.48.0.bazel | 12 ++ .../BUILD.windows_i686_gnu-0.48.0.bazel | 12 ++ .../BUILD.windows_i686_msvc-0.48.0.bazel | 12 ++ .../BUILD.windows_x86_64_gnu-0.48.0.bazel | 12 ++ .../BUILD.windows_x86_64_gnullvm-0.48.0.bazel | 12 ++ .../BUILD.windows_x86_64_msvc-0.48.0.bazel | 12 ++ .../3rdparty/crates/BUILD.anyhow-1.0.71.bazel | 12 ++ .../crates/BUILD.crc32fast-1.3.2.bazel | 12 ++ .../crates/BUILD.crossbeam-epoch-0.9.15.bazel | 12 ++ .../crates/BUILD.crossbeam-utils-0.8.16.bazel | 12 ++ .../crates/BUILD.doc-comment-0.3.3.bazel | 12 ++ .../crates/BUILD.errno-dragonfly-0.1.2.bazel | 12 ++ .../crates/BUILD.httparse-1.8.0.bazel | 12 ++ .../BUILD.iana-time-zone-haiku-0.1.2.bazel | 12 ++ .../crates/BUILD.indexmap-1.9.3.bazel | 12 ++ .../crates/BUILD.io-lifetimes-1.0.11.bazel | 12 ++ .../3rdparty/crates/BUILD.libc-0.2.150.bazel | 12 ++ .../3rdparty/crates/BUILD.memchr-2.5.0.bazel | 12 ++ .../crates/BUILD.memoffset-0.9.0.bazel | 12 ++ .../crates/BUILD.mime_guess-2.0.4.bazel | 12 ++ .../crates/BUILD.num-traits-0.2.15.bazel | 12 ++ .../crates/BUILD.proc-macro2-1.0.64.bazel | 12 ++ .../3rdparty/crates/BUILD.quote-1.0.29.bazel | 12 ++ .../crates/BUILD.rayon-core-1.11.0.bazel | 12 ++ .../3rdparty/crates/BUILD.ring-0.17.5.bazel | 12 ++ .../crates/BUILD.rustix-0.37.23.bazel | 12 ++ .../3rdparty/crates/BUILD.rustls-0.21.8.bazel | 12 ++ .../3rdparty/crates/BUILD.semver-1.0.17.bazel | 12 ++ .../3rdparty/crates/BUILD.serde-1.0.171.bazel | 12 ++ .../crates/BUILD.serde_json-1.0.102.bazel | 12 ++ .../3rdparty/crates/BUILD.syn-1.0.109.bazel | 12 ++ .../crates/BUILD.tempfile-3.6.0.bazel | 12 ++ .../3rdparty/crates/BUILD.unicase-2.6.0.bazel | 12 ++ .../crates/BUILD.wasm-bindgen-0.2.92.bazel | 12 ++ .../BUILD.wasm-bindgen-shared-0.2.92.bazel | 12 ++ .../3rdparty/crates/BUILD.winapi-0.3.9.bazel | 12 ++ ...ILD.winapi-i686-pc-windows-gnu-0.4.0.bazel | 12 ++ ...D.winapi-x86_64-pc-windows-gnu-0.4.0.bazel | 12 ++ ...BUILD.windows_aarch64_gnullvm-0.48.0.bazel | 12 ++ .../BUILD.windows_aarch64_msvc-0.48.0.bazel | 12 ++ .../BUILD.windows_i686_gnu-0.48.0.bazel | 12 ++ .../BUILD.windows_i686_msvc-0.48.0.bazel | 12 ++ .../BUILD.windows_x86_64_gnu-0.48.0.bazel | 12 ++ .../BUILD.windows_x86_64_gnullvm-0.48.0.bazel | 12 ++ .../BUILD.windows_x86_64_msvc-0.48.0.bazel | 12 ++ 254 files changed, 3301 insertions(+), 28 deletions(-) diff --git a/bindgen/3rdparty/crates/BUILD.bindgen-0.69.1.bazel b/bindgen/3rdparty/crates/BUILD.bindgen-0.69.1.bazel index 66929d6a92..8463cf454f 100644 --- a/bindgen/3rdparty/crates/BUILD.bindgen-0.69.1.bazel +++ b/bindgen/3rdparty/crates/BUILD.bindgen-0.69.1.bazel @@ -108,6 +108,18 @@ cargo_build_script( include = ["**/*.rs"], allow_empty = True, ), + compile_data = glob( + include = ["**"], + allow_empty = True, + exclude = [ + "**/* *", + ".tmp_git_root/**/*", + "BUILD", + "BUILD.bazel", + "WORKSPACE", + "WORKSPACE.bazel", + ], + ), crate_features = [ "__cli", "experimental", diff --git a/bindgen/3rdparty/crates/BUILD.clang-sys-1.6.1.bazel b/bindgen/3rdparty/crates/BUILD.clang-sys-1.6.1.bazel index c6412c083d..f916868bc7 100644 --- a/bindgen/3rdparty/crates/BUILD.clang-sys-1.6.1.bazel +++ b/bindgen/3rdparty/crates/BUILD.clang-sys-1.6.1.bazel @@ -113,6 +113,18 @@ cargo_build_script( include = ["**/*.rs"], allow_empty = True, ), + compile_data = glob( + include = ["**"], + allow_empty = True, + exclude = [ + "**/* *", + ".tmp_git_root/**/*", + "BUILD", + "BUILD.bazel", + "WORKSPACE", + "WORKSPACE.bazel", + ], + ), crate_features = [ "clang_10_0", "clang_11_0", diff --git a/bindgen/3rdparty/crates/BUILD.libc-0.2.146.bazel b/bindgen/3rdparty/crates/BUILD.libc-0.2.146.bazel index 37074ff6fc..a83e0612fa 100644 --- a/bindgen/3rdparty/crates/BUILD.libc-0.2.146.bazel +++ b/bindgen/3rdparty/crates/BUILD.libc-0.2.146.bazel @@ -247,6 +247,18 @@ cargo_build_script( include = ["**/*.rs"], allow_empty = True, ), + compile_data = glob( + include = ["**"], + allow_empty = True, + exclude = [ + "**/* *", + ".tmp_git_root/**/*", + "BUILD", + "BUILD.bazel", + "WORKSPACE", + "WORKSPACE.bazel", + ], + ), crate_features = select({ "@rules_rust//rust/platform:aarch64-apple-darwin": [ "default", # aarch64-apple-darwin diff --git a/bindgen/3rdparty/crates/BUILD.rustix-0.37.20.bazel b/bindgen/3rdparty/crates/BUILD.rustix-0.37.20.bazel index 29a7553a7f..afa3da888e 100644 --- a/bindgen/3rdparty/crates/BUILD.rustix-0.37.20.bazel +++ b/bindgen/3rdparty/crates/BUILD.rustix-0.37.20.bazel @@ -298,6 +298,18 @@ cargo_build_script( include = ["**/*.rs"], allow_empty = True, ), + compile_data = glob( + include = ["**"], + allow_empty = True, + exclude = [ + "**/* *", + ".tmp_git_root/**/*", + "BUILD", + "BUILD.bazel", + "WORKSPACE", + "WORKSPACE.bazel", + ], + ), crate_features = [ "default", "io-lifetimes", diff --git a/bindgen/3rdparty/crates/BUILD.winapi-0.3.9.bazel b/bindgen/3rdparty/crates/BUILD.winapi-0.3.9.bazel index 5bf160aaad..18a445b9a5 100644 --- a/bindgen/3rdparty/crates/BUILD.winapi-0.3.9.bazel +++ b/bindgen/3rdparty/crates/BUILD.winapi-0.3.9.bazel @@ -104,6 +104,18 @@ cargo_build_script( include = ["**/*.rs"], allow_empty = True, ), + compile_data = glob( + include = ["**"], + allow_empty = True, + exclude = [ + "**/* *", + ".tmp_git_root/**/*", + "BUILD", + "BUILD.bazel", + "WORKSPACE", + "WORKSPACE.bazel", + ], + ), crate_features = [ "consoleapi", "errhandlingapi", diff --git a/crate_universe/3rdparty/crates/BUILD.anyhow-1.0.75.bazel b/crate_universe/3rdparty/crates/BUILD.anyhow-1.0.75.bazel index cf018381e3..701cf2bd01 100644 --- a/crate_universe/3rdparty/crates/BUILD.anyhow-1.0.75.bazel +++ b/crate_universe/3rdparty/crates/BUILD.anyhow-1.0.75.bazel @@ -94,6 +94,18 @@ cargo_build_script( include = ["**/*.rs"], allow_empty = True, ), + compile_data = glob( + include = ["**"], + allow_empty = True, + exclude = [ + "**/* *", + ".tmp_git_root/**/*", + "BUILD", + "BUILD.bazel", + "WORKSPACE", + "WORKSPACE.bazel", + ], + ), crate_features = [ "default", "std", diff --git a/crate_universe/3rdparty/crates/BUILD.camino-1.1.6.bazel b/crate_universe/3rdparty/crates/BUILD.camino-1.1.6.bazel index 12028318f1..e2f2e4bb2b 100644 --- a/crate_universe/3rdparty/crates/BUILD.camino-1.1.6.bazel +++ b/crate_universe/3rdparty/crates/BUILD.camino-1.1.6.bazel @@ -95,6 +95,18 @@ cargo_build_script( include = ["**/*.rs"], allow_empty = True, ), + compile_data = glob( + include = ["**"], + allow_empty = True, + exclude = [ + "**/* *", + ".tmp_git_root/**/*", + "BUILD", + "BUILD.bazel", + "WORKSPACE", + "WORKSPACE.bazel", + ], + ), crate_features = [ "serde", "serde1", diff --git a/crate_universe/3rdparty/crates/BUILD.chrono-tz-0.8.4.bazel b/crate_universe/3rdparty/crates/BUILD.chrono-tz-0.8.4.bazel index ef64fc9191..e501c2ae85 100644 --- a/crate_universe/3rdparty/crates/BUILD.chrono-tz-0.8.4.bazel +++ b/crate_universe/3rdparty/crates/BUILD.chrono-tz-0.8.4.bazel @@ -96,6 +96,18 @@ cargo_build_script( include = ["**/*.rs"], allow_empty = True, ), + compile_data = glob( + include = ["**"], + allow_empty = True, + exclude = [ + "**/* *", + ".tmp_git_root/**/*", + "BUILD", + "BUILD.bazel", + "WORKSPACE", + "WORKSPACE.bazel", + ], + ), crate_features = [ "default", "std", diff --git a/crate_universe/3rdparty/crates/BUILD.crc32fast-1.3.2.bazel b/crate_universe/3rdparty/crates/BUILD.crc32fast-1.3.2.bazel index 48adf7ead3..f4fb2eecbc 100644 --- a/crate_universe/3rdparty/crates/BUILD.crc32fast-1.3.2.bazel +++ b/crate_universe/3rdparty/crates/BUILD.crc32fast-1.3.2.bazel @@ -95,6 +95,18 @@ cargo_build_script( include = ["**/*.rs"], allow_empty = True, ), + compile_data = glob( + include = ["**"], + allow_empty = True, + exclude = [ + "**/* *", + ".tmp_git_root/**/*", + "BUILD", + "BUILD.bazel", + "WORKSPACE", + "WORKSPACE.bazel", + ], + ), crate_features = [ "default", "std", diff --git a/crate_universe/3rdparty/crates/BUILD.crossbeam-epoch-0.9.15.bazel b/crate_universe/3rdparty/crates/BUILD.crossbeam-epoch-0.9.15.bazel index b83b9657dc..c5db8fe413 100644 --- a/crate_universe/3rdparty/crates/BUILD.crossbeam-epoch-0.9.15.bazel +++ b/crate_universe/3rdparty/crates/BUILD.crossbeam-epoch-0.9.15.bazel @@ -98,6 +98,18 @@ cargo_build_script( include = ["**/*.rs"], allow_empty = True, ), + compile_data = glob( + include = ["**"], + allow_empty = True, + exclude = [ + "**/* *", + ".tmp_git_root/**/*", + "BUILD", + "BUILD.bazel", + "WORKSPACE", + "WORKSPACE.bazel", + ], + ), crate_features = [ "alloc", "std", diff --git a/crate_universe/3rdparty/crates/BUILD.crossbeam-queue-0.3.8.bazel b/crate_universe/3rdparty/crates/BUILD.crossbeam-queue-0.3.8.bazel index faeea4a46b..07bed72c02 100644 --- a/crate_universe/3rdparty/crates/BUILD.crossbeam-queue-0.3.8.bazel +++ b/crate_universe/3rdparty/crates/BUILD.crossbeam-queue-0.3.8.bazel @@ -96,6 +96,18 @@ cargo_build_script( include = ["**/*.rs"], allow_empty = True, ), + compile_data = glob( + include = ["**"], + allow_empty = True, + exclude = [ + "**/* *", + ".tmp_git_root/**/*", + "BUILD", + "BUILD.bazel", + "WORKSPACE", + "WORKSPACE.bazel", + ], + ), crate_features = [ "alloc", "std", diff --git a/crate_universe/3rdparty/crates/BUILD.crossbeam-utils-0.8.16.bazel b/crate_universe/3rdparty/crates/BUILD.crossbeam-utils-0.8.16.bazel index 891cb713e6..6ae9711d83 100644 --- a/crate_universe/3rdparty/crates/BUILD.crossbeam-utils-0.8.16.bazel +++ b/crate_universe/3rdparty/crates/BUILD.crossbeam-utils-0.8.16.bazel @@ -95,6 +95,18 @@ cargo_build_script( include = ["**/*.rs"], allow_empty = True, ), + compile_data = glob( + include = ["**"], + allow_empty = True, + exclude = [ + "**/* *", + ".tmp_git_root/**/*", + "BUILD", + "BUILD.bazel", + "WORKSPACE", + "WORKSPACE.bazel", + ], + ), crate_features = [ "default", "std", diff --git a/crate_universe/3rdparty/crates/BUILD.errno-dragonfly-0.1.2.bazel b/crate_universe/3rdparty/crates/BUILD.errno-dragonfly-0.1.2.bazel index d775c38640..b3da3e8c64 100644 --- a/crate_universe/3rdparty/crates/BUILD.errno-dragonfly-0.1.2.bazel +++ b/crate_universe/3rdparty/crates/BUILD.errno-dragonfly-0.1.2.bazel @@ -91,6 +91,18 @@ cargo_build_script( include = ["**/*.rs"], allow_empty = True, ), + compile_data = glob( + include = ["**"], + allow_empty = True, + exclude = [ + "**/* *", + ".tmp_git_root/**/*", + "BUILD", + "BUILD.bazel", + "WORKSPACE", + "WORKSPACE.bazel", + ], + ), crate_name = "build_script_build", crate_root = "build.rs", data = glob( diff --git a/crate_universe/3rdparty/crates/BUILD.generic-array-0.14.7.bazel b/crate_universe/3rdparty/crates/BUILD.generic-array-0.14.7.bazel index f5c5a2014b..951563020d 100644 --- a/crate_universe/3rdparty/crates/BUILD.generic-array-0.14.7.bazel +++ b/crate_universe/3rdparty/crates/BUILD.generic-array-0.14.7.bazel @@ -94,6 +94,18 @@ cargo_build_script( include = ["**/*.rs"], allow_empty = True, ), + compile_data = glob( + include = ["**"], + allow_empty = True, + exclude = [ + "**/* *", + ".tmp_git_root/**/*", + "BUILD", + "BUILD.bazel", + "WORKSPACE", + "WORKSPACE.bazel", + ], + ), crate_features = [ "more_lengths", ], diff --git a/crate_universe/3rdparty/crates/BUILD.iana-time-zone-haiku-0.1.2.bazel b/crate_universe/3rdparty/crates/BUILD.iana-time-zone-haiku-0.1.2.bazel index afab375b5d..15b7a308b1 100644 --- a/crate_universe/3rdparty/crates/BUILD.iana-time-zone-haiku-0.1.2.bazel +++ b/crate_universe/3rdparty/crates/BUILD.iana-time-zone-haiku-0.1.2.bazel @@ -90,6 +90,18 @@ cargo_build_script( include = ["**/*.rs"], allow_empty = True, ), + compile_data = glob( + include = ["**"], + allow_empty = True, + exclude = [ + "**/* *", + ".tmp_git_root/**/*", + "BUILD", + "BUILD.bazel", + "WORKSPACE", + "WORKSPACE.bazel", + ], + ), crate_name = "build_script_build", crate_root = "build.rs", data = glob( diff --git a/crate_universe/3rdparty/crates/BUILD.io-lifetimes-1.0.11.bazel b/crate_universe/3rdparty/crates/BUILD.io-lifetimes-1.0.11.bazel index a63e06d3dd..3104666ba0 100644 --- a/crate_universe/3rdparty/crates/BUILD.io-lifetimes-1.0.11.bazel +++ b/crate_universe/3rdparty/crates/BUILD.io-lifetimes-1.0.11.bazel @@ -201,6 +201,18 @@ cargo_build_script( include = ["**/*.rs"], allow_empty = True, ), + compile_data = glob( + include = ["**"], + allow_empty = True, + exclude = [ + "**/* *", + ".tmp_git_root/**/*", + "BUILD", + "BUILD.bazel", + "WORKSPACE", + "WORKSPACE.bazel", + ], + ), crate_features = [ "close", "default", diff --git a/crate_universe/3rdparty/crates/BUILD.libc-0.2.149.bazel b/crate_universe/3rdparty/crates/BUILD.libc-0.2.149.bazel index c13b77383a..eaf45af124 100644 --- a/crate_universe/3rdparty/crates/BUILD.libc-0.2.149.bazel +++ b/crate_universe/3rdparty/crates/BUILD.libc-0.2.149.bazel @@ -186,6 +186,18 @@ cargo_build_script( include = ["**/*.rs"], allow_empty = True, ), + compile_data = glob( + include = ["**"], + allow_empty = True, + exclude = [ + "**/* *", + ".tmp_git_root/**/*", + "BUILD", + "BUILD.bazel", + "WORKSPACE", + "WORKSPACE.bazel", + ], + ), crate_features = [ "default", "std", diff --git a/crate_universe/3rdparty/crates/BUILD.libm-0.2.7.bazel b/crate_universe/3rdparty/crates/BUILD.libm-0.2.7.bazel index c22fa61179..a8928f5aae 100644 --- a/crate_universe/3rdparty/crates/BUILD.libm-0.2.7.bazel +++ b/crate_universe/3rdparty/crates/BUILD.libm-0.2.7.bazel @@ -93,6 +93,18 @@ cargo_build_script( include = ["**/*.rs"], allow_empty = True, ), + compile_data = glob( + include = ["**"], + allow_empty = True, + exclude = [ + "**/* *", + ".tmp_git_root/**/*", + "BUILD", + "BUILD.bazel", + "WORKSPACE", + "WORKSPACE.bazel", + ], + ), crate_features = [ "default", ], diff --git a/crate_universe/3rdparty/crates/BUILD.lock_api-0.4.11.bazel b/crate_universe/3rdparty/crates/BUILD.lock_api-0.4.11.bazel index 82994ada5a..9728ade48d 100644 --- a/crate_universe/3rdparty/crates/BUILD.lock_api-0.4.11.bazel +++ b/crate_universe/3rdparty/crates/BUILD.lock_api-0.4.11.bazel @@ -95,6 +95,18 @@ cargo_build_script( include = ["**/*.rs"], allow_empty = True, ), + compile_data = glob( + include = ["**"], + allow_empty = True, + exclude = [ + "**/* *", + ".tmp_git_root/**/*", + "BUILD", + "BUILD.bazel", + "WORKSPACE", + "WORKSPACE.bazel", + ], + ), crate_features = [ "atomic_usize", "default", diff --git a/crate_universe/3rdparty/crates/BUILD.memoffset-0.9.0.bazel b/crate_universe/3rdparty/crates/BUILD.memoffset-0.9.0.bazel index 23f54ffc21..4042d6d02e 100644 --- a/crate_universe/3rdparty/crates/BUILD.memoffset-0.9.0.bazel +++ b/crate_universe/3rdparty/crates/BUILD.memoffset-0.9.0.bazel @@ -93,6 +93,18 @@ cargo_build_script( include = ["**/*.rs"], allow_empty = True, ), + compile_data = glob( + include = ["**"], + allow_empty = True, + exclude = [ + "**/* *", + ".tmp_git_root/**/*", + "BUILD", + "BUILD.bazel", + "WORKSPACE", + "WORKSPACE.bazel", + ], + ), crate_features = [ "default", ], diff --git a/crate_universe/3rdparty/crates/BUILD.num-integer-0.1.45.bazel b/crate_universe/3rdparty/crates/BUILD.num-integer-0.1.45.bazel index 53a81d1dc5..3a47f5336b 100644 --- a/crate_universe/3rdparty/crates/BUILD.num-integer-0.1.45.bazel +++ b/crate_universe/3rdparty/crates/BUILD.num-integer-0.1.45.bazel @@ -95,6 +95,18 @@ cargo_build_script( include = ["**/*.rs"], allow_empty = True, ), + compile_data = glob( + include = ["**"], + allow_empty = True, + exclude = [ + "**/* *", + ".tmp_git_root/**/*", + "BUILD", + "BUILD.bazel", + "WORKSPACE", + "WORKSPACE.bazel", + ], + ), crate_features = [ "default", "std", diff --git a/crate_universe/3rdparty/crates/BUILD.num-iter-0.1.43.bazel b/crate_universe/3rdparty/crates/BUILD.num-iter-0.1.43.bazel index 13e94e415c..6e2cab65df 100644 --- a/crate_universe/3rdparty/crates/BUILD.num-iter-0.1.43.bazel +++ b/crate_universe/3rdparty/crates/BUILD.num-iter-0.1.43.bazel @@ -96,6 +96,18 @@ cargo_build_script( include = ["**/*.rs"], allow_empty = True, ), + compile_data = glob( + include = ["**"], + allow_empty = True, + exclude = [ + "**/* *", + ".tmp_git_root/**/*", + "BUILD", + "BUILD.bazel", + "WORKSPACE", + "WORKSPACE.bazel", + ], + ), crate_features = [ "default", "std", diff --git a/crate_universe/3rdparty/crates/BUILD.num-traits-0.2.15.bazel b/crate_universe/3rdparty/crates/BUILD.num-traits-0.2.15.bazel index e4e8cf8594..34039af270 100644 --- a/crate_universe/3rdparty/crates/BUILD.num-traits-0.2.15.bazel +++ b/crate_universe/3rdparty/crates/BUILD.num-traits-0.2.15.bazel @@ -94,6 +94,18 @@ cargo_build_script( include = ["**/*.rs"], allow_empty = True, ), + compile_data = glob( + include = ["**"], + allow_empty = True, + exclude = [ + "**/* *", + ".tmp_git_root/**/*", + "BUILD", + "BUILD.bazel", + "WORKSPACE", + "WORKSPACE.bazel", + ], + ), crate_features = [ "default", "std", diff --git a/crate_universe/3rdparty/crates/BUILD.parking_lot_core-0.9.9.bazel b/crate_universe/3rdparty/crates/BUILD.parking_lot_core-0.9.9.bazel index bb5f7e409b..34e96a792c 100644 --- a/crate_universe/3rdparty/crates/BUILD.parking_lot_core-0.9.9.bazel +++ b/crate_universe/3rdparty/crates/BUILD.parking_lot_core-0.9.9.bazel @@ -175,6 +175,18 @@ cargo_build_script( include = ["**/*.rs"], allow_empty = True, ), + compile_data = glob( + include = ["**"], + allow_empty = True, + exclude = [ + "**/* *", + ".tmp_git_root/**/*", + "BUILD", + "BUILD.bazel", + "WORKSPACE", + "WORKSPACE.bazel", + ], + ), crate_name = "build_script_build", crate_root = "build.rs", data = glob( diff --git a/crate_universe/3rdparty/crates/BUILD.proc-macro2-1.0.64.bazel b/crate_universe/3rdparty/crates/BUILD.proc-macro2-1.0.64.bazel index 357edebf93..502879cf04 100644 --- a/crate_universe/3rdparty/crates/BUILD.proc-macro2-1.0.64.bazel +++ b/crate_universe/3rdparty/crates/BUILD.proc-macro2-1.0.64.bazel @@ -95,6 +95,18 @@ cargo_build_script( include = ["**/*.rs"], allow_empty = True, ), + compile_data = glob( + include = ["**"], + allow_empty = True, + exclude = [ + "**/* *", + ".tmp_git_root/**/*", + "BUILD", + "BUILD.bazel", + "WORKSPACE", + "WORKSPACE.bazel", + ], + ), crate_features = [ "default", "proc-macro", diff --git a/crate_universe/3rdparty/crates/BUILD.quote-1.0.29.bazel b/crate_universe/3rdparty/crates/BUILD.quote-1.0.29.bazel index 8bcda18487..844f47935d 100644 --- a/crate_universe/3rdparty/crates/BUILD.quote-1.0.29.bazel +++ b/crate_universe/3rdparty/crates/BUILD.quote-1.0.29.bazel @@ -95,6 +95,18 @@ cargo_build_script( include = ["**/*.rs"], allow_empty = True, ), + compile_data = glob( + include = ["**"], + allow_empty = True, + exclude = [ + "**/* *", + ".tmp_git_root/**/*", + "BUILD", + "BUILD.bazel", + "WORKSPACE", + "WORKSPACE.bazel", + ], + ), crate_features = [ "default", "proc-macro", diff --git a/crate_universe/3rdparty/crates/BUILD.rayon-core-1.12.0.bazel b/crate_universe/3rdparty/crates/BUILD.rayon-core-1.12.0.bazel index 4d1fabab25..766d61297f 100644 --- a/crate_universe/3rdparty/crates/BUILD.rayon-core-1.12.0.bazel +++ b/crate_universe/3rdparty/crates/BUILD.rayon-core-1.12.0.bazel @@ -92,6 +92,18 @@ cargo_build_script( include = ["**/*.rs"], allow_empty = True, ), + compile_data = glob( + include = ["**"], + allow_empty = True, + exclude = [ + "**/* *", + ".tmp_git_root/**/*", + "BUILD", + "BUILD.bazel", + "WORKSPACE", + "WORKSPACE.bazel", + ], + ), crate_name = "build_script_build", crate_root = "build.rs", data = glob( diff --git a/crate_universe/3rdparty/crates/BUILD.rustix-0.37.23.bazel b/crate_universe/3rdparty/crates/BUILD.rustix-0.37.23.bazel index 196d581add..a39f12dc9f 100644 --- a/crate_universe/3rdparty/crates/BUILD.rustix-0.37.23.bazel +++ b/crate_universe/3rdparty/crates/BUILD.rustix-0.37.23.bazel @@ -298,6 +298,18 @@ cargo_build_script( include = ["**/*.rs"], allow_empty = True, ), + compile_data = glob( + include = ["**"], + allow_empty = True, + exclude = [ + "**/* *", + ".tmp_git_root/**/*", + "BUILD", + "BUILD.bazel", + "WORKSPACE", + "WORKSPACE.bazel", + ], + ), crate_features = [ "default", "io-lifetimes", diff --git a/crate_universe/3rdparty/crates/BUILD.rustix-0.38.21.bazel b/crate_universe/3rdparty/crates/BUILD.rustix-0.38.21.bazel index 0ed48f21d0..7d45985ba2 100644 --- a/crate_universe/3rdparty/crates/BUILD.rustix-0.38.21.bazel +++ b/crate_universe/3rdparty/crates/BUILD.rustix-0.38.21.bazel @@ -393,6 +393,18 @@ cargo_build_script( include = ["**/*.rs"], allow_empty = True, ), + compile_data = glob( + include = ["**"], + allow_empty = True, + exclude = [ + "**/* *", + ".tmp_git_root/**/*", + "BUILD", + "BUILD.bazel", + "WORKSPACE", + "WORKSPACE.bazel", + ], + ), crate_features = [ "alloc", "default", diff --git a/crate_universe/3rdparty/crates/BUILD.semver-1.0.20.bazel b/crate_universe/3rdparty/crates/BUILD.semver-1.0.20.bazel index 8121dfdcc5..20aff00add 100644 --- a/crate_universe/3rdparty/crates/BUILD.semver-1.0.20.bazel +++ b/crate_universe/3rdparty/crates/BUILD.semver-1.0.20.bazel @@ -96,6 +96,18 @@ cargo_build_script( include = ["**/*.rs"], allow_empty = True, ), + compile_data = glob( + include = ["**"], + allow_empty = True, + exclude = [ + "**/* *", + ".tmp_git_root/**/*", + "BUILD", + "BUILD.bazel", + "WORKSPACE", + "WORKSPACE.bazel", + ], + ), crate_features = [ "default", "serde", diff --git a/crate_universe/3rdparty/crates/BUILD.serde-1.0.190.bazel b/crate_universe/3rdparty/crates/BUILD.serde-1.0.190.bazel index 46d756a3ad..9f164f97d0 100644 --- a/crate_universe/3rdparty/crates/BUILD.serde-1.0.190.bazel +++ b/crate_universe/3rdparty/crates/BUILD.serde-1.0.190.bazel @@ -100,6 +100,18 @@ cargo_build_script( include = ["**/*.rs"], allow_empty = True, ), + compile_data = glob( + include = ["**"], + allow_empty = True, + exclude = [ + "**/* *", + ".tmp_git_root/**/*", + "BUILD", + "BUILD.bazel", + "WORKSPACE", + "WORKSPACE.bazel", + ], + ), crate_features = [ "default", "derive", diff --git a/crate_universe/3rdparty/crates/BUILD.serde_json-1.0.108.bazel b/crate_universe/3rdparty/crates/BUILD.serde_json-1.0.108.bazel index adba2882f1..796226fdfe 100644 --- a/crate_universe/3rdparty/crates/BUILD.serde_json-1.0.108.bazel +++ b/crate_universe/3rdparty/crates/BUILD.serde_json-1.0.108.bazel @@ -98,6 +98,18 @@ cargo_build_script( include = ["**/*.rs"], allow_empty = True, ), + compile_data = glob( + include = ["**"], + allow_empty = True, + exclude = [ + "**/* *", + ".tmp_git_root/**/*", + "BUILD", + "BUILD.bazel", + "WORKSPACE", + "WORKSPACE.bazel", + ], + ), crate_features = [ "default", "std", diff --git a/crate_universe/3rdparty/crates/BUILD.syn-1.0.109.bazel b/crate_universe/3rdparty/crates/BUILD.syn-1.0.109.bazel index de70b54b6b..fc70bdbde3 100644 --- a/crate_universe/3rdparty/crates/BUILD.syn-1.0.109.bazel +++ b/crate_universe/3rdparty/crates/BUILD.syn-1.0.109.bazel @@ -104,6 +104,18 @@ cargo_build_script( include = ["**/*.rs"], allow_empty = True, ), + compile_data = glob( + include = ["**"], + allow_empty = True, + exclude = [ + "**/* *", + ".tmp_git_root/**/*", + "BUILD", + "BUILD.bazel", + "WORKSPACE", + "WORKSPACE.bazel", + ], + ), crate_features = [ "clone-impls", "default", diff --git a/crate_universe/3rdparty/crates/BUILD.thiserror-1.0.50.bazel b/crate_universe/3rdparty/crates/BUILD.thiserror-1.0.50.bazel index 9e1f2f6bac..96d39f61d9 100644 --- a/crate_universe/3rdparty/crates/BUILD.thiserror-1.0.50.bazel +++ b/crate_universe/3rdparty/crates/BUILD.thiserror-1.0.50.bazel @@ -93,6 +93,18 @@ cargo_build_script( include = ["**/*.rs"], allow_empty = True, ), + compile_data = glob( + include = ["**"], + allow_empty = True, + exclude = [ + "**/* *", + ".tmp_git_root/**/*", + "BUILD", + "BUILD.bazel", + "WORKSPACE", + "WORKSPACE.bazel", + ], + ), crate_name = "build_script_build", crate_root = "build.rs", data = glob( diff --git a/crate_universe/3rdparty/crates/BUILD.typenum-1.16.0.bazel b/crate_universe/3rdparty/crates/BUILD.typenum-1.16.0.bazel index 71606edd64..f2fec087a5 100644 --- a/crate_universe/3rdparty/crates/BUILD.typenum-1.16.0.bazel +++ b/crate_universe/3rdparty/crates/BUILD.typenum-1.16.0.bazel @@ -90,6 +90,18 @@ cargo_build_script( include = ["**/*.rs"], allow_empty = True, ), + compile_data = glob( + include = ["**"], + allow_empty = True, + exclude = [ + "**/* *", + ".tmp_git_root/**/*", + "BUILD", + "BUILD.bazel", + "WORKSPACE", + "WORKSPACE.bazel", + ], + ), crate_name = "build_script_main", crate_root = "build/main.rs", data = glob( diff --git a/crate_universe/3rdparty/crates/BUILD.valuable-0.1.0.bazel b/crate_universe/3rdparty/crates/BUILD.valuable-0.1.0.bazel index 81a7b6cb41..0d8b74233e 100644 --- a/crate_universe/3rdparty/crates/BUILD.valuable-0.1.0.bazel +++ b/crate_universe/3rdparty/crates/BUILD.valuable-0.1.0.bazel @@ -90,6 +90,18 @@ cargo_build_script( include = ["**/*.rs"], allow_empty = True, ), + compile_data = glob( + include = ["**"], + allow_empty = True, + exclude = [ + "**/* *", + ".tmp_git_root/**/*", + "BUILD", + "BUILD.bazel", + "WORKSPACE", + "WORKSPACE.bazel", + ], + ), crate_name = "build_script_build", crate_root = "build.rs", data = glob( diff --git a/crate_universe/3rdparty/crates/BUILD.wasm-bindgen-0.2.87.bazel b/crate_universe/3rdparty/crates/BUILD.wasm-bindgen-0.2.87.bazel index 8cf0483ec3..61065703b4 100644 --- a/crate_universe/3rdparty/crates/BUILD.wasm-bindgen-0.2.87.bazel +++ b/crate_universe/3rdparty/crates/BUILD.wasm-bindgen-0.2.87.bazel @@ -94,6 +94,18 @@ cargo_build_script( include = ["**/*.rs"], allow_empty = True, ), + compile_data = glob( + include = ["**"], + allow_empty = True, + exclude = [ + "**/* *", + ".tmp_git_root/**/*", + "BUILD", + "BUILD.bazel", + "WORKSPACE", + "WORKSPACE.bazel", + ], + ), crate_name = "build_script_build", crate_root = "build.rs", data = glob( diff --git a/crate_universe/3rdparty/crates/BUILD.wasm-bindgen-shared-0.2.87.bazel b/crate_universe/3rdparty/crates/BUILD.wasm-bindgen-shared-0.2.87.bazel index b28248ad8c..835201125b 100644 --- a/crate_universe/3rdparty/crates/BUILD.wasm-bindgen-shared-0.2.87.bazel +++ b/crate_universe/3rdparty/crates/BUILD.wasm-bindgen-shared-0.2.87.bazel @@ -90,6 +90,18 @@ cargo_build_script( include = ["**/*.rs"], allow_empty = True, ), + compile_data = glob( + include = ["**"], + allow_empty = True, + exclude = [ + "**/* *", + ".tmp_git_root/**/*", + "BUILD", + "BUILD.bazel", + "WORKSPACE", + "WORKSPACE.bazel", + ], + ), crate_name = "build_script_build", crate_root = "build.rs", data = glob( diff --git a/crate_universe/3rdparty/crates/BUILD.winapi-0.3.9.bazel b/crate_universe/3rdparty/crates/BUILD.winapi-0.3.9.bazel index ed9df42ddb..d3c39a3d27 100644 --- a/crate_universe/3rdparty/crates/BUILD.winapi-0.3.9.bazel +++ b/crate_universe/3rdparty/crates/BUILD.winapi-0.3.9.bazel @@ -108,6 +108,18 @@ cargo_build_script( include = ["**/*.rs"], allow_empty = True, ), + compile_data = glob( + include = ["**"], + allow_empty = True, + exclude = [ + "**/* *", + ".tmp_git_root/**/*", + "BUILD", + "BUILD.bazel", + "WORKSPACE", + "WORKSPACE.bazel", + ], + ), crate_features = [ "consoleapi", "errhandlingapi", diff --git a/crate_universe/3rdparty/crates/BUILD.winapi-i686-pc-windows-gnu-0.4.0.bazel b/crate_universe/3rdparty/crates/BUILD.winapi-i686-pc-windows-gnu-0.4.0.bazel index 4a1831aaf9..dc32319117 100644 --- a/crate_universe/3rdparty/crates/BUILD.winapi-i686-pc-windows-gnu-0.4.0.bazel +++ b/crate_universe/3rdparty/crates/BUILD.winapi-i686-pc-windows-gnu-0.4.0.bazel @@ -90,6 +90,18 @@ cargo_build_script( include = ["**/*.rs"], allow_empty = True, ), + compile_data = glob( + include = ["**"], + allow_empty = True, + exclude = [ + "**/* *", + ".tmp_git_root/**/*", + "BUILD", + "BUILD.bazel", + "WORKSPACE", + "WORKSPACE.bazel", + ], + ), crate_name = "build_script_build", crate_root = "build.rs", data = glob( diff --git a/crate_universe/3rdparty/crates/BUILD.winapi-x86_64-pc-windows-gnu-0.4.0.bazel b/crate_universe/3rdparty/crates/BUILD.winapi-x86_64-pc-windows-gnu-0.4.0.bazel index ffc15b47ca..fc4bffc11d 100644 --- a/crate_universe/3rdparty/crates/BUILD.winapi-x86_64-pc-windows-gnu-0.4.0.bazel +++ b/crate_universe/3rdparty/crates/BUILD.winapi-x86_64-pc-windows-gnu-0.4.0.bazel @@ -90,6 +90,18 @@ cargo_build_script( include = ["**/*.rs"], allow_empty = True, ), + compile_data = glob( + include = ["**"], + allow_empty = True, + exclude = [ + "**/* *", + ".tmp_git_root/**/*", + "BUILD", + "BUILD.bazel", + "WORKSPACE", + "WORKSPACE.bazel", + ], + ), crate_name = "build_script_build", crate_root = "build.rs", data = glob( diff --git a/crate_universe/3rdparty/crates/BUILD.windows_aarch64_gnullvm-0.48.0.bazel b/crate_universe/3rdparty/crates/BUILD.windows_aarch64_gnullvm-0.48.0.bazel index 57de35d01f..ec926950fe 100644 --- a/crate_universe/3rdparty/crates/BUILD.windows_aarch64_gnullvm-0.48.0.bazel +++ b/crate_universe/3rdparty/crates/BUILD.windows_aarch64_gnullvm-0.48.0.bazel @@ -90,6 +90,18 @@ cargo_build_script( include = ["**/*.rs"], allow_empty = True, ), + compile_data = glob( + include = ["**"], + allow_empty = True, + exclude = [ + "**/* *", + ".tmp_git_root/**/*", + "BUILD", + "BUILD.bazel", + "WORKSPACE", + "WORKSPACE.bazel", + ], + ), crate_name = "build_script_build", crate_root = "build.rs", data = glob( diff --git a/crate_universe/3rdparty/crates/BUILD.windows_aarch64_msvc-0.48.0.bazel b/crate_universe/3rdparty/crates/BUILD.windows_aarch64_msvc-0.48.0.bazel index e76885927d..66bccdedab 100644 --- a/crate_universe/3rdparty/crates/BUILD.windows_aarch64_msvc-0.48.0.bazel +++ b/crate_universe/3rdparty/crates/BUILD.windows_aarch64_msvc-0.48.0.bazel @@ -90,6 +90,18 @@ cargo_build_script( include = ["**/*.rs"], allow_empty = True, ), + compile_data = glob( + include = ["**"], + allow_empty = True, + exclude = [ + "**/* *", + ".tmp_git_root/**/*", + "BUILD", + "BUILD.bazel", + "WORKSPACE", + "WORKSPACE.bazel", + ], + ), crate_name = "build_script_build", crate_root = "build.rs", data = glob( diff --git a/crate_universe/3rdparty/crates/BUILD.windows_i686_gnu-0.48.0.bazel b/crate_universe/3rdparty/crates/BUILD.windows_i686_gnu-0.48.0.bazel index 73ede5b3b9..702c90ec1f 100644 --- a/crate_universe/3rdparty/crates/BUILD.windows_i686_gnu-0.48.0.bazel +++ b/crate_universe/3rdparty/crates/BUILD.windows_i686_gnu-0.48.0.bazel @@ -90,6 +90,18 @@ cargo_build_script( include = ["**/*.rs"], allow_empty = True, ), + compile_data = glob( + include = ["**"], + allow_empty = True, + exclude = [ + "**/* *", + ".tmp_git_root/**/*", + "BUILD", + "BUILD.bazel", + "WORKSPACE", + "WORKSPACE.bazel", + ], + ), crate_name = "build_script_build", crate_root = "build.rs", data = glob( diff --git a/crate_universe/3rdparty/crates/BUILD.windows_i686_msvc-0.48.0.bazel b/crate_universe/3rdparty/crates/BUILD.windows_i686_msvc-0.48.0.bazel index 0a13d4fca6..a184208c50 100644 --- a/crate_universe/3rdparty/crates/BUILD.windows_i686_msvc-0.48.0.bazel +++ b/crate_universe/3rdparty/crates/BUILD.windows_i686_msvc-0.48.0.bazel @@ -90,6 +90,18 @@ cargo_build_script( include = ["**/*.rs"], allow_empty = True, ), + compile_data = glob( + include = ["**"], + allow_empty = True, + exclude = [ + "**/* *", + ".tmp_git_root/**/*", + "BUILD", + "BUILD.bazel", + "WORKSPACE", + "WORKSPACE.bazel", + ], + ), crate_name = "build_script_build", crate_root = "build.rs", data = glob( diff --git a/crate_universe/3rdparty/crates/BUILD.windows_x86_64_gnu-0.48.0.bazel b/crate_universe/3rdparty/crates/BUILD.windows_x86_64_gnu-0.48.0.bazel index 1071cb26cf..1caebd451e 100644 --- a/crate_universe/3rdparty/crates/BUILD.windows_x86_64_gnu-0.48.0.bazel +++ b/crate_universe/3rdparty/crates/BUILD.windows_x86_64_gnu-0.48.0.bazel @@ -90,6 +90,18 @@ cargo_build_script( include = ["**/*.rs"], allow_empty = True, ), + compile_data = glob( + include = ["**"], + allow_empty = True, + exclude = [ + "**/* *", + ".tmp_git_root/**/*", + "BUILD", + "BUILD.bazel", + "WORKSPACE", + "WORKSPACE.bazel", + ], + ), crate_name = "build_script_build", crate_root = "build.rs", data = glob( diff --git a/crate_universe/3rdparty/crates/BUILD.windows_x86_64_gnullvm-0.48.0.bazel b/crate_universe/3rdparty/crates/BUILD.windows_x86_64_gnullvm-0.48.0.bazel index 5f2c640f17..e6cbc4ee53 100644 --- a/crate_universe/3rdparty/crates/BUILD.windows_x86_64_gnullvm-0.48.0.bazel +++ b/crate_universe/3rdparty/crates/BUILD.windows_x86_64_gnullvm-0.48.0.bazel @@ -90,6 +90,18 @@ cargo_build_script( include = ["**/*.rs"], allow_empty = True, ), + compile_data = glob( + include = ["**"], + allow_empty = True, + exclude = [ + "**/* *", + ".tmp_git_root/**/*", + "BUILD", + "BUILD.bazel", + "WORKSPACE", + "WORKSPACE.bazel", + ], + ), crate_name = "build_script_build", crate_root = "build.rs", data = glob( diff --git a/crate_universe/3rdparty/crates/BUILD.windows_x86_64_msvc-0.48.0.bazel b/crate_universe/3rdparty/crates/BUILD.windows_x86_64_msvc-0.48.0.bazel index 45629c7ba1..06f41eb362 100644 --- a/crate_universe/3rdparty/crates/BUILD.windows_x86_64_msvc-0.48.0.bazel +++ b/crate_universe/3rdparty/crates/BUILD.windows_x86_64_msvc-0.48.0.bazel @@ -90,6 +90,18 @@ cargo_build_script( include = ["**/*.rs"], allow_empty = True, ), + compile_data = glob( + include = ["**"], + allow_empty = True, + exclude = [ + "**/* *", + ".tmp_git_root/**/*", + "BUILD", + "BUILD.bazel", + "WORKSPACE", + "WORKSPACE.bazel", + ], + ), crate_name = "build_script_build", crate_root = "build.rs", data = glob( diff --git a/crate_universe/private/crate.bzl b/crate_universe/private/crate.bzl index c0141f87c5..4b36f9c768 100644 --- a/crate_universe/private/crate.bzl +++ b/crate_universe/private/crate.bzl @@ -87,6 +87,7 @@ def _annotation( additive_build_file = None, additive_build_file_content = None, alias_rule = None, + build_script_compile_data = None, build_script_data = None, build_script_tools = None, build_script_data_glob = None, @@ -125,6 +126,7 @@ def _annotation( generated BUILD files. alias_rule (str, optional): Alias rule to use instead of `native.alias()`. Overrides [render_config](#render_config)'s 'default_alias_rule'. + build_script_compile_data (list, optional): A list of labels to add to a crate's `cargo_build_script::compile_data` attribute. build_script_data (list, optional): A list of labels to add to a crate's `cargo_build_script::data` attribute. build_script_tools (list, optional): A list of labels to add to a crate's `cargo_build_script::tools` attribute. build_script_data_glob (list, optional): A list of glob patterns to add to a crate's `cargo_build_script::data` @@ -185,6 +187,7 @@ def _annotation( additive_build_file = _stringify_label(additive_build_file), additive_build_file_content = additive_build_file_content, alias_rule = parse_alias_rule(alias_rule), + build_script_compile_data = _stringify_list(build_script_compile_data), build_script_data = _stringify_list(build_script_data), build_script_tools = _stringify_list(build_script_tools), build_script_data_glob = build_script_data_glob, diff --git a/crate_universe/src/config.rs b/crate_universe/src/config.rs index 8236ee9952..36deba3ba5 100644 --- a/crate_universe/src/config.rs +++ b/crate_universe/src/config.rs @@ -275,6 +275,10 @@ pub(crate) struct CrateAnnotations { /// [proc_macro_deps](https://bazelbuild.github.io/rules_rust/cargo.html#cargo_build_script-proc_macro_deps) attribute. pub(crate) build_script_proc_macro_deps: Option>>, + /// Additional compile-only data to pass to a build script's + /// [compile_data](https://bazelbuild.github.io/rules_rust/cargo.html#cargo_build_script-compile_data) attribute. + pub(crate) build_script_compile_data: Option>>, + /// Additional data to pass to a build script's /// [build_script_data](https://bazelbuild.github.io/rules_rust/cargo.html#cargo_build_script-data) attribute. pub(crate) build_script_data: Option>>, @@ -387,6 +391,7 @@ impl Add for CrateAnnotations { rustc_flags: select_merge(self.rustc_flags, rhs.rustc_flags), build_script_deps: select_merge(self.build_script_deps, rhs.build_script_deps), build_script_proc_macro_deps: select_merge(self.build_script_proc_macro_deps, rhs.build_script_proc_macro_deps), + build_script_compile_data: select_merge(self.build_script_compile_data, rhs.build_script_compile_data), build_script_data: select_merge(self.build_script_data, rhs.build_script_data), build_script_tools: select_merge(self.build_script_tools, rhs.build_script_tools), build_script_data_glob: joined_extra_member!(self.build_script_data_glob, rhs.build_script_data_glob, BTreeSet::new, BTreeSet::extend), diff --git a/crate_universe/src/context/crate_context.rs b/crate_universe/src/context/crate_context.rs index 7849c15d05..4976368e55 100644 --- a/crate_universe/src/context/crate_context.rs +++ b/crate_universe/src/context/crate_context.rs @@ -175,6 +175,9 @@ pub(crate) struct BuildScriptAttributes { #[serde(skip_serializing_if = "Select::is_empty")] pub(crate) compile_data: Select>, + #[serde(skip_serializing_if = "BTreeSet::is_empty")] + pub(crate) compile_data_glob: BTreeSet, + #[serde(skip_serializing_if = "Select::is_empty")] pub(crate) data: Select>, @@ -245,6 +248,9 @@ impl Default for BuildScriptAttributes { fn default() -> Self { Self { compile_data: Default::default(), + // The build script itself also has access to all + // source files by default. + compile_data_glob: BTreeSet::from(["**".to_owned()]), data: Default::default(), // Build scripts include all sources by default data_glob: BTreeSet::from(["**".to_owned()]), @@ -619,6 +625,11 @@ impl CrateContext { attrs.data = Select::merge(attrs.data.clone(), extra.clone()); } + // Compile Data + if let Some(extra) = &crate_extra.build_script_compile_data { + attrs.compile_data = Select::merge(attrs.compile_data.clone(), extra.clone()); + } + // Tools if let Some(extra) = &crate_extra.build_script_tools { attrs.tools = Select::merge(attrs.tools.clone(), extra.clone()); diff --git a/crate_universe/src/lockfile.rs b/crate_universe/src/lockfile.rs index 6a95b97b38..5d8e6d6f7d 100644 --- a/crate_universe/src/lockfile.rs +++ b/crate_universe/src/lockfile.rs @@ -286,7 +286,7 @@ mod test { ); assert_eq!( - Digest("610cbb406b7452d32ae31c45ec82cd3b3b1fb184c3411ef613c948d88492441b".to_owned()), + Digest("5e0fd9106767c43deb77bb1024ca24e99685110a1085c03abc028c75e180831f".to_owned()), digest, ); } diff --git a/crate_universe/src/rendering.rs b/crate_universe/src/rendering.rs index 2b6ca320cf..ec71d93657 100644 --- a/crate_universe/src/rendering.rs +++ b/crate_universe/src/rendering.rs @@ -456,7 +456,9 @@ impl Renderer { ), compile_data: make_data( platforms, - Default::default(), + attrs + .map(|attrs| attrs.compile_data_glob.clone()) + .unwrap_or_default(), attrs .map(|attrs| attrs.compile_data.clone()) .unwrap_or_default(), @@ -1070,6 +1072,7 @@ mod test { assert!(build_file_content.contains("cargo_build_script(")); assert!(build_file_content.contains("name = \"build_script_build\"")); assert!(build_file_content.contains("\"crate-name=mock_crate\"")); + assert!(build_file_content.contains("compile_data = glob(")); // Ensure `cargo_build_script` requirements are met assert!(build_file_content.contains("name = \"_bs\"")); diff --git a/crate_universe/src/utils/starlark.rs b/crate_universe/src/utils/starlark.rs index 55ec583c0a..5744093fca 100644 --- a/crate_universe/src/utils/starlark.rs +++ b/crate_universe/src/utils/starlark.rs @@ -88,7 +88,7 @@ pub(crate) struct Alias { pub(crate) tags: Set, } -#[derive(Serialize)] +#[derive(Debug, Serialize)] #[serde(rename = "cargo_build_script")] pub(crate) struct CargoBuildScript { pub(crate) name: String, @@ -205,6 +205,7 @@ pub(crate) struct CommonAttrs { pub(crate) version: String, } +#[derive(Debug)] pub(crate) struct Data { pub(crate) glob: Glob, pub(crate) select: SelectSet