From bbc6834dabe2c73f4d623843716ce6081be6d389 Mon Sep 17 00:00:00 2001 From: UebelAndre Date: Thu, 14 May 2026 11:54:26 -0700 Subject: [PATCH] Rename using_cxx test to ext_annotations --- .bazelci/presubmit.yml | 14 ++++++------- .../{using_cxx => ext_annotations}/.bazelrc | 0 .../BUILD.bazel | 4 ++-- .../Cargo.Bazel.lock | 0 .../MODULE.bazel | 20 +++++++++---------- .../WORKSPACE.bazel | 0 .../cargo-bazel-lock.json | 2 +- .../cxxbridge-cmd.Cargo.lock | 0 .../cxxbridge-cmd.cargo-bazel-lock.json | 2 +- .../include/blobstore.h | 0 .../rust_cxx_bridge.bzl | 0 .../src/blobstore.cc | 0 .../src/main.rs | 0 13 files changed, 21 insertions(+), 21 deletions(-) rename crate_universe/tests/integration/{using_cxx => ext_annotations}/.bazelrc (100%) rename crate_universe/tests/integration/{using_cxx => ext_annotations}/BUILD.bazel (91%) rename crate_universe/tests/integration/{using_cxx => ext_annotations}/Cargo.Bazel.lock (100%) rename crate_universe/tests/integration/{using_cxx => ext_annotations}/MODULE.bazel (84%) rename crate_universe/tests/integration/{using_cxx => ext_annotations}/WORKSPACE.bazel (100%) rename crate_universe/tests/integration/{using_cxx => ext_annotations}/cargo-bazel-lock.json (99%) rename crate_universe/tests/integration/{using_cxx => ext_annotations}/cxxbridge-cmd.Cargo.lock (100%) rename crate_universe/tests/integration/{using_cxx => ext_annotations}/cxxbridge-cmd.cargo-bazel-lock.json (99%) rename crate_universe/tests/integration/{using_cxx => ext_annotations}/include/blobstore.h (100%) rename crate_universe/tests/integration/{using_cxx => ext_annotations}/rust_cxx_bridge.bzl (100%) rename crate_universe/tests/integration/{using_cxx => ext_annotations}/src/blobstore.cc (100%) rename crate_universe/tests/integration/{using_cxx => ext_annotations}/src/main.rs (100%) diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml index 9f369c5917..21ac3aa098 100644 --- a/.bazelci/presubmit.yml +++ b/.bazelci/presubmit.yml @@ -684,19 +684,19 @@ tasks: test_targets: - "//..." - # --- using_cxx (linux + macos only, C++ codegen platform issues) --- - cu_integ_using_cxx_ubuntu2204: - name: Crate Universe - using_cxx + # --- external_annotations (linux + macos only, C++ codegen platform issues) --- + cu_integ_ext_annotations_ubuntu2204: + name: Crate Universe - external_annotations platform: ubuntu2204 - working_directory: crate_universe/tests/integration/using_cxx + working_directory: crate_universe/tests/integration/ext_annotations build_targets: - "//..." test_targets: - "//..." - cu_integ_using_cxx_macos: - name: Crate Universe - using_cxx + cu_integ_ext_annotations_macos: + name: Crate Universe - external_annotations platform: macos_arm64 - working_directory: crate_universe/tests/integration/using_cxx + working_directory: crate_universe/tests/integration/ext_annotations build_targets: - "//..." test_targets: diff --git a/crate_universe/tests/integration/using_cxx/.bazelrc b/crate_universe/tests/integration/ext_annotations/.bazelrc similarity index 100% rename from crate_universe/tests/integration/using_cxx/.bazelrc rename to crate_universe/tests/integration/ext_annotations/.bazelrc diff --git a/crate_universe/tests/integration/using_cxx/BUILD.bazel b/crate_universe/tests/integration/ext_annotations/BUILD.bazel similarity index 91% rename from crate_universe/tests/integration/using_cxx/BUILD.bazel rename to crate_universe/tests/integration/ext_annotations/BUILD.bazel index daadea1af3..0166bd7727 100644 --- a/crate_universe/tests/integration/using_cxx/BUILD.bazel +++ b/crate_universe/tests/integration/ext_annotations/BUILD.bazel @@ -9,7 +9,7 @@ rust_binary( deps = [ ":blobstore-sys", ":bridge", - "@using_cxx//:cxx", + "@ext_annotations//:cxx", ], ) @@ -34,7 +34,7 @@ cc_library( name = "blobstore-include", hdrs = ["include/blobstore.h"], copts = ["-std=c++17"], - deps = ["@using_cxx//:cxx_cc"], + deps = ["@ext_annotations//:cxx_cc"], ) rust_test( diff --git a/crate_universe/tests/integration/using_cxx/Cargo.Bazel.lock b/crate_universe/tests/integration/ext_annotations/Cargo.Bazel.lock similarity index 100% rename from crate_universe/tests/integration/using_cxx/Cargo.Bazel.lock rename to crate_universe/tests/integration/ext_annotations/Cargo.Bazel.lock diff --git a/crate_universe/tests/integration/using_cxx/MODULE.bazel b/crate_universe/tests/integration/ext_annotations/MODULE.bazel similarity index 84% rename from crate_universe/tests/integration/using_cxx/MODULE.bazel rename to crate_universe/tests/integration/ext_annotations/MODULE.bazel index 4b9212c351..faa0aba28e 100644 --- a/crate_universe/tests/integration/using_cxx/MODULE.bazel +++ b/crate_universe/tests/integration/ext_annotations/MODULE.bazel @@ -1,5 +1,5 @@ module( - name = "cu_test_using_cxx", + name = "cu_test_external_annotations", version = "0.0.0", ) @@ -19,24 +19,24 @@ register_toolchains("@rust_toolchains//:all") http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") -using_cxx = use_extension("@rules_rust//crate_universe:extensions.bzl", "crate") -using_cxx.spec( +ext_annotations = use_extension("@rules_rust//crate_universe:extensions.bzl", "crate") +ext_annotations.spec( package = "cxx", - repositories = ["using_cxx"], + repositories = ["ext_annotations"], version = "1.0.194", ) -using_cxx.splicing_config( - repositories = ["using_cxx"], +ext_annotations.splicing_config( + repositories = ["ext_annotations"], resolver_version = "2", ) -using_cxx.from_specs( - name = "using_cxx", +ext_annotations.from_specs( + name = "ext_annotations", cargo_lockfile = "//:Cargo.Bazel.lock", lockfile = "//:cargo-bazel-lock.json", ) use_repo( - using_cxx, - "using_cxx", + ext_annotations, + "ext_annotations", ) http_archive( diff --git a/crate_universe/tests/integration/using_cxx/WORKSPACE.bazel b/crate_universe/tests/integration/ext_annotations/WORKSPACE.bazel similarity index 100% rename from crate_universe/tests/integration/using_cxx/WORKSPACE.bazel rename to crate_universe/tests/integration/ext_annotations/WORKSPACE.bazel diff --git a/crate_universe/tests/integration/using_cxx/cargo-bazel-lock.json b/crate_universe/tests/integration/ext_annotations/cargo-bazel-lock.json similarity index 99% rename from crate_universe/tests/integration/using_cxx/cargo-bazel-lock.json rename to crate_universe/tests/integration/ext_annotations/cargo-bazel-lock.json index e38886b770..a451e5684e 100644 --- a/crate_universe/tests/integration/using_cxx/cargo-bazel-lock.json +++ b/crate_universe/tests/integration/ext_annotations/cargo-bazel-lock.json @@ -1,5 +1,5 @@ { - "checksum": "1bbb7552740865e8c376e9fab2fdb9a7b0b8e2d38853b9ce63233de4e8e6b17a", + "checksum": "2ea8c4e73f1afd963b8bdcdb3b7e80de5840b41ec95fb20f8536582559907946", "crates": { "cc 1.2.59": { "name": "cc", diff --git a/crate_universe/tests/integration/using_cxx/cxxbridge-cmd.Cargo.lock b/crate_universe/tests/integration/ext_annotations/cxxbridge-cmd.Cargo.lock similarity index 100% rename from crate_universe/tests/integration/using_cxx/cxxbridge-cmd.Cargo.lock rename to crate_universe/tests/integration/ext_annotations/cxxbridge-cmd.Cargo.lock diff --git a/crate_universe/tests/integration/using_cxx/cxxbridge-cmd.cargo-bazel-lock.json b/crate_universe/tests/integration/ext_annotations/cxxbridge-cmd.cargo-bazel-lock.json similarity index 99% rename from crate_universe/tests/integration/using_cxx/cxxbridge-cmd.cargo-bazel-lock.json rename to crate_universe/tests/integration/ext_annotations/cxxbridge-cmd.cargo-bazel-lock.json index 2c6b6fd073..fd3323df8a 100644 --- a/crate_universe/tests/integration/using_cxx/cxxbridge-cmd.cargo-bazel-lock.json +++ b/crate_universe/tests/integration/ext_annotations/cxxbridge-cmd.cargo-bazel-lock.json @@ -1,5 +1,5 @@ { - "checksum": "c5a140bbdaef02d845d7bdcf5dddec8f4bf226a633df2cc387505a9ecbbbe12e", + "checksum": "d0fc74ea5fdb97c4b30b32c3912956275741e263efd34056282cb274cb86bbcb", "crates": { "anstyle 1.0.1": { "name": "anstyle", diff --git a/crate_universe/tests/integration/using_cxx/include/blobstore.h b/crate_universe/tests/integration/ext_annotations/include/blobstore.h similarity index 100% rename from crate_universe/tests/integration/using_cxx/include/blobstore.h rename to crate_universe/tests/integration/ext_annotations/include/blobstore.h diff --git a/crate_universe/tests/integration/using_cxx/rust_cxx_bridge.bzl b/crate_universe/tests/integration/ext_annotations/rust_cxx_bridge.bzl similarity index 100% rename from crate_universe/tests/integration/using_cxx/rust_cxx_bridge.bzl rename to crate_universe/tests/integration/ext_annotations/rust_cxx_bridge.bzl diff --git a/crate_universe/tests/integration/using_cxx/src/blobstore.cc b/crate_universe/tests/integration/ext_annotations/src/blobstore.cc similarity index 100% rename from crate_universe/tests/integration/using_cxx/src/blobstore.cc rename to crate_universe/tests/integration/ext_annotations/src/blobstore.cc diff --git a/crate_universe/tests/integration/using_cxx/src/main.rs b/crate_universe/tests/integration/ext_annotations/src/main.rs similarity index 100% rename from crate_universe/tests/integration/using_cxx/src/main.rs rename to crate_universe/tests/integration/ext_annotations/src/main.rs