Moved related cargo_manifest_dir examples into the same directory (bazelbuild#473)

UebelAndre · web-flow · commit d1d04eb0b27c · 2020-11-04T11:56:04.000Z
Minor reorganization of the examples to try and keep the relevant tests and dependencies together.
diff --git a/.bazelignore b/.bazelignore
@@ -1,3 +1,3 @@
 docs
 examples
-examples/hello_cargo_manifest_dir
+examples/cargo_manifest_dir/external_crate
diff --git a/examples/.bazelignore b/examples/.bazelignore
@@ -1 +1 @@
-hello_cargo_manifest_dir
+cargo_manifest_dir/external_crate
diff --git a/examples/cargo_manifest_dir/external_crate/BUILD.bazel b/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"],
diff --git a/examples/cargo_manifest_dir/external_crate/WORKSPACE.bazel b/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")
diff --git a/examples/cargo_manifest_dir/external_crate/include/included_file.rs.inc b/examples/cargo_manifest_dir/external_crate/include/included_file.rs.inc
diff --git a/examples/cargo_manifest_dir/external_crate/src/lib.rs b/examples/cargo_manifest_dir/external_crate/src/lib.rs
diff --git a/examples/cargo_manifest_dir/usage/BUILD.bazel b/examples/cargo_manifest_dir/usage/BUILD.bazel
@@ -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"],
 )
diff --git a/examples/cargo_manifest_dir/usage/src/lib.rs b/examples/cargo_manifest_dir/usage/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() {
diff --git a/examples/examples_transitive_deps.bzl b/examples/examples_transitive_deps.bzl
@@ -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",
         )

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-hello_cargo_manifest_dir`
	`1`	`+cargo_manifest_dir/external_crate`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
	`1`	`+workspace(name = "rules_rust_example_cargo_manifest_dir")`
	`2`	`+`
`1`	`3`	`local_repository(`
`2`	`4`	`name = "io_bazel_rules_rust",`
`3`		`- path = "../..",`
	`5`	`+ path = "../../../",`
`4`	`6`	`)`
`5`	`7`
`6`	`8`	`load("@io_bazel_rules_rust//rust:repositories.bzl", "rust_repositories")`