Fixes crates_vendor labels in remote mode when used from the root workspace (#1575)

* Fixes crates_vendor labels in remote mode when used from an unnamed
workspace

* Adds examples for unnamed workspaces using crates_universe

Co-authored-by: UebelAndre <[email protected]>

Author: csmulhern

.bazelci/presubmit.yml

@@ -19,6 +19,9 @@ crate_universe_vendor_example_targets: &crate_universe_vendor_example_targets
   - "//vendor_local_pkgs:crates_vendor"
   - "//vendor_remote_manifests:crates_vendor_manifests"
   - "//vendor_remote_pkgs:crates_vendor_pkgs"
+crate_universe_unnamed_vendor_example_targets: &crate_universe_unnamed_vendor_example_targets
+  - "//vendor_remote_manifests:crates_vendor_manifests"
+  - "//vendor_remote_pkgs:crates_vendor_pkgs"
 tasks:
   ubuntu2004:
     build_targets: *default_linux_targets
@@ -302,6 +305,16 @@ tasks:
     test_targets:
       - "//..."
     build_flags: *aspects_flags
+  crate_universe_unnamed_examples_ubuntu2004:
+    name: Crate Universe Unnamed Examples
+    platform: ubuntu2004
+    working_directory: examples/crate_universe_unnamed
+    run_targets: *crate_universe_unnamed_vendor_example_targets
+    build_targets:
+      - "//..."
+    test_targets:
+      - "//..."
+    build_flags: *aspects_flags
   crate_universe_rbe_ubuntu1604:
     name: Crate Universe Examples
     platform: rbe_ubuntu1604
@@ -315,6 +328,19 @@ tasks:
     test_targets:
       - "//..."
     build_flags: *aspects_flags
+  crate_universe_unnamed_rbe_ubuntu1604:
+    name: Crate Universe Unnamed Examples
+    platform: rbe_ubuntu1604
+    working_directory: examples/crate_universe_unnamed
+    shell_commands:
+      - sed -i 's/^# load("@bazelci_rules/load("@bazelci_rules/' WORKSPACE.bazel
+      - sed -i 's/^# rbe_preconfig/rbe_preconfig/' WORKSPACE.bazel
+    run_targets: *crate_universe_unnamed_vendor_example_targets
+    build_targets:
+      - "//..."
+    test_targets:
+      - "//..."
+    build_flags: *aspects_flags
   crate_universe_examples_macos:
     name: Crate Universe Examples
     platform: macos
@@ -325,6 +351,16 @@ tasks:
     test_targets:
       - "//..."
     build_flags: *aspects_flags
+  crate_universe_unnamed_examples_macos:
+    name: Crate Universe Unnamed Examples
+    platform: macos
+    working_directory: examples/crate_universe_unnamed
+    run_targets: *crate_universe_unnamed_vendor_example_targets
+    build_targets:
+      - "//..."
+    test_targets:
+      - "//..."
+    build_flags: *aspects_flags
   crate_universe_examples_windows:
     name: Crate Universe Examples
     platform: windows
@@ -338,6 +374,19 @@ tasks:
       - "//..."
     test_targets:
       - "//..."
+  crate_universe_unnamed_examples_windows:
+    name: Crate Universe Unnamed Examples
+    platform: windows
+    working_directory: examples/crate_universe_unnamed
+    batch_commands:
+      - echo startup --windows_enable_symlinks >> user.bazelrc
+      - echo build --enable_runfiles >> user.bazelrc  # this is not enabled by default on windows and is necessary for the cargo build scripts
+    run_targets: *crate_universe_unnamed_vendor_example_targets
+    build_flags: *aspects_flags
+    build_targets:
+      - "//..."
+    test_targets:
+      - "//..."
   cc_common_link_ubuntu2004:
     name: Build via cc_common.link
     platform: ubuntu2004

crate_universe/private/crates_vendor.bzl

@@ -129,6 +129,10 @@ def _write_config_file(ctx):
 
     output_pkg = _get_output_package(ctx)
 
+    workspace_name = ctx.workspace_name
+    if ctx.workspace_name == "__main__":
+        workspace_name = ""
+
     if ctx.attr.mode == "local":
         build_file_base_template = "@{}//{}/{{name}}-{{version}}:BUILD.bazel"
         crate_label_template = "//{}/{{name}}-{{version}}:{{target}}".format(
@@ -140,12 +144,12 @@ def _write_config_file(ctx):
 
     rendering_config.update({
         "build_file_template": build_file_base_template.format(
-            ctx.workspace_name,
+            workspace_name,
             output_pkg,
         ),
         "crate_label_template": crate_label_template,
         "crates_module_template": "@{}//{}:{{file}}".format(
-            ctx.workspace_name,
+            workspace_name,
             output_pkg,
         ),
         "vendor_mode": ctx.attr.mode,

examples/.bazelignore

@@ -1,5 +1,6 @@
 android
 cargo_manifest_dir/external_crate
 crate_universe
+crate_universe_unnamed
 ios
 ios_build

examples/crate_universe_unnamed/.bazelrc

@@ -0,0 +1,14 @@
+# `.bazelrc` is a Bazel configuration file.
+# https://bazel.build/docs/best-practices#bazelrc-file
+
+# Enable rustfmt for all targets in the workspace
+build:rustfmt --aspects=@rules_rust//rust:defs.bzl%rustfmt_aspect
+build:rustfmt --output_groups=+rustfmt_checks
+
+# Enable clippy for all targets in the workspace
+build:clippy --aspects=@rules_rust//rust:defs.bzl%rust_clippy_aspect
+build:clippy --output_groups=+clippy_checks
+
+# This import should always be last to allow users to override
+# settings for local development.
+try-import %workspace%/user.bazelrc

examples/crate_universe_unnamed/BUILD.bazel

@@ -0,0 +1,22 @@
+# Developing crate_universe examples
+
+## Bootstrapping
+
+Crate Universe examples require a bootstrapping process the first time
+`rules_rust` is checked out. To setup the examples, run the following
+bazel commands:
+
+```shell
+bazel run //vendor_remote_manifests:crates_vendor_manifests
+bazel run //vendor_remote_pkgs:crates_vendor_pkgs
+```
+
+## Repinning/Updating Dependencies
+
+After bootstrapping, Bazel lockfiles can be regenerated by running the following:
+
+```shell
+CARGO_BAZEL_REPIN=1 bazel test //...
+```
+
+For more information on repinning, see: https://bazelbuild.github.io/rules_rust/crate_universe.html#repinning--updating-dependencies

examples/crate_universe_unnamed/DEVELOPMENT.md

@@ -0,0 +1 @@
+# Examples

examples/crate_universe_unnamed/README.md

@@ -0,0 +1,60 @@
+local_repository(
+    name = "rules_rust",
+    path = "../../",
+)
+
+load("@rules_rust//rust:repositories.bzl", "rules_rust_dependencies", "rust_register_toolchains")
+
+rules_rust_dependencies()
+
+rust_register_toolchains(
+    edition = "2018",
+)
+
+load("@rules_rust//crate_universe:repositories.bzl", "crate_universe_dependencies")
+
+crate_universe_dependencies(bootstrap = True)
+
+###############################################################################
+# V E N D O R   R E M O T E   M A N I F E S T S
+###############################################################################
+
+load(
+    "//vendor_remote_manifests/crates:crates.bzl",
+    crates_vendor_manifests_repositories = "crate_repositories",
+)
+
+crates_vendor_manifests_repositories()
+
+###############################################################################
+# V E N D O R   R E M O T E   P A C K A G E S
+###############################################################################
+
+load(
+    "//vendor_remote_pkgs/crates:crates.bzl",
+    crates_vendor_packages_repositories = "crate_repositories",
+)
+
+crates_vendor_packages_repositories()
+
+###############################################################################
+
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+
+# Used for Bazel CI
+http_archive(
+    name = "bazelci_rules",
+    sha256 = "eca21884e6f66a88c358e580fd67a6b148d30ab57b1680f62a96c00f9bc6a07e",
+    strip_prefix = "bazelci_rules-1.0.0",
+    url = "https://github.com/bazelbuild/continuous-integration/releases/download/rules-1.0.0/bazelci_rules-1.0.0.tar.gz",
+)
+
+load("@bazelci_rules//:rbe_repo.bzl", "rbe_preconfig")
+
+# Creates a default toolchain config for RBE.
+# Use this as is if you are using the rbe_ubuntu16_04 container,
+# otherwise refer to RBE docs.
+rbe_preconfig(
+    name = "buildkite_config",
+    toolchain = "ubuntu1804-bazel-java11",
+)

examples/crate_universe_unnamed/WORKSPACE.bazel

@@ -0,0 +1,24 @@
+load("@crates_vendor_manifests//:defs.bzl", "aliases", "all_crate_deps")
+load("@rules_rust//crate_universe:defs.bzl", "crates_vendor")
+load("@rules_rust//rust:defs.bzl", "rust_library", "rust_test")
+
+crates_vendor(
+    name = "crates_vendor_manifests",
+    manifests = [":Cargo.toml"],
+)
+
+rust_library(
+    name = "cargo_local",
+    srcs = glob(["**/*.rs"]),
+    aliases = aliases(),
+    edition = "2018",
+    proc_macro_deps = all_crate_deps(proc_macro = True),
+    deps = all_crate_deps(normal = True),
+)
+
+rust_test(
+    name = "unit_test",
+    crate = ":cargo_local",
+    proc_macro_deps = all_crate_deps(proc_macro_dev = True),
+    deps = all_crate_deps(normal_dev = True),
+)