Minor cleanup of various tests and examples

WORKSPACE.bazel

@@ -12,9 +12,9 @@ load("@rules_rust//bindgen:repositories.bzl", "rust_bindgen_repositories")
 
 rust_bindgen_repositories()
 
-load("@rules_rust//tools/rust_analyzer/raze:crates.bzl", "rules_rust_tools_rust_analyzer_fetch_remote_crates")
+load("@rules_rust//tools/rust_analyzer:deps.bzl", "rust_analyzer_deps")
 
-rules_rust_tools_rust_analyzer_fetch_remote_crates()
+rust_analyzer_deps()
 
 load("@rules_rust//wasm_bindgen:repositories.bzl", "rust_wasm_bindgen_repositories")
 

docs/WORKSPACE.bazel

@@ -1,4 +1,4 @@
-workspace(name = "io_bazel_rules_rust_docs")
+workspace(name = "rules_rust_docs")
 
 load(":docs_repositories.bzl", "repositories")
 

examples/examples_deps.bzl

@@ -10,6 +10,16 @@ load("@rules_rust//proto:repositories.bzl", "rust_proto_repositories")
 load("@rules_rust//rust:repositories.bzl", "rust_repositories", "rust_repository_set")
 load("@rules_rust//wasm_bindgen:repositories.bzl", "rust_wasm_bindgen_repositories")
 
+_LIBC_BUILD_FILE_CONTENT = """\
+load("@rules_rust//rust:rust.bzl", "rust_library")
+
+rust_library(
+    name = "libc",
+    srcs = glob(["src/**/*.rs"]),
+    visibility = ["//visibility:public"],
+)
+"""
+
 def deps():
     """Define dependencies for `rules_rust` examples"""
 
@@ -43,7 +53,7 @@ def deps():
     maybe(
         http_archive,
         name = "libc",
-        build_file = "@examples//ffi:libc.BUILD",
+        build_file_content = _LIBC_BUILD_FILE_CONTENT,
         sha256 = "1ac4c2ac6ed5a8fb9020c166bc63316205f1dc78d4b964ad31f4f21eb73f0c6d",
         strip_prefix = "libc-0.2.20",
         urls = [

examples/per_platform_printer/BUILD.bazel

@@ -24,8 +24,8 @@ rust_library(
         "@rules_rust//rust/platform:linux": [
             ":print_linux.rs",
         ],
-        "@rules_rust//rust/platform:osx": [
-            ":print_osx.rs",
+        "@rules_rust//rust/platform:macos": [
+            ":print_macos.rs",
         ],
         "@rules_rust//rust/platform:windows": [
             ":print_windows.rs",

examples/per_platform_printer/lib.rs

@@ -4,18 +4,24 @@ mod print_generic;
 mod print_linux;
 
 #[cfg(target_os = "macos")]
-mod print_osx;
+mod print_macos;
 
-pub fn print() -> Vec<String> {
-    let mut outs = vec![print_generic::print()];
+#[cfg(target_os = "windows")]
+mod print_windows;
 
-    #[cfg(target_os = "linux")]
-    outs.push(print_linux::print());
+#[cfg(target_os = "linux")]
+pub fn print() -> Vec<String> {
+    vec![print_generic::print(), print_linux::print()]
+}
 
-    #[cfg(target_os = "macos")]
-    outs.push(print_osx::print());
+#[cfg(target_os = "macos")]
+pub fn print() -> Vec<String> {
+    vec![print_generic::print(), print_macos::print()]
+}
 
-    outs
+#[cfg(target_os = "windows")]
+pub fn print() -> Vec<String> {
+    vec![print_generic::print(), print_windows::print()]
 }
 
 #[cfg(test)]
@@ -33,7 +39,9 @@ mod tests {
                 #[cfg(target_os = "linux")]
                 "Hello Linux!",
                 #[cfg(target_os = "macos")]
-                "Hello OSX!",
+                "Hello MacOS!",
+                #[cfg(target_os = "windows")]
+                "Hello Windows!",
             ]
         );
     }

examples/per_platform_printer/print_macos.rs

@@ -0,0 +1,3 @@
+pub fn print() -> String {
+    "Hello MacOS!".to_owned()
+}

test/deps.bzl

@@ -1,8 +1,32 @@
 """A module defining dependencies of the `rules_rust` tests"""
 
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
 load("//test/load_arbitrary_tool:load_arbitrary_tool_test.bzl", "load_arbitrary_tool_test")
 
+_LIBC_BUILD_FILE_CONTENT = """\
+load("@rules_rust//rust:rust.bzl", "rust_library")
+
+rust_library(
+    name = "libc",
+    srcs = glob(["src/**/*.rs"]),
+    visibility = ["//visibility:public"],
+)
+"""
+
 def rules_rust_test_deps():
     """Load dependencies for rules_rust tests"""
 
     load_arbitrary_tool_test()
+
+    maybe(
+        http_archive,
+        name = "libc",
+        build_file_content = _LIBC_BUILD_FILE_CONTENT,
+        sha256 = "1ac4c2ac6ed5a8fb9020c166bc63316205f1dc78d4b964ad31f4f21eb73f0c6d",
+        strip_prefix = "libc-0.2.20",
+        urls = [
+            "https://mirror.bazel.build/github.com/rust-lang/libc/archive/0.2.20.zip",
+            "https://github.com/rust-lang/libc/archive/0.2.20.zip",
+        ],
+    )