Cleanup platform configurations (#399)

* Cleaned up platform configurations and added 'unix' and 'wasm32-unknown-unknown' targets

* Regenerate documentation

Author: UebelAndre

WORKSPACE

@@ -1,10 +1,6 @@
 workspace(name = "io_bazel_rules_rust")
 
-load(
-    "@bazel_tools//tools/build_defs/repo:git.bzl",
-    "git_repository",
-    "new_git_repository",
-)
+load("@bazel_tools//tools/build_defs/repo:git.bzl", "new_git_repository")
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 local_repository(
@@ -19,11 +15,16 @@ local_repository(
 
 http_archive(
     name = "bazel_skylib",
-    sha256 = "12ee3a5732e8c353fce4a710dbe045a16a161c49c79622faa1f2813f668bb442",
-    strip_prefix = "bazel-skylib-8f3151fb4a91d5f2ae4cad5901ea72fe30a2aba0",
-    url = "https://github.com/bazelbuild/bazel-skylib/archive/8f3151fb4a91d5f2ae4cad5901ea72fe30a2aba0.tar.gz",  # 2020-07-10
+    urls = [
+        "https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz",
+        "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz",
+    ],
+    sha256 = "1c531376ac7e5a180e0237938a2536de0c54d93f5c278634818e0efc952dd56c",
 )
 
+load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
+bazel_skylib_workspace()
+
 # TODO: Move this to examples/WORKSPACE when recursive repositories are enabled.
 load("@io_bazel_rules_rust//rust:repositories.bzl", "rust_repositories")
 rust_repositories()

docs/WORKSPACE

@@ -8,11 +8,16 @@ local_repository(
 
 http_archive(
     name = "bazel_skylib",
-    sha256 = "9a737999532daca978a158f94e77e9af6a6a169709c0cee274f0a4c3359519bd",
-    strip_prefix = "bazel-skylib-1.0.0",
-    url = "https://github.com/bazelbuild/bazel-skylib/archive/1.0.0.tar.gz",
+    urls = [
+        "https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz",
+        "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz",
+    ],
+    sha256 = "1c531376ac7e5a180e0237938a2536de0c54d93f5c278634818e0efc952dd56c",
 )
 
+load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
+bazel_skylib_workspace()
+
 http_archive(
     name = "io_bazel_stardoc",
     urls = [

docs/cargo_build_script.md

@@ -6,7 +6,7 @@
 ## cargo_build_script
 
 <pre>
-cargo_build_script(<a href="#cargo_build_script-name">name</a>, <a href="#cargo_build_script-crate_name">crate_name</a>, <a href="#cargo_build_script-crate_features">crate_features</a>, <a href="#cargo_build_script-deps">deps</a>, <a href="#cargo_build_script-build_script_env">build_script_env</a>, <a href="#cargo_build_script-kwargs">kwargs</a>)
+cargo_build_script(<a href="#cargo_build_script-name">name</a>, <a href="#cargo_build_script-crate_name">crate_name</a>, <a href="#cargo_build_script-crate_features">crate_features</a>, <a href="#cargo_build_script-version">version</a>, <a href="#cargo_build_script-deps">deps</a>, <a href="#cargo_build_script-build_script_env">build_script_env</a>, <a href="#cargo_build_script-kwargs">kwargs</a>)
 </pre>
 
     Compile and execute a rust build script to generate build attributes
@@ -66,6 +66,7 @@ build script in addition to the file generated by it.
 | <a id="cargo_build_script-name"></a>name |  <p align="center"> - </p>   |  none |
 | <a id="cargo_build_script-crate_name"></a>crate_name |  <p align="center"> - </p>   |  <code>""</code> |
 | <a id="cargo_build_script-crate_features"></a>crate_features |  <p align="center"> - </p>   |  <code>[]</code> |
+| <a id="cargo_build_script-version"></a>version |  <p align="center"> - </p>   |  <code>None</code> |
 | <a id="cargo_build_script-deps"></a>deps |  <p align="center"> - </p>   |  <code>[]</code> |
 | <a id="cargo_build_script-build_script_env"></a>build_script_env |  <p align="center"> - </p>   |  <code>{}</code> |
 | <a id="cargo_build_script-kwargs"></a>kwargs |  <p align="center"> - </p>   |  none |

docs/flatten.md

@@ -823,7 +823,7 @@ The tools required for the `rust_wasm_bindgen` rule.
 ## cargo_build_script
 
 <pre>
-cargo_build_script(<a href="#cargo_build_script-name">name</a>, <a href="#cargo_build_script-crate_name">crate_name</a>, <a href="#cargo_build_script-crate_features">crate_features</a>, <a href="#cargo_build_script-deps">deps</a>, <a href="#cargo_build_script-build_script_env">build_script_env</a>, <a href="#cargo_build_script-kwargs">kwargs</a>)
+cargo_build_script(<a href="#cargo_build_script-name">name</a>, <a href="#cargo_build_script-crate_name">crate_name</a>, <a href="#cargo_build_script-crate_features">crate_features</a>, <a href="#cargo_build_script-version">version</a>, <a href="#cargo_build_script-deps">deps</a>, <a href="#cargo_build_script-build_script_env">build_script_env</a>, <a href="#cargo_build_script-kwargs">kwargs</a>)
 </pre>
 
     Compile and execute a rust build script to generate build attributes
@@ -883,6 +883,7 @@ build script in addition to the file generated by it.
 | <a id="cargo_build_script-name"></a>name |  <p align="center"> - </p>   |  none |
 | <a id="cargo_build_script-crate_name"></a>crate_name |  <p align="center"> - </p>   |  <code>""</code> |
 | <a id="cargo_build_script-crate_features"></a>crate_features |  <p align="center"> - </p>   |  <code>[]</code> |
+| <a id="cargo_build_script-version"></a>version |  <p align="center"> - </p>   |  <code>None</code> |
 | <a id="cargo_build_script-deps"></a>deps |  <p align="center"> - </p>   |  <code>[]</code> |
 | <a id="cargo_build_script-build_script_env"></a>build_script_env |  <p align="center"> - </p>   |  <code>{}</code> |
 | <a id="cargo_build_script-kwargs"></a>kwargs |  <p align="center"> - </p>   |  none |

docs/index.md

@@ -16,6 +16,18 @@ To use the Rust rules, add the following to your `WORKSPACE` file to add the ext
 ```python
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
+http_archive(
+    name = "bazel_skylib",
+    urls = [
+        "https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz",
+        "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz",
+    ],
+    sha256 = "1c531376ac7e5a180e0237938a2536de0c54d93f5c278634818e0efc952dd56c",
+)
+
+load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
+bazel_skylib_workspace()
+
 http_archive(
     name = "io_bazel_rules_rust",
     sha256 = "b6da34e057a31b8a85e343c732de4af92a762f804fc36b0baa6c001423a70ebc",
@@ -26,13 +38,6 @@ http_archive(
     ],
 )
 
-http_archive(
-    name = "bazel_skylib",
-    sha256 = "9a737999532daca978a158f94e77e9af6a6a169709c0cee274f0a4c3359519bd",
-    strip_prefix = "bazel-skylib-1.0.0",
-    url = "https://github.com/bazelbuild/bazel-skylib/archive/1.0.0.tar.gz",
-)
-
 load("@io_bazel_rules_rust//rust:repositories.bzl", "rust_repositories")
 rust_repositories()
 

examples/WORKSPACE

@@ -47,14 +47,16 @@ rust_proto_repositories()
 
 http_archive(
     name = "bazel_skylib",
-    sha256 = "eb5c57e4c12e68c0c20bc774bfbc60a568e800d025557bc4ea022c6479acc867",
-    strip_prefix = "bazel-skylib-0.6.0",
     urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/archive/0.6.0.tar.gz",
-        "https://github.com/bazelbuild/bazel-skylib/archive/0.6.0.tar.gz",
+        "https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz",
+        "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz",
     ],
+    sha256 = "1c531376ac7e5a180e0237938a2536de0c54d93f5c278634818e0efc952dd56c",
 )
 
+load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
+bazel_skylib_workspace()
+
 http_archive(
     name = "build_bazel_rules_nodejs",
     sha256 = "e1a0d6eb40ec89f61a13a028e7113aa3630247253bcb1406281b627e44395145",

proto/repositories.bzl

@@ -44,13 +44,11 @@ def rust_proto_repositories():
     maybe(
         http_archive,
         name = "bazel_skylib",
-        strip_prefix = "bazel-skylib-1.0.2",
         urls = [
-            "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/archive/1.0.2.zip",
-            "https://github.com/bazelbuild/bazel-skylib/archive/1.0.2.zip",
+            "https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz",
+            "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz",
         ],
-        type = "zip",
-        sha256 = "64ad2728ccdd2044216e4cec7815918b7bb3bb28c95b7e9d951f9d4eccb07625",
+        sha256 = "1c531376ac7e5a180e0237938a2536de0c54d93f5c278634818e0efc952dd56c",
     )
 
     maybe(

rust/platform/BUILD

@@ -1,7 +1,7 @@
-package(default_visibility = ["//visibility:public"])
-
 load(":platform.bzl", "declare_config_settings")
 
+package(default_visibility = ["//visibility:public"])
+
 declare_config_settings()
 
 package_group(

rust/platform/platform.bzl

@@ -1,3 +1,6 @@
+"""Definitions for support config settings and platform definitions"""
+
+load("@bazel_skylib//lib:selects.bzl", "selects")
 load(
     ":triple_mappings.bzl",
     "cpu_arch_to_constraints",
@@ -26,35 +29,38 @@ _SUPPORTED_T2_PLATFORM_TRIPLES = [
     "aarch64-apple-ios",
     "aarch64-linux-android",
     "aarch64-unknown-linux-gnu",
-    "powerpc-unknown-linux-gnu",
     "arm-unknown-linux-gnueabi",
-    "s390x-unknown-linux-gnu",
     "i686-linux-android",
     "i686-unknown-freebsd",
+    "powerpc-unknown-linux-gnu",
+    "s390x-unknown-linux-gnu",
+    "wasm32-unknown-unknown",
     "x86_64-apple-ios",
     "x86_64-linux-android",
     "x86_64-unknown-freebsd",
 ]
 
 _SUPPORTED_CPU_ARCH = [
-    "x86_64",
-    "powerpc",
     "aarch64",
     "arm",
     "i686",
+    "powerpc",
     "s390x",
+    "x86_64",
 ]
 
 _SUPPORTED_SYSTEMS = [
     "android",
-    "freebsd",
     "darwin",
+    "freebsd",
     "ios",
     "linux",
     "windows",
 ]
 
+# buildifier: disable=unnamed-macro
 def declare_config_settings():
+    """Helper function for declaring `config_setting`s"""
     for cpu_arch in _SUPPORTED_CPU_ARCH:
         native.config_setting(
             name = cpu_arch,
@@ -91,3 +97,13 @@ def declare_config_settings():
             "@io_bazel_rules_rust//rust/platform:wasm32",
         ],
     )
+
+    selects.config_setting_group(
+        name = "unix",
+        match_any = [
+            ":android",
+            ":darwin",
+            ":freebsd",
+            ":linux",
+        ],
+    )

rust/platform/triple_mappings.bzl

@@ -1,3 +1,5 @@
+"""Helpers for constructing supported Rust platform triples"""
+
 # CPUs that map to a "@platforms//cpu entry
 _CPU_ARCH_TO_BUILTIN_PLAT_SUFFIX = {
     "x86_64": "x86_64",
@@ -80,7 +82,6 @@ _SYSTEM_TO_STDLIB_LINKFLAGS = {
     # If you are reading this ... sorry! set the env var `BAZEL_RUST_STDLIB_LINKFLAGS` to
     # what you need for your specific setup, for example like so
     # `BAZEL_RUST_STDLIB_LINKFLAGS="-ladvapi32:-lws2_32:-luserenv"`
-
     "freebsd": ["-lexecinfo", "-lpthread"],
     # TODO: This ignores musl. Longer term what does Bazel think about musl?
     "linux": ["-ldl", "-lpthread"],
@@ -155,6 +156,14 @@ def system_to_stdlib_linkflags(system):
     return _SYSTEM_TO_STDLIB_LINKFLAGS[system]
 
 def triple_to_constraint_set(triple):
+    """Returns a set of constraints for a given platform triple
+
+    Args:
+        triple (str): A platform triple. eg: `x86_64-unknown-linux-gnu`
+
+    Returns:
+        list: A list of constraints (each represented by a list of strings)
+    """
     component_parts = triple.split("-")
     if len(component_parts) < 3:
         fail("Expected target triple to contain at least three sections separated by '-'")