Internal change. PiperOrigin-RevId: 440024743
diff --git a/rs_bindings_from_cc/BUILD b/rs_bindings_from_cc/BUILD index 1ef1231..f23c218 100644 --- a/rs_bindings_from_cc/BUILD +++ b/rs_bindings_from_cc/BUILD
@@ -13,7 +13,7 @@ "rust_bindings_from_cc_binary", ) load( - "//third_party/bazel_rules/rules_rust/rust:defs.bzl", + "@rules_rust//rust:defs.bzl", "rust_library", "rust_test", ) @@ -37,10 +37,7 @@ rust_bindings_from_cc_binary( name = "rs_bindings_from_cc", binary = ":rs_bindings_from_cc_impl", - visibility = [ - "//devtools/rust/cc_interop:__subpackages__", - "//third_party/crubit:__subpackages__", - ], + visibility = ["//third_party/crubit:__subpackages__"], ) deps_for_bindings( @@ -51,17 +48,14 @@ deps_for_generated_rs_file = [ # Required for struct layout assertions added to the generated # Rust code. - "//third_party/rust/memoffset/v0_6:memoffset_unstable_const", + "@crates_io//memoffset/v0_6:memoffset_unstable_const", "//rs_bindings_from_cc/support:ctor", - "//third_party/rust/pin_project/v1:pin_project", # used by ctor macros + "@crates_io//pin_project/v1:pin_project", # used by ctor macros # Required for `Copy` trait assertions added to the generated Rust # code. - "//third_party/rust/static_assertions/v1:static_assertions", + "@crates_io//static_assertions/v1:static_assertions", ], - visibility = [ - "//devtools/rust/cc_interop:__subpackages__", - "//third_party/crubit:__subpackages__", - ], + visibility = ["//third_party/crubit:__subpackages__"], ) cc_binary( @@ -74,14 +68,14 @@ ":ir", ":ir_from_cc", ":src_code_gen", - "//third_party/absl/container:flat_hash_map", - "//third_party/absl/flags:parse", - "//third_party/absl/status", - "//third_party/absl/status:statusor", - "//third_party/absl/strings", "//rs_bindings_from_cc/util:status_macros", + "@absl//container:flat_hash_map", + "@absl//flags:parse", + "@absl//status", + "@absl//status:statusor", + "@absl//strings", "@llvm///llvm:Support", - "//third_party/unsupported_toolchains/rust/support:rust_okay_here", + "@rust//support:rust_okay_here", ], ) @@ -98,11 +92,11 @@ deps = [ ":bazel_types", ":ir", - "//third_party/absl/container:flat_hash_map", - "//third_party/absl/flags:flag", - "//third_party/absl/status:statusor", - "//third_party/absl/strings", "//rs_bindings_from_cc/util:status_macros", + "@absl//container:flat_hash_map", + "@absl//flags:flag", + "@absl//status:statusor", + "@absl//strings", "@llvm///llvm:Support", ], ) @@ -150,17 +144,17 @@ ":ast_convert", ":bazel_types", ":ir", - "//third_party/absl/container:flat_hash_map", - "//third_party/absl/container:flat_hash_set", - "//third_party/absl/status", - "//third_party/absl/status:statusor", - "//third_party/absl/strings", - "//third_party/absl/strings:cord", - "//third_party/absl/types:span", "//lifetime_annotations", "//lifetime_annotations:type_lifetimes", "//rs_bindings_from_cc/util:check", "//rs_bindings_from_cc/util:status_macros", + "@absl//container:flat_hash_map", + "@absl//container:flat_hash_set", + "@absl//status", + "@absl//status:statusor", + "@absl//strings", + "@absl//strings:cord", + "@absl//types:span", "@llvm///clang:ast", "@llvm///clang:basic", "@llvm///clang:sema", @@ -176,10 +170,10 @@ ":ir", ":ir_from_cc", "//testing/base/public:gunit_main", - "//third_party/absl/status", - "//third_party/absl/status:statusor", - "//third_party/absl/strings", - "//third_party/absl/types:span", + "@absl//status", + "@absl//status:statusor", + "@absl//strings", + "@absl//types:span", "@llvm///clang:ast", ], ) @@ -188,12 +182,11 @@ name = "ir", srcs = ["ir.cc"], hdrs = ["ir.h"], - visibility = ["//devtools/rust/cc_interop:__subpackages__"], deps = [ ":bazel_types", - "//third_party/absl/strings", "//rs_bindings_from_cc/util:check", "//rs_bindings_from_cc/util:strong_int", + "@absl//strings", "@llvm///llvm:Support", ], ) @@ -203,12 +196,12 @@ srcs = ["ir.rs"], crate_name = "ir", deps = [ - "//third_party/rust/anyhow/v1:anyhow", - "//third_party/rust/itertools/v0_9:itertools", - "//third_party/rust/proc_macro2/v1:proc_macro2", - "//third_party/rust/quote/v1:quote", - "//third_party/rust/serde/v1:serde", - "//third_party/rust/serde_json/v1:serde_json", + "@crates_io//anyhow/v1:anyhow", + "@crates_io//itertools/v0_9:itertools", + "@crates_io//proc_macro2/v1:proc_macro2", + "@crates_io//quote/v1:quote", + "@crates_io//serde/v1:serde", + "@crates_io//serde_json/v1:serde_json", ], ) @@ -225,8 +218,8 @@ ":json_from_cc", ":rs_ffi_types", ":rs_ir", - "//third_party/rust/anyhow/v1:anyhow", - "//third_party/rust/itertools/v0_9:itertools", + "@crates_io//anyhow/v1:anyhow", + "@crates_io//itertools/v0_9:itertools", ], ) @@ -239,12 +232,12 @@ ":frontend_action", ":importer", ":ir", - "//third_party/absl/container:flat_hash_map", - "//third_party/absl/status", - "//third_party/absl/status:statusor", - "//third_party/absl/strings", - "//third_party/absl/types:span", "//rs_bindings_from_cc/util:check", + "@absl//container:flat_hash_map", + "@absl//status", + "@absl//status:statusor", + "@absl//strings", + "@absl//types:span", "@llvm///clang:basic", "@llvm///clang:frontend", "@llvm///clang:tooling", @@ -259,7 +252,7 @@ ":ffi_types", ":ir", ":ir_from_cc", - "//third_party/absl/status:statusor", + "@absl//status:statusor", "@llvm///llvm:Support", ], ) @@ -271,10 +264,10 @@ ":ir_testing", ":rs_ir", ":token_stream_matchers", - "//third_party/rust/anyhow/v1:anyhow", - "//third_party/rust/itertools/v0_9:itertools", - "//third_party/rust/quote/v1:quote", - "//third_party/unsupported_toolchains/rust/support:rust_okay_here", + "@crates_io//anyhow/v1:anyhow", + "@crates_io//itertools/v0_9:itertools", + "@crates_io//quote/v1:quote", + "@rust//support:rust_okay_here", ], ) @@ -298,12 +291,12 @@ ":rs_ffi_types", ":rs_ir", ":token_stream_printer", - "//third_party/rust/anyhow/v1:anyhow", - "//third_party/rust/itertools/v0_9:itertools", - "//third_party/rust/proc_macro2/v1:proc_macro2", - "//third_party/rust/quote/v1:quote", - "//third_party/rust/serde_json/v1:serde_json", - "//third_party/rust/syn/v1:syn", + "@crates_io//anyhow/v1:anyhow", + "@crates_io//itertools/v0_9:itertools", + "@crates_io//proc_macro2/v1:proc_macro2", + "@crates_io//quote/v1:quote", + "@crates_io//serde_json/v1:serde_json", + "@crates_io//syn/v1:syn", ], ) @@ -311,14 +304,14 @@ name = "src_code_gen_impl_test", crate = ":src_code_gen_impl", data = [ + "@rust//toolchains/nightly:bin/rustfmt", "@rustfmt//:rustfmt.toml", - "//third_party/unsupported_toolchains/rust/toolchains/nightly:bin/rustfmt", ], deps = [ ":ir_testing", ":token_stream_matchers", - "//third_party/rust/static_assertions/v1:static_assertions", - "//third_party/unsupported_toolchains/rust/support:rust_okay_here", + "@crates_io//static_assertions/v1:static_assertions", + "@rust//support:rust_okay_here", ], ) @@ -326,10 +319,9 @@ name = "ffi_types", srcs = ["ffi_types.cc"], hdrs = ["ffi_types.h"], - visibility = ["//fuzzer:__subpackages__"], deps = [ ":rs_ffi_types", # buildcleaner: keep - "//third_party/absl/strings", + "@absl//strings", ], ) @@ -337,11 +329,10 @@ name = "ast_convert", srcs = ["ast_convert.cc"], hdrs = ["ast_convert.h"], - visibility = ["//devtools/rust/cc_interop:__subpackages__"], deps = [ ":ir", - "//third_party/absl/functional:function_ref", "//rs_bindings_from_cc/util:check", + "@absl//functional:function_ref", "@llvm///clang:ast", "@llvm///clang:basic", ], @@ -365,10 +356,10 @@ deps = [ ":rs_ir", ":token_stream_printer", - "//third_party/rust/anyhow/v1:anyhow", - "//third_party/rust/itertools/v0_9:itertools", - "//third_party/rust/proc_macro2/v1:proc_macro2", - "//third_party/rust/quote/v1:quote", + "@crates_io//anyhow/v1:anyhow", + "@crates_io//itertools/v0_9:itertools", + "@crates_io//proc_macro2/v1:proc_macro2", + "@crates_io//quote/v1:quote", ], ) @@ -376,12 +367,12 @@ name = "token_stream_matchers_test", crate = ":token_stream_matchers", data = [ + "@rust//toolchains/nightly:bin/rustfmt", "@rustfmt//:rustfmt.toml", - "//third_party/unsupported_toolchains/rust/toolchains/nightly:bin/rustfmt", ], deps = [ ":ir_testing", - "//third_party/unsupported_toolchains/rust/support:rust_okay_here", + "@rust//support:rust_okay_here", ], ) @@ -389,12 +380,12 @@ name = "token_stream_printer", srcs = ["token_stream_printer.rs"], data = [ + "@rust//toolchains/nightly:bin/rustfmt", "@rustfmt//:rustfmt.toml", - "//third_party/unsupported_toolchains/rust/toolchains/nightly:bin/rustfmt", ], deps = [ - "//third_party/rust/anyhow/v1:anyhow", - "//third_party/rust/proc_macro2/v1:proc_macro2", + "@crates_io//anyhow/v1:anyhow", + "@crates_io//proc_macro2/v1:proc_macro2", ], ) @@ -402,11 +393,11 @@ name = "token_stream_printer_test", crate = ":token_stream_printer", data = [ + "@rust//toolchains/nightly:bin/rustfmt", "@rustfmt//:rustfmt.toml", - "//third_party/unsupported_toolchains/rust/toolchains/nightly:bin/rustfmt", ], deps = [ - "//third_party/rust/quote/v1:quote", + "@crates_io//quote/v1:quote", ], ) @@ -449,9 +440,6 @@ }) + [ "//third_party/grte/v5_x86/release/usr/grte/v5:compile", ], - visibility = [ - "//devtools/rust/cc_interop:__subpackages__", - ], ) filegroup(
diff --git a/rs_bindings_from_cc/README.md b/rs_bindings_from_cc/README.md index df4fe0a..a214aea 100644 --- a/rs_bindings_from_cc/README.md +++ b/rs_bindings_from_cc/README.md
@@ -9,7 +9,7 @@ * a C++ source file with the implementation of the bindings For convenience, `:test_wrapper` is a shell script that passes all Clang command -line flags from the current Blaze C++ toolchain: +line flags from the current Bazel C++ toolchain: ``` bazel run //rs_bindings_from_cc:test_wrapper -- --public_headers=hello_world.h @@ -53,7 +53,7 @@ [`rs_bindings_from_cc/test/golden/update.sh`](/rs_bindings_from_cc/test/golden/update.sh) to regenerate checked-in files. * Write full executable end-to-end tests (verifying that interop tools and - Blaze rules generate outputs that can be built and executed) as small + Bazel rules generate outputs that can be built and executed) as small projects with a `rust_test` or `cc_test` on top in subpackages of `test`. To get Rust backtraces for `rs_bindings_from_cc` when running end-to-end tests,
diff --git a/rs_bindings_from_cc/bazel_support/BUILD b/rs_bindings_from_cc/bazel_support/BUILD index 9b1d4e1..f2a2116 100644 --- a/rs_bindings_from_cc/bazel_support/BUILD +++ b/rs_bindings_from_cc/bazel_support/BUILD
@@ -6,22 +6,19 @@ "deps_for_bindings", ) load("//third_party/bazel_skylib:bzl_library.bzl", "bzl_library") -load("//third_party/bazel_skylib/rules:common_settings.bzl", "bool_flag") +load("@bazel_skylib//rules:common_settings.bzl", "bool_flag") licenses(["notice"]) bzl_library( name = "rust_bindings_from_cc_aspect", srcs = ["rust_bindings_from_cc_aspect.bzl"], - visibility = [ - "//devtools/rust/cc_interop:__subpackages__", - "//third_party/crubit:__subpackages__", - ], + visibility = ["//third_party/crubit:__subpackages__"], deps = [ - "//third_party/bazel_rules/rules_rust/rust:bzl_lib", - "//third_party/bazel_rules/rules_rust/rust/private:bzl_lib", "//rs_bindings_from_cc/bazel_support:deps_for_bindings_bzl", "//rs_bindings_from_cc/bazel_support:rust_bindings_from_cc_utils_bzl", + "@rules_rust//rust:bzl_lib", + "@rules_rust//rust/private:bzl_lib", ], ) @@ -38,7 +35,6 @@ bzl_library( name = "toolchain_headers_bzl", srcs = ["toolchain_headers.bzl"], - visibility = ["//devtools/rust/cc_interop:__subpackages__"], deps = [ "//rs_bindings_from_cc/bazel_support:deps_for_bindings_bzl", "//rs_bindings_from_cc/bazel_support:rust_bindings_from_cc_utils_bzl", @@ -53,35 +49,28 @@ bzl_library( name = "rust_bindings_from_cc_binary_bzl", srcs = ["rust_bindings_from_cc_binary.bzl"], - visibility = ["//devtools/rust/cc_interop:__subpackages__"], deps = [":rust_bindings_from_cc_transition"], ) bzl_library( name = "deps_for_bindings_bzl", srcs = ["deps_for_bindings.bzl"], - visibility = [ - "//devtools/rust/cc_interop:__subpackages__", - "//third_party/crubit:__subpackages__", - ], + visibility = ["//third_party/crubit:__subpackages__"], deps = [ ":rust_bindings_from_cc_transition", - "//third_party/bazel_rules/rules_rust/rust/private:bzl_lib", + "@rules_rust//rust/private:bzl_lib", ], ) bzl_library( name = "rust_bindings_from_cc_utils_bzl", srcs = ["rust_bindings_from_cc_utils.bzl"], - visibility = [ - "//devtools/rust/cc_interop:__subpackages__", - "//third_party/crubit:__subpackages__", - ], + visibility = ["//third_party/crubit:__subpackages__"], deps = [ - "//third_party/bazel_rules/rules_rust/rust:bzl_lib", - "//third_party/bazel_rules/rules_rust/rust/private:bzl_lib", "//tools/build_defs/cc:action_names", "//tools/cpp:toolchain_utils", + "@rules_rust//rust:bzl_lib", + "@rules_rust//rust/private:bzl_lib", ], )
diff --git a/rs_bindings_from_cc/bazel_support/deps_for_bindings.bzl b/rs_bindings_from_cc/bazel_support/deps_for_bindings.bzl index de7c89a..b103d1c 100644 --- a/rs_bindings_from_cc/bazel_support/deps_for_bindings.bzl +++ b/rs_bindings_from_cc/bazel_support/deps_for_bindings.bzl
@@ -15,7 +15,7 @@ # buildifier: disable=bzl-visibility load( - "//third_party/bazel_rules/rules_rust/rust/private:providers.bzl", + "@rules_rust//rust/private:providers.bzl", "CrateInfo", "DepInfo", "DepVariantInfo",
diff --git a/rs_bindings_from_cc/bazel_support/rust_bindings_from_cc_aspect.bzl b/rs_bindings_from_cc/bazel_support/rust_bindings_from_cc_aspect.bzl index f1e6748..11e1c1d 100644 --- a/rs_bindings_from_cc/bazel_support/rust_bindings_from_cc_aspect.bzl +++ b/rs_bindings_from_cc/bazel_support/rust_bindings_from_cc_aspect.bzl
@@ -24,7 +24,7 @@ ) # buildifier: disable=bzl-visibility -load("//third_party/bazel_rules/rules_rust/rust/private:providers.bzl", "DepVariantInfo") +load("@rules_rust//rust/private:providers.bzl", "DepVariantInfo") # <internal link>/127#naming-header-files-h-and-inc recommends declaring textual headers either in the # `textual_hdrs` attribute of the Bazel C++ rules, or using the `.inc` file extension. Therefore @@ -158,8 +158,8 @@ ), }.items()), toolchains = [ - "//third_party/bazel_rules/rules_rust/rust:toolchain", - "//tools/cpp:toolchain_type", + "@rules_rust//rust:toolchain", + "@bazel_tools//tools/cpp:toolchain_type", ], host_fragments = ["cpp"], fragments = ["cpp", "google_cpp"],
diff --git a/rs_bindings_from_cc/bazel_support/rust_bindings_from_cc_binary.bzl b/rs_bindings_from_cc/bazel_support/rust_bindings_from_cc_binary.bzl index 40fae4c..3f11d32 100644 --- a/rs_bindings_from_cc/bazel_support/rust_bindings_from_cc_binary.bzl +++ b/rs_bindings_from_cc/bazel_support/rust_bindings_from_cc_binary.bzl
@@ -43,7 +43,7 @@ default = "//tools/allowlists/function_transition_allowlist", ), "_rustfmt": attr.label( - default = "//third_party/unsupported_toolchains/rust/toolchains/nightly:bin/rustfmt", + default = "@rust//toolchains/nightly:bin/rustfmt", executable = True, allow_single_file = True, cfg = "exec",
diff --git a/rs_bindings_from_cc/bazel_support/rust_bindings_from_cc_utils.bzl b/rs_bindings_from_cc/bazel_support/rust_bindings_from_cc_utils.bzl index c491972..a8aa9ff 100644 --- a/rs_bindings_from_cc/bazel_support/rust_bindings_from_cc_utils.bzl +++ b/rs_bindings_from_cc/bazel_support/rust_bindings_from_cc_utils.bzl
@@ -9,13 +9,13 @@ """ # buildifier: disable=bzl-visibility -load("//third_party/bazel_rules/rules_rust/rust/private:common.bzl", "rust_common") +load("@rules_rust//rust/private:common.bzl", "rust_common") # buildifier: disable=bzl-visibility -load("//third_party/bazel_rules/rules_rust/rust/private:providers.bzl", "DepVariantInfo") +load("@rules_rust//rust/private:providers.bzl", "DepVariantInfo") # buildifier: disable=bzl-visibility -load("//third_party/bazel_rules/rules_rust/rust/private:rustc.bzl", "rustc_compile_action") +load("@rules_rust//rust/private:rustc.bzl", "rustc_compile_action") load("//tools/build_defs/cc:action_names.bzl", "ACTION_NAMES") load("//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain") @@ -103,7 +103,7 @@ Returns: A DepVariantInfo provider. """ - toolchain = ctx.toolchains["//third_party/bazel_rules/rules_rust/rust:toolchain"] + toolchain = ctx.toolchains["@rules_rust//rust:toolchain"] output_hash = repr(hash(src.path)) @@ -336,7 +336,7 @@ cfg = "host", ), "_rustfmt": attr.label( - default = "//third_party/unsupported_toolchains/rust/toolchains/nightly:bin/rustfmt", + default = "@rust//toolchains/nightly:bin/rustfmt", executable = True, allow_single_file = True, cfg = "exec", @@ -346,13 +346,13 @@ allow_single_file = True, ), "_error_format": attr.label( - default = "//third_party/bazel_rules/rules_rust:error_format", + default = "@rules_rust//:error_format", ), "_extra_rustc_flags": attr.label( - default = "//third_party/bazel_rules/rules_rust:extra_rustc_flags", + default = "@rules_rust//:extra_rustc_flags", ), "_process_wrapper": attr.label( - default = "//third_party/bazel_rules/rules_rust/util/process_wrapper", + default = "@rules_rust//util/process_wrapper", executable = True, allow_single_file = True, cfg = "exec",
diff --git a/rs_bindings_from_cc/bazel_support/toolchain_headers.bzl b/rs_bindings_from_cc/bazel_support/toolchain_headers.bzl index 8a22ecd..2252281 100644 --- a/rs_bindings_from_cc/bazel_support/toolchain_headers.bzl +++ b/rs_bindings_from_cc/bazel_support/toolchain_headers.bzl
@@ -85,8 +85,8 @@ }.items(), ), toolchains = [ - "//third_party/bazel_rules/rules_rust/rust:toolchain", - "//tools/cpp:toolchain_type", + "@rules_rust//rust:toolchain", + "@bazel_tools//tools/cpp:toolchain_type", ], host_fragments = ["cpp"], fragments = ["cpp", "google_cpp"],
diff --git a/rs_bindings_from_cc/bazel_support/with_cc_toolchain_flags.bzl b/rs_bindings_from_cc/bazel_support/with_cc_toolchain_flags.bzl index ad39608..e7c9ec4 100644 --- a/rs_bindings_from_cc/bazel_support/with_cc_toolchain_flags.bzl +++ b/rs_bindings_from_cc/bazel_support/with_cc_toolchain_flags.bzl
@@ -107,8 +107,8 @@ fragments = ["cpp"], host_fragments = ["cpp"], toolchains = [ - "//third_party/bazel_rules/rules_rust/rust:toolchain", - "//tools/cpp:toolchain_type", + "@rules_rust//rust:toolchain", + "@bazel_tools//tools/cpp:toolchain_type", ], implementation = _with_cc_toolchain_flags_impl, )
diff --git a/rs_bindings_from_cc/support/BUILD b/rs_bindings_from_cc/support/BUILD index 1eb65c5..bb4b43d 100644 --- a/rs_bindings_from_cc/support/BUILD +++ b/rs_bindings_from_cc/support/BUILD
@@ -1,5 +1,5 @@ # Support libraries that the generated Rust/C++ bindings depend upon. -load("//third_party/bazel_rules/rules_rust/rust:defs.bzl", "rust_library", "rust_proc_macro", "rust_test") +load("@rules_rust//rust:defs.bzl", "rust_library", "rust_proc_macro", "rust_test") licenses(["notice"]) @@ -8,29 +8,23 @@ hdrs = [ "cxx20_backports.h", ], - visibility = [ - "//devtools/rust/cc_interop:__subpackages__", - "//third_party/crubit:__subpackages__", - ], + visibility = ["//third_party/crubit:__subpackages__"], ) rust_library( name = "ctor", srcs = ["ctor.rs"], proc_macro_deps = [":ctor_proc_macros"], - visibility = [ - "//devtools/rust/cc_interop:__subpackages__", - "//third_party/crubit:__subpackages__", - ], + visibility = ["//third_party/crubit:__subpackages__"], ) rust_proc_macro( name = "ctor_proc_macros", srcs = ["ctor_proc_macros.rs"], deps = [ - "//third_party/rust/proc_macro2/v1:proc_macro2", - "//third_party/rust/quote/v1:quote", - "//third_party/rust/syn/v1:syn", + "@crates_io//proc_macro2/v1:proc_macro2", + "@crates_io//quote/v1:quote", + "@crates_io//syn/v1:syn", ], ) @@ -38,7 +32,7 @@ name = "ctor_test", srcs = ["ctor.rs"], proc_macro_deps = [":ctor_proc_macros"], - deps = ["//third_party/rust/pin_project/v1:pin_project"], + deps = ["@crates_io//pin_project/v1:pin_project"], ) rust_test( @@ -46,7 +40,7 @@ srcs = ["ctor_proc_macros_test.rs"], deps = [ ":ctor", - "//third_party/rust/pin_project/v1:pin_project", + "@crates_io//pin_project/v1:pin_project", ], ) @@ -62,19 +56,16 @@ name = "forward_declare", srcs = ["forward_declare.rs"], proc_macro_deps = [":forward_declare_proc_macros"], - visibility = [ - "//devtools/rust/cc_interop:__subpackages__", - "//third_party/crubit:__subpackages__", - ], + visibility = ["//third_party/crubit:__subpackages__"], ) rust_proc_macro( name = "forward_declare_proc_macros", srcs = ["forward_declare_proc_macros.rs"], deps = [ - "//third_party/rust/proc_macro2/v1:proc_macro2", - "//third_party/rust/quote/v1:quote", - "//third_party/rust/syn/v1:syn", + "@crates_io//proc_macro2/v1:proc_macro2", + "@crates_io//quote/v1:quote", + "@crates_io//syn/v1:syn", ], )
diff --git a/rs_bindings_from_cc/test/bazel_unit_tests/cc_std/BUILD b/rs_bindings_from_cc/test/bazel_unit_tests/cc_std/BUILD index 595eeca..821ade5 100644 --- a/rs_bindings_from_cc/test/bazel_unit_tests/cc_std/BUILD +++ b/rs_bindings_from_cc/test/bazel_unit_tests/cc_std/BUILD
@@ -2,7 +2,7 @@ be used yet.""" load(":cc_std_test.bzl", "cc_std_test") -load("//tools/build_defs/testing:bzl_library.bzl", "bzl_library") +load("@bazel_skylib//:bzl_library.bzl", "bzl_library") licenses(["notice"])
diff --git a/rs_bindings_from_cc/test/bazel_unit_tests/deps_for_bindings_in_target_mode/BUILD b/rs_bindings_from_cc/test/bazel_unit_tests/deps_for_bindings_in_target_mode/BUILD index 531e16b..21d6585 100644 --- a/rs_bindings_from_cc/test/bazel_unit_tests/deps_for_bindings_in_target_mode/BUILD +++ b/rs_bindings_from_cc/test/bazel_unit_tests/deps_for_bindings_in_target_mode/BUILD
@@ -2,7 +2,7 @@ be used yet.""" load(":deps_for_bindings_are_in_target_cfg_test.bzl", "deps_for_bindings_are_in_target_cfg_test") -load("//tools/build_defs/testing:bzl_library.bzl", "bzl_library") +load("@bazel_skylib//:bzl_library.bzl", "bzl_library") licenses(["notice"]) @@ -14,7 +14,7 @@ parse_tests = False, visibility = ["//visibility:private"], deps = [ - "//third_party/bazel_skylib/lib:unittest", + "@bazel_skylib//lib:unittest", "//rs_bindings_from_cc/bazel_support:rust_bindings_from_cc_aspect", "//rs_bindings_from_cc/bazel_support:rust_bindings_from_cc_utils_bzl", ],
diff --git a/rs_bindings_from_cc/test/bazel_unit_tests/deps_for_bindings_in_target_mode/deps_for_bindings_are_in_target_cfg_test.bzl b/rs_bindings_from_cc/test/bazel_unit_tests/deps_for_bindings_in_target_mode/deps_for_bindings_are_in_target_cfg_test.bzl index b0c9620..73bcb44 100644 --- a/rs_bindings_from_cc/test/bazel_unit_tests/deps_for_bindings_in_target_mode/deps_for_bindings_are_in_target_cfg_test.bzl +++ b/rs_bindings_from_cc/test/bazel_unit_tests/deps_for_bindings_in_target_mode/deps_for_bindings_are_in_target_cfg_test.bzl
@@ -4,7 +4,7 @@ """A test that the dependencies needed for our generated bindings files are built in target cfg.""" -load("//third_party/bazel_skylib/lib:unittest.bzl", "analysistest", "asserts") +load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts") load( "//rs_bindings_from_cc/bazel_support:rust_bindings_from_cc_aspect.bzl", "rust_bindings_from_cc_aspect", @@ -44,7 +44,7 @@ tut = analysistest.target_under_test(env) # The compiled binding implicitly depends on the - # //third_party/rust/memoffset/v0_6:memoffset_unstable_const crate. + # @crates_io//memoffset/v0_6:memoffset_unstable_const crate. # Here we check that the -Ldependency and -Lextern arguments for this crate point to a # non exec path, aka target configuration.
diff --git a/rs_bindings_from_cc/test/bazel_unit_tests/headers_and_targets/BUILD b/rs_bindings_from_cc/test/bazel_unit_tests/headers_and_targets/BUILD index c814f20..0b1b923 100644 --- a/rs_bindings_from_cc/test/bazel_unit_tests/headers_and_targets/BUILD +++ b/rs_bindings_from_cc/test/bazel_unit_tests/headers_and_targets/BUILD
@@ -2,7 +2,7 @@ be used yet.""" load(":rust_bindings_from_cc_aspect_test.bzl", "rust_bindings_from_cc_aspect_test") -load("//tools/build_defs/testing:bzl_library.bzl", "bzl_library") +load("@bazel_skylib//:bzl_library.bzl", "bzl_library") licenses(["notice"]) @@ -14,7 +14,7 @@ parse_tests = False, visibility = ["//visibility:private"], deps = [ - "//third_party/bazel_skylib/lib:unittest", + "@bazel_skylib//lib:unittest", "//rs_bindings_from_cc/bazel_support:rust_bindings_from_cc_aspect", "//rs_bindings_from_cc/bazel_support:rust_bindings_from_cc_utils_bzl", ],
diff --git a/rs_bindings_from_cc/test/bazel_unit_tests/headers_and_targets/rust_bindings_from_cc_aspect_test.bzl b/rs_bindings_from_cc/test/bazel_unit_tests/headers_and_targets/rust_bindings_from_cc_aspect_test.bzl index 8abb3f0..7be733f 100644 --- a/rs_bindings_from_cc/test/bazel_unit_tests/headers_and_targets/rust_bindings_from_cc_aspect_test.bzl +++ b/rs_bindings_from_cc/test/bazel_unit_tests/headers_and_targets/rust_bindings_from_cc_aspect_test.bzl
@@ -4,7 +4,7 @@ """This module contains unit tests for rust_bindings_from_cc_aspect.""" -load("//third_party/bazel_skylib/lib:unittest.bzl", "analysistest", "asserts") +load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts") load( "//rs_bindings_from_cc/bazel_support:rust_bindings_from_cc_aspect.bzl", "rust_bindings_from_cc_aspect",
diff --git a/rs_bindings_from_cc/test/cc_std/BUILD b/rs_bindings_from_cc/test/cc_std/BUILD index 9731d2d..0387d47 100644 --- a/rs_bindings_from_cc/test/cc_std/BUILD +++ b/rs_bindings_from_cc/test/cc_std/BUILD
@@ -1,4 +1,4 @@ -load("//third_party/bazel_rules/rules_rust/rust:defs.bzl", "rust_test") +load("@rules_rust//rust:defs.bzl", "rust_test") licenses(["notice"])
diff --git a/rs_bindings_from_cc/test/consume_absl/BUILD b/rs_bindings_from_cc/test/consume_absl/BUILD index 883eb20..76fd05e 100644 --- a/rs_bindings_from_cc/test/consume_absl/BUILD +++ b/rs_bindings_from_cc/test/consume_absl/BUILD
@@ -1,11 +1,11 @@ """Consume some simple types and functions from //third_party/absl.""" -load("//third_party/bazel_rules/rules_rust/rust:defs.bzl", "rust_test") +load("@rules_rust//rust:defs.bzl", "rust_test") licenses(["notice"]) rust_test( name = "main", srcs = ["test.rs"], - cc_deps = ["//third_party/absl/time"], + cc_deps = ["@absl//time"], )
diff --git a/rs_bindings_from_cc/test/escaping_target_names/BUILD b/rs_bindings_from_cc/test/escaping_target_names/BUILD index 2ff5f4b..57ac227 100644 --- a/rs_bindings_from_cc/test/escaping_target_names/BUILD +++ b/rs_bindings_from_cc/test/escaping_target_names/BUILD
@@ -1,4 +1,4 @@ -load("//third_party/bazel_rules/rules_rust/rust:defs.bzl", "rust_test") +load("@rules_rust//rust:defs.bzl", "rust_test") licenses(["notice"])
diff --git a/rs_bindings_from_cc/test/function/calling_conventions/BUILD b/rs_bindings_from_cc/test/function/calling_conventions/BUILD index 276cc8e..26d8cec 100644 --- a/rs_bindings_from_cc/test/function/calling_conventions/BUILD +++ b/rs_bindings_from_cc/test/function/calling_conventions/BUILD
@@ -1,6 +1,6 @@ """End-to-end tests of C++ functions with non-default calling conventions.""" -load("//third_party/bazel_rules/rules_rust/rust:defs.bzl", "rust_test") +load("@rules_rust//rust:defs.bzl", "rust_test") licenses(["notice"])
diff --git a/rs_bindings_from_cc/test/function/inline/BUILD b/rs_bindings_from_cc/test/function/inline/BUILD index 49b4a64..1a83e9a 100644 --- a/rs_bindings_from_cc/test/function/inline/BUILD +++ b/rs_bindings_from_cc/test/function/inline/BUILD
@@ -1,6 +1,6 @@ """End-to-end example of using a simple inline function.""" -load("//third_party/bazel_rules/rules_rust/rust:defs.bzl", "rust_test") +load("@rules_rust//rust:defs.bzl", "rust_test") licenses(["notice"])
diff --git a/rs_bindings_from_cc/test/function/no_elided_lifetimes/BUILD b/rs_bindings_from_cc/test/function/no_elided_lifetimes/BUILD index 4dbc282..17358b7 100644 --- a/rs_bindings_from_cc/test/function/no_elided_lifetimes/BUILD +++ b/rs_bindings_from_cc/test/function/no_elided_lifetimes/BUILD
@@ -1,6 +1,6 @@ """End-to-end tests of C++ functions that don't have lifetime annotations.""" -load("//third_party/bazel_rules/rules_rust/rust:defs.bzl", "rust_test") +load("@rules_rust//rust:defs.bzl", "rust_test") licenses(["notice"])
diff --git a/rs_bindings_from_cc/test/function/simple/BUILD b/rs_bindings_from_cc/test/function/simple/BUILD index 34f29fe..828cc20 100644 --- a/rs_bindings_from_cc/test/function/simple/BUILD +++ b/rs_bindings_from_cc/test/function/simple/BUILD
@@ -1,6 +1,6 @@ """End-to-end example of using simple functions.""" -load("//third_party/bazel_rules/rules_rust/rust:defs.bzl", "rust_test") +load("@rules_rust//rust:defs.bzl", "rust_test") licenses(["notice"])
diff --git a/rs_bindings_from_cc/test/generator_command_line/BUILD b/rs_bindings_from_cc/test/generator_command_line/BUILD index 618196e..306d84f 100644 --- a/rs_bindings_from_cc/test/generator_command_line/BUILD +++ b/rs_bindings_from_cc/test/generator_command_line/BUILD
@@ -1,7 +1,7 @@ """Disclaimer: This project is experimental, under heavy development, and should not be used yet.""" -load("//third_party/bazel_rules/rules_rust/rust:defs.bzl", "rust_test") +load("@rules_rust//rust:defs.bzl", "rust_test") licenses(["notice"])
diff --git a/rs_bindings_from_cc/test/golden/BUILD b/rs_bindings_from_cc/test/golden/BUILD index 75ef33b..7f791f5 100644 --- a/rs_bindings_from_cc/test/golden/BUILD +++ b/rs_bindings_from_cc/test/golden/BUILD
@@ -1,4 +1,4 @@ -load("//tools/build_defs/testing:bzl_library.bzl", "bzl_library") +load("@bazel_skylib//:bzl_library.bzl", "bzl_library") load( "//rs_bindings_from_cc/test/golden:generate_bindings.bzl", "generate_bindings",
diff --git a/rs_bindings_from_cc/test/macro_locations/BUILD b/rs_bindings_from_cc/test/macro_locations/BUILD index b31a2de..d6883d4 100644 --- a/rs_bindings_from_cc/test/macro_locations/BUILD +++ b/rs_bindings_from_cc/test/macro_locations/BUILD
@@ -1,4 +1,4 @@ -load("//third_party/bazel_rules/rules_rust/rust:defs.bzl", "rust_test") +load("@rules_rust//rust:defs.bzl", "rust_test") licenses(["notice"])
diff --git a/rs_bindings_from_cc/test/struct/constructors/BUILD b/rs_bindings_from_cc/test/struct/constructors/BUILD index aeb4373..bb97751 100644 --- a/rs_bindings_from_cc/test/struct/constructors/BUILD +++ b/rs_bindings_from_cc/test/struct/constructors/BUILD
@@ -1,6 +1,6 @@ """End-to-end test for constructors.""" -load("//third_party/bazel_rules/rules_rust/rust:defs.bzl", "rust_test") +load("@rules_rust//rust:defs.bzl", "rust_test") licenses(["notice"]) @@ -24,6 +24,6 @@ ":no_elided_lifetimes", ], deps = [ - "//third_party/rust/static_assertions/v1:static_assertions", + "@crates_io//static_assertions/v1:static_assertions", ], )
diff --git a/rs_bindings_from_cc/test/struct/destructors/BUILD b/rs_bindings_from_cc/test/struct/destructors/BUILD index 866bfae..e5956e2 100644 --- a/rs_bindings_from_cc/test/struct/destructors/BUILD +++ b/rs_bindings_from_cc/test/struct/destructors/BUILD
@@ -1,6 +1,6 @@ """End-to-end test for destructors.""" -load("//third_party/bazel_rules/rules_rust/rust:defs.bzl", "rust_test") +load("@rules_rust//rust:defs.bzl", "rust_test") licenses(["notice"])
diff --git a/rs_bindings_from_cc/test/struct/fields/BUILD b/rs_bindings_from_cc/test/struct/fields/BUILD index 94308f5..71e1edf 100644 --- a/rs_bindings_from_cc/test/struct/fields/BUILD +++ b/rs_bindings_from_cc/test/struct/fields/BUILD
@@ -1,6 +1,6 @@ """End-to-end test of using a simple struct.""" -load("//third_party/bazel_rules/rules_rust/rust:defs.bzl", "rust_test") +load("@rules_rust//rust:defs.bzl", "rust_test") licenses(["notice"])
diff --git a/rs_bindings_from_cc/test/struct/inheritance/BUILD b/rs_bindings_from_cc/test/struct/inheritance/BUILD index 351877e..bc87d1a 100644 --- a/rs_bindings_from_cc/test/struct/inheritance/BUILD +++ b/rs_bindings_from_cc/test/struct/inheritance/BUILD
@@ -1,6 +1,6 @@ """End-to-end test of inheritance.""" -load("//third_party/bazel_rules/rules_rust/rust:defs.bzl", "rust_test") +load("@rules_rust//rust:defs.bzl", "rust_test") licenses(["notice"])
diff --git a/rs_bindings_from_cc/test/struct/methods/BUILD b/rs_bindings_from_cc/test/struct/methods/BUILD index 8df4eeb..52b981d 100644 --- a/rs_bindings_from_cc/test/struct/methods/BUILD +++ b/rs_bindings_from_cc/test/struct/methods/BUILD
@@ -1,6 +1,6 @@ """End-to-end test for methods.""" -load("//third_party/bazel_rules/rules_rust/rust:defs.bzl", "rust_test") +load("@rules_rust//rust:defs.bzl", "rust_test") licenses(["notice"])
diff --git a/rs_bindings_from_cc/test/struct/multiple_targets/BUILD b/rs_bindings_from_cc/test/struct/multiple_targets/BUILD index c4a0062..2dba736 100644 --- a/rs_bindings_from_cc/test/struct/multiple_targets/BUILD +++ b/rs_bindings_from_cc/test/struct/multiple_targets/BUILD
@@ -1,6 +1,6 @@ """End-to-end example using C++ libraries with dependencies.""" -load("//third_party/bazel_rules/rules_rust/rust:defs.bzl", "rust_test") +load("@rules_rust//rust:defs.bzl", "rust_test") licenses(["notice"])
diff --git a/rs_bindings_from_cc/test/struct/no_unique_address/BUILD b/rs_bindings_from_cc/test/struct/no_unique_address/BUILD index 496d4e0..a2543d0 100644 --- a/rs_bindings_from_cc/test/struct/no_unique_address/BUILD +++ b/rs_bindings_from_cc/test/struct/no_unique_address/BUILD
@@ -1,6 +1,6 @@ """End-to-end test of no_unique_address.""" -load("//third_party/bazel_rules/rules_rust/rust:defs.bzl", "rust_test") +load("@rules_rust//rust:defs.bzl", "rust_test") licenses(["notice"])
diff --git a/rs_bindings_from_cc/test/struct/nonunpin/BUILD b/rs_bindings_from_cc/test/struct/nonunpin/BUILD index 6cfecc5..967fb5d 100644 --- a/rs_bindings_from_cc/test/struct/nonunpin/BUILD +++ b/rs_bindings_from_cc/test/struct/nonunpin/BUILD
@@ -1,6 +1,6 @@ # End-to-end test of !Unpin classes. -load("//third_party/bazel_rules/rules_rust/rust:defs.bzl", "rust_test") +load("@rules_rust//rust:defs.bzl", "rust_test") licenses(["notice"])
diff --git a/rs_bindings_from_cc/test/struct/operators/BUILD b/rs_bindings_from_cc/test/struct/operators/BUILD index c6caf22..835b311 100644 --- a/rs_bindings_from_cc/test/struct/operators/BUILD +++ b/rs_bindings_from_cc/test/struct/operators/BUILD
@@ -1,6 +1,6 @@ """End-to-end test for operators.""" -load("//third_party/bazel_rules/rules_rust/rust:defs.bzl", "rust_test") +load("@rules_rust//rust:defs.bzl", "rust_test") licenses(["notice"]) @@ -15,6 +15,6 @@ srcs = ["test.rs"], cc_deps = [":operators"], deps = [ - "//third_party/rust/static_assertions/v1:static_assertions", + "@crates_io//static_assertions/v1:static_assertions", ], )
diff --git a/rs_bindings_from_cc/test/textual_headers/BUILD b/rs_bindings_from_cc/test/textual_headers/BUILD index 605b7a2..58e27f2 100644 --- a/rs_bindings_from_cc/test/textual_headers/BUILD +++ b/rs_bindings_from_cc/test/textual_headers/BUILD
@@ -1,4 +1,4 @@ -load("//third_party/bazel_rules/rules_rust/rust:defs.bzl", "rust_test") +load("@rules_rust//rust:defs.bzl", "rust_test") licenses(["notice"])
diff --git a/rs_bindings_from_cc/test/type_alias/BUILD b/rs_bindings_from_cc/test/type_alias/BUILD index 4f76d56..76fc0a9 100644 --- a/rs_bindings_from_cc/test/type_alias/BUILD +++ b/rs_bindings_from_cc/test/type_alias/BUILD
@@ -1,6 +1,6 @@ """End-to-end example of using type aliases.""" -load("//third_party/bazel_rules/rules_rust/rust:defs.bzl", "rust_test") +load("@rules_rust//rust:defs.bzl", "rust_test") licenses(["notice"])
diff --git a/rs_bindings_from_cc/util/BUILD b/rs_bindings_from_cc/util/BUILD index 591e33b..3148a05 100644 --- a/rs_bindings_from_cc/util/BUILD +++ b/rs_bindings_from_cc/util/BUILD
@@ -8,7 +8,7 @@ name = "check", hdrs = ["check.h"], deps = [ - "//third_party/absl/base:core_headers", + "@absl//base:core_headers", "@llvm///llvm:Support", ], ) @@ -17,9 +17,9 @@ name = "strong_int", hdrs = ["strong_int.h"], deps = [ - "//third_party/absl/base:core_headers", - "//third_party/absl/meta:type_traits", - "//third_party/absl/strings", + "@absl//base:core_headers", + "@absl//meta:type_traits", + "@absl//strings", ], ) @@ -27,10 +27,10 @@ name = "string_type", hdrs = ["string_type.h"], deps = [ - "//third_party/absl/container:flat_hash_set", - "//third_party/absl/flags:marshalling", - "//third_party/absl/meta:type_traits", - "//third_party/absl/strings", + "@absl//container:flat_hash_set", + "@absl//flags:marshalling", + "@absl//meta:type_traits", + "@absl//strings", ], ) @@ -38,9 +38,9 @@ name = "status_macros", hdrs = ["status_macros.h"], deps = [ - "//third_party/absl/base:core_headers", - "//third_party/absl/status", - "//third_party/absl/status:statusor", - "//third_party/absl/types:source_location", + "@absl//base:core_headers", + "@absl//status", + "@absl//status:statusor", + "@absl//types:source_location", ], )