Organized examples (#803)

Author: UebelAndre

.bazelci/presubmit.yml

@@ -75,8 +75,7 @@ tasks:
       - "-@examples//ffi/rust_calling_c:matrix_dylib_test"
       - "-@examples//ffi/rust_calling_c:matrix_dynamically_linked"
       - "-@examples//ffi/rust_calling_c/simple/..."
-      - "-@examples//hello_sys/..."
-      - "-@examples//complex_sys/..."
+      - "-@examples//sys/..."
       - "-@examples//proto/..."
       - "-@examples//wasm/..."
     build_targets: *windows_targets

examples/examples_deps.bzl

@@ -2,8 +2,8 @@
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
-load("@examples//complex_sys:repositories.bzl", "rules_rust_examples_complex_sys_repositories")
-load("@examples//hello_sys/raze:crates.bzl", "rules_rust_examples_hello_sys_fetch_remote_crates")
+load("@examples//sys/basic/raze:crates.bzl", "rules_rust_examples_basic_sys_fetch_remote_crates")
+load("@examples//sys/complex:repositories.bzl", "rules_rust_examples_complex_sys_repositories")
 load("@rules_foreign_cc//:workspace_definitions.bzl", "rules_foreign_cc_dependencies")
 load("@rules_rust//bindgen:repositories.bzl", "rust_bindgen_repositories")
 load("@rules_rust//proto:repositories.bzl", "rust_proto_repositories")
@@ -36,7 +36,7 @@ def deps():
         version = "1.46.0",
     )
 
-    rules_rust_examples_hello_sys_fetch_remote_crates()
+    rules_rust_examples_basic_sys_fetch_remote_crates()
 
     rules_rust_examples_complex_sys_repositories()
 

examples/hello_macro/BUILD.bazel

@@ -0,0 +1,47 @@
+load(
+    "@rules_rust//rust:defs.bzl",
+    "rust_doc",
+    "rust_doc_test",
+    "rust_proc_macro",
+    "rust_test",
+)
+
+package(default_visibility = ["//visibility:public"])
+
+rust_proc_macro(
+    name = "proc_macro_lib",
+    srcs = [
+        "src/lib_2015.rs",
+    ],
+)
+
+rust_proc_macro(
+    name = "proc_macro_lib_2018",
+    srcs = [
+        "src/lib.rs",
+    ],
+    edition = "2018",
+)
+
+rust_test(
+    name = "proc_macro_test",
+    crate = ":proc_macro_lib",
+    edition = "2018",
+)
+
+rust_test(
+    name = "greeting_test",
+    srcs = ["tests/greeting.rs"],
+    edition = "2018",
+    proc_macro_deps = [":proc_macro_lib"],
+)
+
+rust_doc(
+    name = "proc_macro_lib_doc",
+    dep = ":proc_macro_lib",
+)
+
+rust_doc_test(
+    name = "doc_test",
+    dep = ":proc_macro_lib",
+)

examples/proc_macro/BUILD.bazel

@@ -12,9 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-extern crate hello_macro;
-
-use hello_macro::HelloWorld;
+use proc_macro_lib::HelloWorld;
 
 #[derive(HelloWorld)]
 struct TestStruct {}

examples/hello_macro/src/lib_2018.rs renamed to examples/proc_macro/src/lib.rs

@@ -20,7 +20,7 @@ rust_binary(
     name = "hello_sys",
     srcs = ["src/main.rs"],
     edition = "2018",
-    deps = ["//hello_sys/raze:bzip2"],
+    deps = ["//sys/basic/raze:bzip2"],
 )
 
 sh_test(

examples/hello_macro/src/lib.rs renamed to examples/proc_macro/src/lib_2015.rs

@@ -1,18 +1,18 @@
 [package]
-name = "rules_rust_examples_hello_sys"
+name = "rules_rust_examples_basic_sys"
 version = "0.0.1"
 
 [[bin]]
-name = "rules_rust_examples_hello_sys"
+name = "rules_rust_examples_basic_sys"
 path = "src/main.rs"
 
 [dependencies]
 bzip2 = "=0.3.3"
 
 [package.metadata.raze]
-workspace_path = "//hello_sys/raze"
+workspace_path = "//sys/basic/raze"
 genmode = "Remote"
-gen_workspace_prefix = "rules_rust_examples_hello_sys"
+gen_workspace_prefix = "rules_rust_examples_basic_sys"
 rust_rules_workspace_name = "rules_rust"
 package_aliases_dir = "raze"
 default_gen_buildrs = false

examples/hello_macro/tests/greeting.rs renamed to examples/proc_macro/tests/greeting.rs

@@ -14,7 +14,7 @@ licenses([
 # Aliased targets
 alias(
     name = "bzip2",
-    actual = "@rules_rust_examples_hello_sys__bzip2__0_3_3//:bzip2",
+    actual = "@rules_rust_examples_basic_sys__bzip2__0_3_3//:bzip2",
     tags = [
         "cargo-raze",
         "manual",

examples/hello_sys/BUILD.bazel renamed to examples/sys/basic/BUILD.bazel

@@ -9,54 +9,54 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "new_git_repository")  # bui
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")  # buildifier: disable=load
 load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")  # buildifier: disable=load
 
-def rules_rust_examples_hello_sys_fetch_remote_crates():
+def rules_rust_examples_basic_sys_fetch_remote_crates():
     """This function defines a collection of repos and should be called in a WORKSPACE file"""
     maybe(
         http_archive,
-        name = "rules_rust_examples_hello_sys__bzip2__0_3_3",
+        name = "rules_rust_examples_basic_sys__bzip2__0_3_3",
         url = "https://crates.io/api/v1/crates/bzip2/0.3.3/download",
         type = "tar.gz",
         sha256 = "42b7c3cbf0fa9c1b82308d57191728ca0256cb821220f4e2fd410a72ade26e3b",
         strip_prefix = "bzip2-0.3.3",
-        build_file = Label("//hello_sys/raze/remote:BUILD.bzip2-0.3.3.bazel"),
+        build_file = Label("//sys/basic/raze/remote:BUILD.bzip2-0.3.3.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "rules_rust_examples_hello_sys__bzip2_sys__0_1_9_1_0_8",
+        name = "rules_rust_examples_basic_sys__bzip2_sys__0_1_9_1_0_8",
         url = "https://crates.io/api/v1/crates/bzip2-sys/0.1.9+1.0.8/download",
         type = "tar.gz",
         sha256 = "ad3b39a260062fca31f7b0b12f207e8f2590a67d32ec7d59c20484b07ea7285e",
         strip_prefix = "bzip2-sys-0.1.9+1.0.8",
-        build_file = Label("//hello_sys/raze/remote:BUILD.bzip2-sys-0.1.9+1.0.8.bazel"),
+        build_file = Label("//sys/basic/raze/remote:BUILD.bzip2-sys-0.1.9+1.0.8.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "rules_rust_examples_hello_sys__cc__1_0_60",
+        name = "rules_rust_examples_basic_sys__cc__1_0_60",
         url = "https://crates.io/api/v1/crates/cc/1.0.60/download",
         type = "tar.gz",
         sha256 = "ef611cc68ff783f18535d77ddd080185275713d852c4f5cbb6122c462a7a825c",
         strip_prefix = "cc-1.0.60",
-        build_file = Label("//hello_sys/raze/remote:BUILD.cc-1.0.60.bazel"),
+        build_file = Label("//sys/basic/raze/remote:BUILD.cc-1.0.60.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "rules_rust_examples_hello_sys__libc__0_2_77",
+        name = "rules_rust_examples_basic_sys__libc__0_2_77",
         url = "https://crates.io/api/v1/crates/libc/0.2.77/download",
         type = "tar.gz",
         sha256 = "f2f96b10ec2560088a8e76961b00d47107b3a625fecb76dedb29ee7ccbf98235",
         strip_prefix = "libc-0.2.77",
-        build_file = Label("//hello_sys/raze/remote:BUILD.libc-0.2.77.bazel"),
+        build_file = Label("//sys/basic/raze/remote:BUILD.libc-0.2.77.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "rules_rust_examples_hello_sys__pkg_config__0_3_18",
+        name = "rules_rust_examples_basic_sys__pkg_config__0_3_18",
         url = "https://crates.io/api/v1/crates/pkg-config/0.3.18/download",
         type = "tar.gz",
         sha256 = "d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33",
         strip_prefix = "pkg-config-0.3.18",
-        build_file = Label("//hello_sys/raze/remote:BUILD.pkg-config-0.3.18.bazel"),
+        build_file = Label("//sys/basic/raze/remote:BUILD.pkg-config-0.3.18.bazel"),
     )

examples/hello_sys/Cargo.lock renamed to examples/sys/basic/Cargo.lock

@@ -19,7 +19,7 @@ load(
 package(default_visibility = [
     # Public for visibility by "@raze__crate__version//" targets.
     #
-    # Prefer access through "//hello_sys/raze", which limits external
+    # Prefer access through "//sys/basic/raze", which limits external
     # visibility to explicit Cargo.toml dependencies.
     "//visibility:public",
 ])
@@ -49,8 +49,8 @@ rust_library(
     version = "0.3.3",
     # buildifier: leave-alone
     deps = [
-        "@rules_rust_examples_hello_sys__bzip2_sys__0_1_9_1_0_8//:bzip2_sys",
-        "@rules_rust_examples_hello_sys__libc__0_2_77//:libc",
+        "@rules_rust_examples_basic_sys__bzip2_sys__0_1_9_1_0_8//:bzip2_sys",
+        "@rules_rust_examples_basic_sys__libc__0_2_77//:libc",
     ],
 )
 

examples/hello_sys/Cargo.toml renamed to examples/sys/basic/Cargo.toml

@@ -19,7 +19,7 @@ load(
 package(default_visibility = [
     # Public for visibility by "@raze__crate__version//" targets.
     #
-    # Prefer access through "//hello_sys/raze", which limits external
+    # Prefer access through "//sys/basic/raze", which limits external
     # visibility to explicit Cargo.toml dependencies.
     "//visibility:public",
 ])
@@ -57,8 +57,8 @@ cargo_build_script(
     version = "0.1.9+1.0.8",
     visibility = ["//visibility:private"],
     deps = [
-        "@rules_rust_examples_hello_sys__cc__1_0_60//:cc",
-        "@rules_rust_examples_hello_sys__pkg_config__0_3_18//:pkg_config",
+        "@rules_rust_examples_basic_sys__cc__1_0_60//:cc",
+        "@rules_rust_examples_basic_sys__pkg_config__0_3_18//:pkg_config",
     ],
 )
 
@@ -82,6 +82,6 @@ rust_library(
     # buildifier: leave-alone
     deps = [
         ":bzip2_sys_build_script",
-        "@rules_rust_examples_hello_sys__libc__0_2_77//:libc",
+        "@rules_rust_examples_basic_sys__libc__0_2_77//:libc",
     ],
 )

examples/hello_sys/raze/BUILD.bazel renamed to examples/sys/basic/raze/BUILD.bazel

@@ -19,7 +19,7 @@ load(
 package(default_visibility = [
     # Public for visibility by "@raze__crate__version//" targets.
     #
-    # Prefer access through "//hello_sys/raze", which limits external
+    # Prefer access through "//sys/basic/raze", which limits external
     # visibility to explicit Cargo.toml dependencies.
     "//visibility:public",
 ])

examples/hello_sys/raze/crates.bzl renamed to examples/sys/basic/raze/crates.bzl

@@ -19,7 +19,7 @@ load(
 package(default_visibility = [
     # Public for visibility by "@raze__crate__version//" targets.
     #
-    # Prefer access through "//hello_sys/raze", which limits external
+    # Prefer access through "//sys/basic/raze", which limits external
     # visibility to explicit Cargo.toml dependencies.
     "//visibility:public",
 ])

examples/complex_sys/raze/remote/BUILD.bazel renamed to examples/sys/basic/raze/remote/BUILD.bazel

@@ -19,7 +19,7 @@ load(
 package(default_visibility = [
     # Public for visibility by "@raze__crate__version//" targets.
     #
-    # Prefer access through "//hello_sys/raze", which limits external
+    # Prefer access through "//sys/basic/raze", which limits external
     # visibility to explicit Cargo.toml dependencies.
     "//visibility:public",
 ])

examples/hello_sys/raze/remote/BUILD.bzip2-0.3.3.bazel renamed to examples/sys/basic/raze/remote/BUILD.bzip2-0.3.3.bazel

@@ -20,5 +20,5 @@ rust_binary(
     name = "complex_sys",
     srcs = ["src/main.rs"],
     edition = "2018",
-    deps = ["//complex_sys/raze:git2"],
+    deps = ["//sys/complex/raze:git2"],
 )

examples/hello_sys/raze/remote/BUILD.bzip2-sys-0.1.9+1.0.8.bazel renamed to examples/sys/basic/raze/remote/BUILD.bzip2-sys-0.1.9+1.0.8.bazel

@@ -12,7 +12,7 @@ openssl = "=0.10.32"
 openssl-sys = "=0.9.60"
 
 [package.metadata.raze]
-workspace_path = "//complex_sys/raze"
+workspace_path = "//sys/complex/raze"
 genmode = "Remote"
 gen_workspace_prefix = "rules_rust_examples_complex_sys"
 rust_rules_workspace_name = "rules_rust"