Fix version checks to support rust >= 1.100.0

Author: UebelAndre

rust/private/repository_utils.bzl

@@ -14,7 +14,8 @@ load(
     "system_to_staticlib_ext",
     "system_to_stdlib_linkflags",
 )
-load("//rust/private:common.bzl", "DEFAULT_NIGHTLY_ISO_DATE")
+load(":common.bzl", "DEFAULT_NIGHTLY_ISO_DATE")
+load(":semver.bzl", "semver")
 
 DEFAULT_TOOLCHAIN_NAME_PREFIX = "toolchain_for"
 DEFAULT_STATIC_RUST_URL_TEMPLATES = ["https://static.rust-lang.org/dist/{}.tar.xz"]
@@ -550,9 +551,13 @@ def includes_rust_analyzer_proc_macro_srv(version, iso_date):
 
     if version == "nightly":
         return iso_date >= "2022-09-21"
-    elif version == "beta":
+
+    if version == "beta":
         return False
-    elif version >= "1.64.0":
+
+    # version >= 1.64.0
+    version_semver = semver(version)
+    if version_semver.major >= 1 and version_semver.minor >= 64:
         return True
 
     return False

rust/private/semver.bzl

@@ -0,0 +1,33 @@
+"""Semver"""
+
+def semver(version):
+    """Constructs a struct containing separated sections of a semantic version value.
+
+    Args:
+        version (str): The semver value.
+
+    Returns:
+        struct:
+            - major (int): The semver's major component. E.g. `1` from `1.2.3`
+            - minor (int): The semver's minor component. E.g. `2` from `1.2.3`
+            - patch (int): The semver's patch component. E.g. `3` from `1.2.3`
+            - pre (optional str): The semver's pre component. E.g. `rc4` from `1.2.3-rc4` or None if absent.
+            - str (str): The full string value of the semver.
+    """
+    parts = version.split(".", 2)
+    if len(parts) < 3:
+        fail("Unexpected number of parts for semver value: {}".format(version))
+
+    major = parts[0]
+    minor = parts[1]
+    patch, split, pre = parts[2].partition("-")
+    if not split:
+        pre = None
+
+    return struct(
+        major = int(major),
+        minor = int(minor),
+        patch = int(patch),
+        pre = pre,
+        str = version,
+    )

rust/repositories.bzl

@@ -35,6 +35,7 @@ load(
     "toolchain_repository_hub",
     _load_arbitrary_tool = "load_arbitrary_tool",
 )
+load("//rust/private:semver.bzl", "semver")
 
 # Re-export `load_arbitrary_tool` as it's historically been used in external repositories.
 load_arbitrary_tool = _load_arbitrary_tool
@@ -422,6 +423,19 @@ _RUST_TOOLCHAIN_REPOSITORY_ATTRS = {
     ),
 }
 
+def _include_llvm_tools(version, iso_date):
+    """Rust 1.45.0 and nightly builds after 2020-05-22 need the llvm-tools gzip to get the libLLVM dylib"""
+    if version in ("nightly", "beta"):
+        if iso_date > "2020-05-22":
+            return True
+        return False
+
+    version_semver = semver(version)
+    if version_semver.major >= 1 and version_semver.minor >= 45:
+        return True
+
+    return False
+
 def _rust_toolchain_tools_repository_impl(ctx):
     """The implementation of the rust toolchain tools repository rule."""
     sha256s = dict(ctx.attr.sha256s)
@@ -483,8 +497,7 @@ def _rust_toolchain_tools_repository_impl(ctx):
         build_components.append(rustfmt_content)
         sha256s.update(rustfmt_sha256)
 
-    # Rust 1.45.0 and nightly builds after 2020-05-22 need the llvm-tools gzip to get the libLLVM dylib
-    include_llvm_tools = version >= "1.45.0" or (version == "nightly" and iso_date > "2020-05-22")
+    include_llvm_tools = _include_llvm_tools(version, iso_date)
     if include_llvm_tools:
         llvm_tools_content, llvm_tools_sha256 = load_llvm_tools(
             ctx = ctx,

test/unit/semver/BUILD.bazel

@@ -0,0 +1,3 @@
+load(":semver_test.bzl", "semver_test_suite")
+
+semver_test_suite(name = "semver_test_suite")

test/unit/semver/semver_test.bzl

@@ -0,0 +1,139 @@
+"""Unit tests for semver.bzl."""
+
+load("@bazel_skylib//lib:unittest.bzl", "asserts", "unittest")
+
+# buildifier: disable=bzl-visibility
+load("//rust/private:semver.bzl", "semver")
+
+def _semver_basic_test_impl(ctx):
+    env = unittest.begin(ctx)
+
+    # Test basic semver parsing
+    result = semver("1.2.3")
+    asserts.equals(env, 1, result.major)
+    asserts.equals(env, 2, result.minor)
+    asserts.equals(env, 3, result.patch)
+    asserts.equals(env, None, result.pre)
+    asserts.equals(env, "1.2.3", result.str)
+
+    # Test with zeros
+    result = semver("0.0.0")
+    asserts.equals(env, 0, result.major)
+    asserts.equals(env, 0, result.minor)
+    asserts.equals(env, 0, result.patch)
+    asserts.equals(env, None, result.pre)
+    asserts.equals(env, "0.0.0", result.str)
+
+    # Test larger version numbers
+    result = semver("10.20.30")
+    asserts.equals(env, 10, result.major)
+    asserts.equals(env, 20, result.minor)
+    asserts.equals(env, 30, result.patch)
+    asserts.equals(env, None, result.pre)
+    asserts.equals(env, "10.20.30", result.str)
+
+    return unittest.end(env)
+
+def _semver_with_pre_test_impl(ctx):
+    env = unittest.begin(ctx)
+
+    # Test semver with pre-release
+    result = semver("1.2.3-rc4")
+    asserts.equals(env, 1, result.major)
+    asserts.equals(env, 2, result.minor)
+    asserts.equals(env, 3, result.patch)
+    asserts.equals(env, "rc4", result.pre)
+    asserts.equals(env, "1.2.3-rc4", result.str)
+
+    # Test semver with alpha pre-release
+    result = semver("2.0.0-alpha")
+    asserts.equals(env, 2, result.major)
+    asserts.equals(env, 0, result.minor)
+    asserts.equals(env, 0, result.patch)
+    asserts.equals(env, "alpha", result.pre)
+    asserts.equals(env, "2.0.0-alpha", result.str)
+
+    # Test semver with beta pre-release
+    result = semver("1.5.0-beta.1")
+    asserts.equals(env, 1, result.major)
+    asserts.equals(env, 5, result.minor)
+    asserts.equals(env, 0, result.patch)
+    asserts.equals(env, "beta.1", result.pre)
+    asserts.equals(env, "1.5.0-beta.1", result.str)
+
+    # Test semver with nightly pre-release
+    result = semver("1.70.0-nightly")
+    asserts.equals(env, 1, result.major)
+    asserts.equals(env, 70, result.minor)
+    asserts.equals(env, 0, result.patch)
+    asserts.equals(env, "nightly", result.pre)
+    asserts.equals(env, "1.70.0-nightly", result.str)
+
+    return unittest.end(env)
+
+def _semver_edge_cases_test_impl(ctx):
+    env = unittest.begin(ctx)
+
+    # Test semver with empty pre-release (trailing dash)
+    # When there's a trailing dash, partition returns empty string for pre,
+    # but "pre or None" converts it to None
+    result = semver("1.2.3-")
+    asserts.equals(env, 1, result.major)
+    asserts.equals(env, 2, result.minor)
+    asserts.equals(env, 3, result.patch)
+    asserts.equals(env, "", result.pre)
+    asserts.equals(env, "1.2.3-", result.str)
+
+    # Test semver with multiple dashes in pre-release
+    result = semver("1.2.3-alpha-test")
+    asserts.equals(env, 1, result.major)
+    asserts.equals(env, 2, result.minor)
+    asserts.equals(env, 3, result.patch)
+    asserts.equals(env, "alpha-test", result.pre)
+    asserts.equals(env, "1.2.3-alpha-test", result.str)
+
+    return unittest.end(env)
+
+def _semver_real_world_examples_test_impl(ctx):
+    env = unittest.begin(ctx)
+
+    # Test real Rust version examples
+    result = semver("1.80.0")
+    asserts.equals(env, 1, result.major)
+    asserts.equals(env, 80, result.minor)
+    asserts.equals(env, 0, result.patch)
+    asserts.equals(env, None, result.pre)
+    asserts.equals(env, "1.80.0", result.str)
+
+    result = semver("1.70.0")
+    asserts.equals(env, 1, result.major)
+    asserts.equals(env, 70, result.minor)
+    asserts.equals(env, 0, result.patch)
+    asserts.equals(env, None, result.pre)
+
+    result = semver("1.54.0")
+    asserts.equals(env, 1, result.major)
+    asserts.equals(env, 54, result.minor)
+    asserts.equals(env, 0, result.patch)
+    asserts.equals(env, None, result.pre)
+
+    return unittest.end(env)
+
+semver_basic_test = unittest.make(_semver_basic_test_impl)
+semver_with_pre_test = unittest.make(_semver_with_pre_test_impl)
+semver_edge_cases_test = unittest.make(_semver_edge_cases_test_impl)
+semver_real_world_examples_test = unittest.make(_semver_real_world_examples_test_impl)
+
+def semver_test_suite(name):
+    """Entry-point macro called from the BUILD file.
+
+    Args:
+        name (str): Name of the test suite.
+    """
+    unittest.suite(
+        name,
+        semver_basic_test,
+        semver_with_pre_test,
+        semver_edge_cases_test,
+        semver_real_world_examples_test,
+    )