Merge branch 'master' into location-expansion-tidied

Author: dae

.bazelignore

@@ -1,3 +1,3 @@
 docs
 examples
-examples/hello_cargo_manifest_dir
+examples/cargo_manifest_dir/external_crate

examples/.bazelignore

@@ -1 +1 @@
-hello_cargo_manifest_dir
+cargo_manifest_dir/external_crate

examples/hello_cargo_manifest_dir/BUILD renamed to examples/cargo_manifest_dir/external_crate/BUILD.bazel

@@ -1,7 +1,7 @@
 load("@io_bazel_rules_rust//rust:rust.bzl", "rust_library")
 
 rust_library(
-    name = "hello_cargo_manifest_dir",
+    name = "external_crate",
     srcs = ["src/lib.rs"],
     data = ["include/included_file.rs.inc"],
     visibility = ["//visibility:public"],

examples/hello_cargo_manifest_dir/WORKSPACE renamed to examples/cargo_manifest_dir/external_crate/WORKSPACE.bazel

@@ -1,6 +1,8 @@
+workspace(name = "rules_rust_example_cargo_manifest_dir")
+
 local_repository(
     name = "io_bazel_rules_rust",
-    path = "../..",
+    path = "../../../",
 )
 
 load("@io_bazel_rules_rust//rust:repositories.bzl", "rust_repositories")

examples/hello_cargo_manifest_dir/include/included_file.rs.inc renamed to examples/cargo_manifest_dir/external_crate/include/included_file.rs.inc

@@ -1,8 +1,8 @@
 load("@io_bazel_rules_rust//rust:rust.bzl", "rust_test")
 
 rust_test(
-    name = "hello_uses_cargo_manifest_dir",
+    name = "cargo_manifest_dir_usage",
     srcs = ["src/lib.rs"],
     edition = "2018",
-    deps = ["@hello_cargo_manifest_dir"],
+    deps = ["@rules_rust_example_cargo_manifest_dir//:external_crate"],
 )

examples/hello_cargo_manifest_dir/src/lib.rs renamed to examples/cargo_manifest_dir/external_crate/src/lib.rs

@@ -1,5 +1,5 @@
 
-use hello_cargo_manifest_dir::get_included_str;
+use external_crate::get_included_str;
 
 #[test]
 fn test_lib_with_include() {

examples/hello_uses_cargo_manifest_dir/BUILD renamed to examples/cargo_manifest_dir/usage/BUILD.bazel

@@ -27,12 +27,12 @@ def transitive_deps(is_top_level = False):
     if is_top_level:
         maybe(
             native.local_repository,
-            name = "hello_cargo_manifest_dir",
-            path = "examples/hello_cargo_manifest_dir",
+            name = "rules_rust_example_cargo_manifest_dir",
+            path = "examples/cargo_manifest_dir/external_crate",
         )
     else:
         maybe(
             native.local_repository,
-            name = "hello_cargo_manifest_dir",
-            path = "hello_cargo_manifest_dir",
+            name = "rules_rust_example_cargo_manifest_dir",
+            path = "cargo_manifest_dir/external_crate",
         )

examples/hello_uses_cargo_manifest_dir/src/lib.rs renamed to examples/cargo_manifest_dir/usage/src/lib.rs

@@ -395,6 +395,21 @@ def collect_inputs(
     )
     return _process_build_scripts(ctx, file, crate_info, build_info, dep_info, compile_inputs)
 
+def _exec_root_relative_path(ctx, filepath):
+    # Bazel 3.7.0 (commit 301b96b223b0c0) changed how file paths are returned for external packages.
+    # TODO: use a proper Bazel API to determine exec-root-relative paths.
+    if len(ctx.label.workspace_root) > 0 and \
+       (len(BAZEL_VERSION) == 0 or versions.is_at_least("3.7.0", BAZEL_VERSION)):
+        workspace_root_items = ctx.label.workspace_root.split("/")
+        if (len(workspace_root_items) >= 2 and
+            workspace_root_items[0] == "external" and
+            workspace_root_items[-1] == filepath.split("/")[0]):
+            workspace_root_items = workspace_root_items[:-1]
+
+        return "/".join(workspace_root_items + filepath.split("/"))
+    else:
+        return filepath
+
 def construct_arguments(
         ctx,
         file,
@@ -463,16 +478,11 @@ def construct_arguments(
     # and use `${pwd}` which resolves the `exec_root` at action execution time.
     #
     # Unfortunately, ctx.build_file_path isn't relative to the exec_root for external repositories in
-    # which case we use ctx.label.workspace_root to complete the path.
+    # which case we use ctx.label.workspace_root to complete the path in `_exec_root_relative_path()`.
     args.add("--subst", "pwd=${pwd}")
 
-    workspace_root_items = ctx.label.workspace_root.split("/")
-    if (len(workspace_root_items) >= 2 and
-        workspace_root_items[0] == "external" and
-        workspace_root_items[-1] == ctx.build_file_path.split("/")[0]):
-        workspace_root_items = workspace_root_items[:-1]
-
-    env["CARGO_MANIFEST_DIR"] = "${pwd}/" + "/".join(workspace_root_items + ctx.build_file_path.split("/")[:-1])
+    relative_build_file_path = _exec_root_relative_path(ctx, ctx.build_file_path)
+    env["CARGO_MANIFEST_DIR"] = "${pwd}/" + relative_build_file_path[:relative_build_file_path.rfind("/")]
 
     if out_dir != None:
         env["OUT_DIR"] = "${pwd}/" + out_dir