Fix a wrong dep in golden and hide internal macro.
PiperOrigin-RevId: 666831178
Change-Id: Ie4e34361d61c85113ac1ddb4d7c7047fd4323deb
diff --git a/cc_bindings_from_rs/bazel_support/BUILD b/cc_bindings_from_rs/bazel_support/BUILD
index 6ecb307..855db8b 100644
--- a/cc_bindings_from_rs/bazel_support/BUILD
+++ b/cc_bindings_from_rs/bazel_support/BUILD
@@ -15,7 +15,7 @@
bzl_library(
name = "cc_bindings_from_rust_rule_bzl",
srcs = ["cc_bindings_from_rust_rule.bzl"],
- visibility = ["//visibility:private"],
+ visibility = ["//:__subpackages__"],
)
bzl_library(
diff --git a/cc_bindings_from_rs/test/golden/BUILD b/cc_bindings_from_rs/test/golden/BUILD
index 465da83..5e1a568 100644
--- a/cc_bindings_from_rs/test/golden/BUILD
+++ b/cc_bindings_from_rs/test/golden/BUILD
@@ -70,6 +70,6 @@
srcs = ["golden_test.bzl"],
visibility = ["//visibility:private"],
deps = [
- "//cc_bindings_from_rs/bazel_support:cc_bindings_from_rust_rule",
+ "//cc_bindings_from_rs/bazel_support:cc_bindings_from_rust_rule_bzl",
],
)
diff --git a/rs_bindings_from_cc/test/bridging/bridging_lib.h b/rs_bindings_from_cc/test/bridging/bridging_lib.h
index 31e8e6f..9ee5d34 100644
--- a/rs_bindings_from_cc/test/bridging/bridging_lib.h
+++ b/rs_bindings_from_cc/test/bridging/bridging_lib.h
@@ -8,10 +8,11 @@
#include <string>
#include <utility>
-#include "support/internal/attribute_macros.h"
-
-struct CRUBIT_INTERNAL_BRIDGE_SUPPORT("MyRustStruct", "rust_to_cpp_converter",
- "cpp_to_rust_converter") CppStruct {
+struct [[clang::annotate("crubit_bridge_type", "MyRustStruct"),
+ clang::annotate("crubit_bridge_type_rust_to_cpp_converter",
+ "rust_to_cpp_converter"),
+ clang::annotate("crubit_bridge_type_cpp_to_rust_converter",
+ "cpp_to_rust_converter")]] CppStruct {
std::string s;
explicit CppStruct(std::string s) : s(std::move(s)) {}
