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/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
@@ -484,7 +485,8 @@ def _rust_toolchain_tools_repository_impl(ctx):
         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")
+    version_semver = semver(version)
+    include_llvm_tools = (version.major >= 1 and version_semver.minor > 45) or (version == "nightly" and iso_date > "2020-05-22")
     if include_llvm_tools:
         llvm_tools_content, llvm_tools_sha256 = load_llvm_tools(
             ctx = ctx,

rust/semver.bzl

@@ -0,0 +1,31 @@
+"""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(".", 3)
+    if parts < 3:
+        fail("Unexpected number of parts for semver value: {}".format(version))
+
+    major = parts[0]
+    minor = parts[1]
+    patch, _, pre = parts[2].partition("-")
+
+    return struct(
+        major = int(major),
+        minor = int(minor),
+        patch = int(patch),
+        pre = pre,
+        str = version,
+    )