Set up Rust crates as members of a Cargo workspace

This has a few benefits:
 - We can do a full `cargo publish --dry-run` on all crates, which would not
   otherwise be possible since dependent crates would not be present yet on
   crates.io.
 - This makes manually testing the Cargo build easier, since you can have Bazel
   build all our crates into a single tar file.
 - This should make it easier to run our tests from `rust/test/shared/` with
   Cargo in addition to Bazel.

PiperOrigin-RevId: 793688025

Author: acozzette

rust/BUILD

@@ -298,5 +298,5 @@ pkg_filegroup(
 
 alias(
     name = "release",
-    actual = "//rust/release_crates:crates",
+    actual = "//rust/release_crates:workspace",
 )

rust/release_crates/BUILD

@@ -1,10 +1,19 @@
 # Protobuf Rust crate packaging for release.
 
+load("@rules_pkg//pkg:mappings.bzl", "pkg_files")
+load("@rules_pkg//pkg:tar.bzl", "pkg_tar")
 load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
 
-filegroup(
-    name = "crates",
+pkg_files(
+    name = "license",
+    srcs = ["//:LICENSE"],
+    visibility = ["//rust/release_crates:__subpackages__"],
+)
+
+pkg_tar(
+    name = "workspace",
     srcs = [
+        ":Cargo.toml",
         "//rust/release_crates/protobuf:protobuf_crate",
         "//rust/release_crates/protobuf_codegen:protobuf_codegen_crate",
         "//rust/release_crates/protobuf_example:protobuf_example_crate",
@@ -19,7 +28,7 @@ sh_binary(
     name = "cargo_test",
     srcs = ["cargo_test.sh"],
     data = [
-        ":crates",
+        ":workspace",
         "//:protoc",
     ],
     tags = ["manual"],

rust/release_crates/Cargo.toml

@@ -0,0 +1,3 @@
+[workspace]
+resolver = "2"
+members = ["protobuf", "protobuf_codegen", "protobuf_example", "protobuf_macros", "protobuf_well_known_types"]

rust/release_crates/cargo_test.sh

@@ -34,71 +34,19 @@ trap 'rm -rf -- "$TMP_DIR"' EXIT
 CARGO_HOME=$TMP_DIR/cargo_home
 mkdir $CARGO_HOME
 
-CRATE_ROOT=$TMP_DIR/protobuf
-mkdir $CRATE_ROOT
+WORKSPACE_ROOT=$TMP_DIR/workspace
+mkdir $WORKSPACE_ROOT
 
-PROTOBUF_TAR=$(rlocation com_google_protobuf/rust/release_crates/protobuf/protobuf_crate.tar)
+WORKSPACE_TAR=$(rlocation com_google_protobuf/rust/release_crates/workspace.tar)
 
-echo "Expanding protobuf crate tar"
-tar -xvf $PROTOBUF_TAR -C $CRATE_ROOT
-
-CODEGEN_ROOT=$TMP_DIR/protobuf_codegen
-mkdir $CODEGEN_ROOT
-
-CODEGEN_TAR=$(rlocation com_google_protobuf/rust/release_crates/protobuf_codegen/protobuf_codegen_crate.tar)
-
-echo "Expanding protobuf_codegen crate tar"
-tar -xvf $CODEGEN_TAR -C $CODEGEN_ROOT
-
-EXAMPLE_ROOT=$TMP_DIR/protobuf_example
-mkdir $EXAMPLE_ROOT
-
-EXAMPLE_TAR=$(rlocation com_google_protobuf/rust/release_crates/protobuf_example/protobuf_example_crate.tar)
-
-echo "Expanding protobuf_example crate tar"
-tar -xvf $EXAMPLE_TAR -C $EXAMPLE_ROOT
-
-MACROS_ROOT=$TMP_DIR/protobuf_macros
-mkdir $MACROS_ROOT
-
-MACROS_TAR=$(rlocation com_google_protobuf/rust/release_crates/protobuf_macros/protobuf_macros_crate.tar)
-
-echo "Expanding protobuf_macros crate tar"
-tar -xvf $MACROS_TAR -C $MACROS_ROOT
-
-WELL_KNOWN_TYPES_ROOT=$TMP_DIR/protobuf_well_known_types
-mkdir $WELL_KNOWN_TYPES_ROOT
-
-WELL_KNOWN_TYPES_TAR=$(rlocation com_google_protobuf/rust/release_crates/protobuf_well_known_types/protobuf_well_known_types_crate.tar)
-
-echo "Expanding protobuf_well_known_types crate tar"
-tar -xvf $WELL_KNOWN_TYPES_TAR -C $WELL_KNOWN_TYPES_ROOT
+echo "Expanding Cargo workspace tar"
+tar -xvf $WORKSPACE_TAR -C $WORKSPACE_ROOT
 
 # Put the Bazel-built protoc at the beginning of $PATH
 PATH=$(dirname $(rlocation com_google_protobuf/protoc)):$PATH
 
 export RUSTFLAGS="-Dmismatched-lifetime-syntaxes"
 
-cd $CRATE_ROOT
-CARGO_HOME=$CARGO_HOME cargo test
-CARGO_HOME=$CARGO_HOME cargo publish --dry-run
-
-cd $CODEGEN_ROOT
-CARGO_HOME=$CARGO_HOME cargo test
-CARGO_HOME=$CARGO_HOME cargo publish --dry-run
-
-cd $EXAMPLE_ROOT
+cd $WORKSPACE_ROOT
 CARGO_HOME=$CARGO_HOME cargo test
-
-cd $MACROS_ROOT
-# Macros should be tested by the main protobuf test suite.
-CARGO_HOME=$CARGO_HOME cargo publish --dry-run
-
-cd $WELL_KNOWN_TYPES_ROOT
-CARGO_HOME=$CARGO_HOME cargo test
-
-# TODO: Cannot enable this dry-run yet because it checks that the versions of
-# its dependencies are published on crates.io, which they are definitely not
-# in this case.
-# See also https://github.com/rust-lang/cargo/issues/1169.
-# CARGO_HOME=$CARGO_HOME cargo publish --dry-run
+CARGO_HOME=$CARGO_HOME cargo publish --dry-run --workspace -Z package-workspace

rust/release_crates/protobuf/BUILD

@@ -1,15 +1,15 @@
-load("@rules_pkg//pkg:mappings.bzl", "pkg_files", "strip_prefix")
-load("@rules_pkg//pkg:tar.bzl", "pkg_tar")
+load("@rules_pkg//pkg:mappings.bzl", "pkg_filegroup", "pkg_files", "strip_prefix")
 load("//rust/release_crates:substitute_rust_release_version.bzl", "substitute_rust_release_version")
 
-pkg_tar(
+pkg_filegroup(
     name = "protobuf_crate",
     srcs = [
         ":crate_root_files",
-        "//:LICENSE",
         "//rust:rust_protobuf_libupb_src",
         "//rust:rust_protobuf_src_dir",
+        "//rust/release_crates:license",
     ],
+    prefix = "protobuf",
     visibility = ["//rust:__subpackages__"],
 )
 

rust/release_crates/protobuf_codegen/BUILD

@@ -1,13 +1,13 @@
-load("@rules_pkg//pkg:mappings.bzl", "pkg_files", "strip_prefix")
-load("@rules_pkg//pkg:tar.bzl", "pkg_tar")
+load("@rules_pkg//pkg:mappings.bzl", "pkg_filegroup", "pkg_files", "strip_prefix")
 load("//rust/release_crates:substitute_rust_release_version.bzl", "substitute_rust_release_version")
 
-pkg_tar(
+pkg_filegroup(
     name = "protobuf_codegen_crate",
     srcs = [
         ":protobuf_codegen_files",
-        "//:LICENSE",
+        "//rust/release_crates:license",
     ],
+    prefix = "protobuf_codegen",
     tags = ["manual"],
     visibility = ["//rust:__subpackages__"],
 )

rust/release_crates/protobuf_example/BUILD

@@ -1,13 +1,13 @@
-load("@rules_pkg//pkg:mappings.bzl", "pkg_files", "strip_prefix")
-load("@rules_pkg//pkg:tar.bzl", "pkg_tar")
+load("@rules_pkg//pkg:mappings.bzl", "pkg_filegroup", "pkg_files", "strip_prefix")
 load("//rust/release_crates:substitute_rust_release_version.bzl", "substitute_rust_release_version")
 
-pkg_tar(
+pkg_filegroup(
     name = "protobuf_example_crate",
     srcs = [
         ":protobuf_example_files",
-        "//:LICENSE",
+        "//rust/release_crates:license",
     ],
+    prefix = "protobuf_example",
     visibility = ["//rust:__subpackages__"],
 )
 

rust/release_crates/protobuf_macros/BUILD

@@ -1,14 +1,14 @@
-load("@rules_pkg//pkg:mappings.bzl", "pkg_files", "strip_prefix")
-load("@rules_pkg//pkg:tar.bzl", "pkg_tar")
+load("@rules_pkg//pkg:mappings.bzl", "pkg_filegroup", "pkg_files", "strip_prefix")
 load("//rust/release_crates:substitute_rust_release_version.bzl", "substitute_rust_release_version")
 
-pkg_tar(
+pkg_filegroup(
     name = "protobuf_macros_crate",
     srcs = [
         ":crate_root_files",
-        "//:LICENSE",
         "//rust/proto_proc_macro:rust_protobuf_macros_src_dir",
+        "//rust/release_crates:license",
     ],
+    prefix = "protobuf_macros",
     visibility = ["//rust:__subpackages__"],
 )
 

rust/release_crates/protobuf_well_known_types/BUILD.bazel

@@ -1,14 +1,14 @@
-load("@rules_pkg//pkg:mappings.bzl", "pkg_files", "strip_prefix")
-load("@rules_pkg//pkg:tar.bzl", "pkg_tar")
+load("@rules_pkg//pkg:mappings.bzl", "pkg_filegroup", "pkg_files", "strip_prefix")
 load("//rust/release_crates:substitute_rust_release_version.bzl", "substitute_rust_release_version")
 
-pkg_tar(
+pkg_filegroup(
     name = "protobuf_well_known_types_crate",
     srcs = [
         ":crate_root_files",
         ":well_known_types",
-        "//:LICENSE",
+        "//rust/release_crates:license",
     ],
+    prefix = "protobuf_well_known_types",
     visibility = ["//rust:__subpackages__"],
 )