Implement 'bytes' accessors for UPB :)

Move the 'accessors_test.rs' to shared/ as both kernels now support the same accessor types. PiperOrigin-RevId: 526591987
protocolbuffers · Apr 24, 2023 · 0ecb729 · 0ecb729
1 parent 37c8f81
commit 0ecb729
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 82 deletions.
diff --git a/rust/test/cpp/BUILD b/rust/test/cpp/BUILD
@@ -9,15 +9,3 @@
 # To do that use:
 # * `rust_cc_proto_library` instead of `rust_proto_library`.
 # * `//rust:protobuf_cpp` instead of `//rust:protobuf``.
-
-load("@rules_rust//rust:defs.bzl", "rust_test")
-
-rust_test(
-    name = "accessors_test",
-    srcs = ["accessors_test.rs"],
-    tags = [
-        # TODO(b/270274576): Enable testing on arm once we have a Rust Arm toolchain.
-        "not_build:arm",
-    ],
-    deps = ["//rust/test:unittest_cc_rust_proto"],
-)
diff --git a/rust/test/shared/BUILD b/rust/test/shared/BUILD
@@ -121,3 +121,23 @@ rust_test(
     ],
     deps = ["//rust/test:unittest_upb_rust_proto"],
 )
+
+rust_test(
+    name = "accessors_cpp_test",
+    srcs = ["accessors_test.rs"],
+    tags = [
+        # TODO(b/270274576): Enable testing on arm once we have a Rust Arm toolchain.
+        "not_build:arm",
+    ],
+    deps = ["//rust/test:unittest_cc_rust_proto"],
+)
+
+rust_test(
+    name = "accessors_upb_test",
+    srcs = ["accessors_test.rs"],
+    tags = [
+        # TODO(b/270274576): Enable testing on arm once we have a Rust Arm toolchain.
+        "not_build:arm",
+    ],
+    deps = ["//rust/test:unittest_upb_rust_proto"],
+)
diff --git a/rust/test/cpp/accessors_test.rs → rust/test/shared/accessors_test.rs b/rust/test/cpp/accessors_test.rs → rust/test/shared/accessors_test.rs
diff --git a/rust/test/upb/BUILD b/rust/test/upb/BUILD
@@ -9,15 +9,3 @@
 # To do that use:
 # * `rust_upb_proto_library` instead of `rust_proto_library`.
 # * `//rust:protobuf_upb` instead of `//rust:protobuf``.
-
-load("@rules_rust//rust:defs.bzl", "rust_test")
-
-rust_test(
-    name = "accessors_test",
-    srcs = ["accessors_test.rs"],
-    tags = [
-        # TODO(b/270274576): Enable testing on arm once we have a Rust Arm toolchain.
-        "not_build:arm",
-    ],
-    deps = ["//rust/test:unittest_upb_rust_proto"],
-)
diff --git a/rust/test/upb/accessors_test.rs b/rust/test/upb/accessors_test.rs
diff --git a/src/google/protobuf/compiler/rust/accessors/accessors.cc b/src/google/protobuf/compiler/rust/accessors/accessors.cc
@@ -54,7 +54,7 @@ std::unique_ptr<AccessorGenerator> AccessorGenerator::For(
       if (field.desc().is_repeated()) return nullptr;
       return ForSingularScalar(field);
     case FieldDescriptor::TYPE_BYTES:
-      if (field.desc().is_repeated() || field.is_upb()) return nullptr;
+      if (field.desc().is_repeated()) return nullptr;
       return ForSingularBytes(field);
 
     default: