Merge branch 'main' into redsun82-rust-analyzer-update

Resolve MODULE.bazel conflict: keep `rules_rust` 0.73.0 (this branch) and
`rules_swift` 4.0.0-rc5-codeql.1 plus the `apple_support` removal (main).

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 890cb55d-0437-4bd7-9268-87b8897ada01

Author: redsun82

MODULE.bazel

@@ -31,13 +31,8 @@ bazel_dep(name = "gazelle", version = "0.50.0")
 bazel_dep(name = "rules_dotnet", version = "0.21.5-codeql.1")
 bazel_dep(name = "googletest", version = "1.17.0.bcr.2")
 bazel_dep(name = "rules_rust", version = "0.73.0")
-bazel_dep(name = "rules_swift", version = "4.0.0-rc5")
+bazel_dep(name = "rules_swift", version = "4.0.0-rc5-codeql.1")
 bazel_dep(name = "swift-syntax", version = "603.0.2")
-
-# Needed so we can `use_repo` `local_config_xcode` and
-# `local_config_apple_cc_toolchains` below (referenced by the per-target
-# Xcode-config transition in `unified/swift-syntax-rs/xcode_transition.bzl`).
-bazel_dep(name = "apple_support", version = "2.8.0")
 bazel_dep(name = "zstd", version = "1.5.7.bcr.1")
 
 bazel_dep(name = "buildifier_prebuilt", version = "6.4.0", dev_dependency = True)
@@ -226,10 +221,7 @@ use_repo(
     "swift-resource-dir-macos",
 )
 
-# Swift toolchain for building `unified/swift-syntax-rs`. On Linux we register
-# a hermetic swift.org toolchain as the exec toolchain; on macOS `rules_swift`
-# auto-registers `xcode_swift_toolchain` (host Xcode + OS-provided Swift
-# runtime), which is not hermetic.
+# Hermetic swift.org toolchain for building `unified/swift-syntax-rs`.
 #
 # The version is pinned as a literal rather than read from
 # `unified/swift-syntax-rs/.swift-version` via `swift_version_file`: the latter
@@ -247,20 +239,14 @@ use_repo(
     swift,
     "swift_toolchain",
     "swift_toolchain_ubuntu22.04",
+    "swift_toolchain_xcode",
 )
 
 register_toolchains(
     "@swift_toolchain//:swift_toolchain_exec_ubuntu22.04",
+    "@swift_toolchain//:swift_toolchain_exec_xcode",
 )
 
-# `apple_support`'s xcode_config and CC toolchains, needed by the Xcode
-# transition in `unified/swift-syntax-rs/xcode_transition.bzl`.
-xcode_configure = use_extension("@apple_support//xcode:xcode_configure.bzl", "xcode_configure_extension")
-use_repo(xcode_configure, "local_config_xcode")
-
-apple_cc_configure = use_extension("@apple_support//crosstool:setup.bzl", "apple_cc_configure_extension")
-use_repo(apple_cc_configure, "local_config_apple_cc_toolchains")
-
 node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node")
 node.toolchain(
     name = "nodejs",

csharp/tools/autobuild.sh

@@ -2,7 +2,7 @@
 
 set -eu
 
-if [ "$CODEQL_PLATFORM" != "linux64" ] && [ "$CODEQL_PLATFORM" != "osx64" ] ; then
+if [ "$CODEQL_PLATFORM" != "linux64" ] && [ "$CODEQL_PLATFORM" != "linux-arm64" ] && [ "$CODEQL_PLATFORM" != "osx64" ] ; then
     echo "Automatic build detection for $CODEQL_PLATFORM is not implemented."
     exit 1
 fi

java/documentation/library-coverage/coverage.csv

@@ -88,7 +88,7 @@ java.applet,,,11,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,11,
 java.awt,1,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,3
 java.beans,1,,177,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,82,95
 java.io,66,1,225,,,,,,,,,22,,,,,,,,,,,,,,,29,15,,,,,,,,,,,,,,,,,,,,,,,,,1,,202,23
-java.lang,38,3,790,,13,,,,,,1,,,,,,,,,,,,8,,,,2,9,,,4,,,1,,,,,,,,,,,,,,,,,,3,,,510,280
+java.lang,38,3,789,,13,,,,,,1,,,,,,,,,,,,8,,,,2,9,,,4,,,1,,,,,,,,,,,,,,,,,,3,,,509,280
 java.math,,,9,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,9
 java.net,23,3,347,,,,1,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,21,,,,,,,,,,,,,,,,,3,248,99
 java.nio,47,,499,,,,,,,,,5,,,,,,,,,,,,,,,25,16,,,,,,,,,1,,,,,,,,,,,,,,,,,,302,197

java/documentation/library-coverage/coverage.rst

@@ -26,7 +26,7 @@ Java framework & library support
    `JBoss Logging <https://github.com/jboss-logging/jboss-logging>`_,``org.jboss.logging``,,,324,,,,,,
    `JSON-java <https://github.com/stleary/JSON-java>`_,``org.json``,,236,,,,,,,
    `Jackson <https://github.com/FasterXML/jackson>`_,``com.fasterxml.jackson.*``,,9,2,2,,,,,
-   Java Standard Library,``java.*``,10,4629,260,99,,9,,,26
+   Java Standard Library,``java.*``,10,4628,260,99,,9,,,26
    Java extensions,"``javax.*``, ``jakarta.*``",101,4185,90,10,4,2,1,1,4
    `Jetty <https://eclipse.dev/jetty/>`_,``org.eclipse.jetty.client``,,,2,,,,,,2
    Kotlin Standard Library,``kotlin*``,,1849,16,14,,,,,2
@@ -41,5 +41,5 @@ Java framework & library support
    `Thymeleaf <https://www.thymeleaf.org/>`_,``org.thymeleaf``,,2,2,,,,,,
    `jOOQ <https://www.jooq.org/>`_,``org.jooq``,,,1,,,1,,,
    Others,"``actions.osgi``, ``antlr``, ``ch.ethz.ssh2``, ``cn.hutool.core.codec``, ``com.alibaba.com.caucho.hessian.io``, ``com.alibaba.druid.sql``, ``com.alibaba.fastjson2``, ``com.amazonaws.auth``, ``com.auth0.jwt.algorithms``, ``com.azure.identity``, ``com.caucho.burlap.io``, ``com.caucho.hessian.io``, ``com.cedarsoftware.util.io``, ``com.esotericsoftware.kryo.io``, ``com.esotericsoftware.kryo5.io``, ``com.esotericsoftware.yamlbeans``, ``com.hubspot.jinjava``, ``com.jcraft.jsch``, ``com.microsoft.sqlserver.jdbc``, ``com.mitchellbosecke.pebble``, ``com.opensymphony.xwork2``, ``com.sshtools.j2ssh.authentication``, ``com.sun.crypto.provider``, ``com.sun.jndi.ldap``, ``com.sun.net.httpserver``, ``com.sun.net.ssl``, ``com.sun.rowset``, ``com.sun.security.auth.module``, ``com.sun.security.ntlm``, ``com.sun.security.sasl.digest``, ``com.thoughtworks.xstream``, ``com.trilead.ssh2``, ``com.unboundid.ldap.sdk``, ``com.zaxxer.hikari``, ``flexjson``, ``hudson``, ``io.jsonwebtoken``, ``io.r2dbc.spi``, ``io.undertow.server.handlers.resource``, ``javafx.scene.web``, ``jenkins``, ``jodd.json``, ``liquibase.database.jvm``, ``liquibase.statement.core``, ``net.lingala.zip4j``, ``net.schmizz.sshj``, ``net.sf.json``, ``net.sf.saxon.s9api``, ``ognl``, ``org.acegisecurity``, ``org.antlr.runtime``, ``org.apache.avro``, ``org.apache.commons.codec``, ``org.apache.commons.compress.archivers.tar``, ``org.apache.commons.exec``, ``org.apache.commons.fileupload``, ``org.apache.commons.httpclient.util``, ``org.apache.commons.jelly``, ``org.apache.commons.jexl2``, ``org.apache.commons.jexl3``, ``org.apache.commons.lang``, ``org.apache.commons.logging``, ``org.apache.commons.net``, ``org.apache.commons.ognl``, ``org.apache.cxf.catalog``, ``org.apache.cxf.common.classloader``, ``org.apache.cxf.common.jaxb``, ``org.apache.cxf.common.logging``, ``org.apache.cxf.configuration.jsse``, ``org.apache.cxf.helpers``, ``org.apache.cxf.resource``, ``org.apache.cxf.staxutils``, ``org.apache.cxf.tools.corba.utils``, ``org.apache.cxf.tools.util``, ``org.apache.cxf.transform``, ``org.apache.directory.ldap.client.api``, ``org.apache.hadoop.fs``, ``org.apache.hadoop.hive.metastore``, ``org.apache.hadoop.hive.ql.exec``, ``org.apache.hadoop.hive.ql.metadata``, ``org.apache.hc.client5.http.async.methods``, ``org.apache.hc.client5.http.classic.methods``, ``org.apache.hc.client5.http.fluent``, ``org.apache.hc.client5.http.protocol``, ``org.apache.hc.client5.http.utils``, ``org.apache.hive.hcatalog.templeton``, ``org.apache.ibatis.jdbc``, ``org.apache.ibatis.mapping``, ``org.apache.log4j``, ``org.apache.poi``, ``org.apache.shiro.authc``, ``org.apache.shiro.codec``, ``org.apache.shiro.jndi``, ``org.apache.shiro.mgt``, ``org.apache.sshd.client.session``, ``org.apache.tools.ant``, ``org.apache.tools.zip``, ``org.codehaus.cargo.container.installer``, ``org.dom4j``, ``org.exolab.castor.xml``, ``org.fusesource.leveldbjni``, ``org.geogebra.web.full.main``, ``org.gradle.api.file``, ``org.ho.yaml``, ``org.influxdb``, ``org.jabsorb``, ``org.jboss.vfs``, ``org.jdbi.v3.core``, ``org.jenkins.ui.icon``, ``org.jenkins.ui.symbol``, ``org.keycloak.models.map.storage``, ``org.kohsuke.stapler``, ``org.lastaflute.web``, ``org.mvel2``, ``org.openjdk.jmh.runner.options``, ``org.owasp.esapi``, ``org.pac4j.jwt.config.encryption``, ``org.pac4j.jwt.config.signature``, ``org.scijava.log``, ``org.xml.sax``, ``org.xmlpull.v1``, ``play.libs.ws``, ``play.mvc``, ``ratpack.core.form``, ``ratpack.core.handling``, ``ratpack.core.http``, ``ratpack.exec``, ``ratpack.form``, ``ratpack.func``, ``ratpack.handling``, ``ratpack.http``, ``ratpack.util``, ``software.amazon.awssdk.transfer.s3.model``, ``sun.jvmstat.perfdata.monitor.protocol.local``, ``sun.jvmstat.perfdata.monitor.protocol.rmi``, ``sun.misc``, ``sun.net.ftp``, ``sun.net.www.protocol.http``, ``sun.security.acl``, ``sun.security.jgss.krb5``, ``sun.security.krb5``, ``sun.security.pkcs``, ``sun.security.pkcs11``, ``sun.security.provider``, ``sun.security.ssl``, ``sun.security.x509``, ``sun.tools.jconsole``",151,8258,824,188,6,20,18,,186
-   Totals,,406,28637,2765,461,16,151,33,1,416
+   Totals,,406,28636,2765,461,16,151,33,1,416
 

misc/bazel/registry/modules/rules_swift/4.0.0-rc5-codeql.1/MODULE.bazel

@@ -0,0 +1,79 @@
+"""rules_swift MODULE.bazel file"""
+
+module(
+    name = "rules_swift",
+    version = "4.0.0-rc5-codeql.1",
+    bazel_compatibility = [">=8.0.0"],
+    compatibility_level = 3,
+)
+
+bazel_dep(name = "abseil-cpp", version = "20250814.1")
+bazel_dep(name = "apple_support", version = "2.8.0")
+bazel_dep(name = "bazel_linux_packages", version = "0.4.1")
+bazel_dep(name = "bazel_features", version = "1.51.0")
+bazel_dep(name = "bazel_skylib", version = "1.7.1")
+bazel_dep(name = "nlohmann_json", version = "3.12.0.bcr.1")
+bazel_dep(name = "platforms", version = "0.0.11")
+bazel_dep(name = "protobuf", version = "34.0.bcr.1")
+bazel_dep(name = "rules_cc", version = "0.2.14")
+bazel_dep(name = "rules_shell", version = "0.3.0")
+bazel_dep(name = "swift_argument_parser", version = "1.7.0")
+
+apt = use_extension("@bazel_linux_packages//apt:extensions.bzl", "apt")
+apt.ubuntu(
+    name = "swift_ubuntu22.04_sysroot",
+    architectures = ["amd64"],
+    lockfile = "//swift/internal/extensions:ubuntu22.04_sysroot.lock.json",
+    packages = [
+        "libc6-dev",
+        "libcurl4-openssl-dev",
+        "libstdc++-11-dev",
+        "libxml2-dev",
+        "linux-libc-dev",
+        "zlib1g-dev",
+    ],
+    suites = ["jammy"],
+)
+apt.ubuntu(
+    name = "swift_ubuntu22.04_aarch64_sysroot",
+    architectures = ["arm64"],
+    lockfile = "//swift/internal/extensions:ubuntu22.04_aarch64_sysroot.lock.json",
+    packages = [
+        "libc6-dev",
+        "libcurl4-openssl-dev",
+        "libstdc++-11-dev",
+        "libxml2-dev",
+        "linux-libc-dev",
+        "zlib1g-dev",
+    ],
+    suites = ["jammy"],
+)
+use_repo(
+    apt,
+    "swift_ubuntu22.04_aarch64_sysroot",
+    "swift_ubuntu22.04_sysroot",
+)
+
+swift_autoconfiguration = use_repo_rule("//swift/internal:swift_autoconfiguration.bzl", "swift_autoconfiguration")
+
+swift_autoconfiguration(name = "rules_swift_local_config")
+
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+
+http_archive(
+    name = "rules_swift_index_import_5_8",
+    build_file = "//third_party:rules_swift_index_import/BUILD.overlay",
+    canonical_id = "index-import-5.8",
+    sha256 = "28c1ffa39d99e74ed70623899b207b41f79214c498c603915aef55972a851a15",
+    urls = ["https://github.com/MobileNativeFoundation/index-import/releases/download/5.8.0.1/index-import.tar.gz"],
+)
+
+http_archive(
+    name = "rules_swift_index_import_6_1",
+    build_file = "//third_party:rules_swift_index_import/BUILD.overlay",
+    canonical_id = "index-import-6.1",
+    sha256 = "9a54fc1674af6031125a9884480a1e31e1bcf48b8f558b3e8bcc6b6fcd6e8b61",
+    urls = ["https://github.com/MobileNativeFoundation/index-import/releases/download/6.1.0.1/index-import.tar.gz"],
+)
+
+register_toolchains("//swift/toolchains:all")

misc/bazel/registry/modules/rules_swift/4.0.0-rc5-codeql.1/patches/register_downloaded_macos_toolchain.patch

@@ -0,0 +1,175 @@
+diff --git a/swift/internal/extensions/toolchains.bzl b/swift/internal/extensions/toolchains.bzl
+--- a/swift/internal/extensions/toolchains.bzl
++++ b/swift/internal/extensions/toolchains.bzl
+@@ -132,12 +132,11 @@ def toolchains_for_platform(platform, toolchain_repository):
+         toolchain_repository = toolchain_repository,
+     )
+ 
+-    if platform != "xcode":
+-        content += _EXEC_TOOLCHAIN_PLATFORM.format(
+-            exec_compatible_with = _exec_compatible_with_for_platform(platform),
+-            platform = platform,
+-            toolchain_repository = toolchain_repository,
+-        )
++    content += _EXEC_TOOLCHAIN_PLATFORM.format(
++        exec_compatible_with = _exec_compatible_with_for_platform(platform),
++        platform = platform,
++        toolchain_repository = toolchain_repository,
++    )
+ 
+     if platform in (
+         "ubuntu22.04",
+diff --git a/swift/toolchains/swift_toolchain.bzl b/swift/toolchains/swift_toolchain.bzl
+--- a/swift/toolchains/swift_toolchain.bzl
++++ b/swift/toolchains/swift_toolchain.bzl
+@@ -605,10 +605,14 @@ def _parse_target_system_name(*, arch, os, target_system_name):
+     """Returns the target system name set by the CC toolchain or attempts to create one based on the OS and arch."""
+ 
+     if target_system_name and target_system_name != "local":
++        if os == "macos" and target_system_name.endswith(("-macos", "-macosx")):
++            return target_system_name + "10.15"
+         return target_system_name
+ 
+     if os == "linux":
+         return "%s-unknown-linux-gnu" % arch
++    elif os == "macos":
++        return "%s-apple-macos10.15" % arch
+     elif os == "windows":
+         # The MSVC cc toolchain reports a `target_gnu_system_name` of "local",
+         # so synthesize the triple.
+@@ -706,5 +710,16 @@ def _swift_toolchain_impl(ctx):
+     elif ctx.attr.os == "none":
+         swift_linkopts_cc_info = CcInfo()
++    elif ctx.attr.os == "macos":
++        macos_linkopts = ["-L{}".format(paths.join(toolchain_root, "lib/swift/macosx"))]
++        if sdkroot:
++            macos_linkopts.append("-L{}".format(paths.join(sdkroot, "usr/lib/swift")))
++        swift_linkopts_cc_info = _swift_sdk_linkopts_cc_info(
++            ctx.label,
++            macos_linkopts,
++            ctx.attr.swift_tools[SwiftToolsInfo].additional_inputs if ctx.attr.swift_tools else [],
++        )
++        dynamic_runtime_cc_info = None
++        static_runtime_cc_info = None
+     elif ctx.attr.os == "android":
+         if not sdkroot:
+             fail("Android toolchain requires a sysroot to be set, either via the `sdkroot` attribute or by using a CC toolchain that provides one.")
+diff --git a/swift/internal/extensions/toolchain.BUILD b/swift/internal/extensions/toolchain.BUILD
+--- a/swift/internal/extensions/toolchain.BUILD
++++ b/swift/internal/extensions/toolchain.BUILD
+@@ -333,17 +333,22 @@ swift_toolchain(
+     features = [
+         "swift._supports_upcoming_features",
+         "swift.no_embed_debug_module",
+-        "swift.use_autolink_extract",
+-        "swift.lld_gc_workaround",
+-        "swift.use_module_wrap",
+         # TODO: This should be removed so that private headers can be used with
+         # explicit modules, but the build targets for CgRPC need to be cleaned up
+         # first because they contain C++ code.
+         "swift.module_map_no_private_headers",
+-    ],
++    ] + select({
++        "@platforms//os:linux": [
++            "swift.lld_gc_workaround",
++            "swift.use_autolink_extract",
++            "swift.use_module_wrap",
++        ],
++        "//conditions:default": [],
++    }),
+     os = select({
+         "@platforms//os:linux": "linux",
+         "@platforms//os:macos": "macos",
+     }),
+     parsed_version = "{swift_version}",
++    sdkroot = "{macos_sdkroot}",
+     static_runtime = select({
+diff --git a/swift/internal/extensions/standalone_toolchain.bzl b/swift/internal/extensions/standalone_toolchain.bzl
+--- a/swift/internal/extensions/standalone_toolchain.bzl
++++ b/swift/internal/extensions/standalone_toolchain.bzl
+@@ -91,11 +91,17 @@ def _standalone_toolchain_impl(repository_ctx):
+             strip_prefix = filename.removesuffix(".tar.gz"),
+         )
+ 
++    macos_sdkroot = ""
++    if repository_ctx.attr.platform == "xcode":
++        macos_sdkroot = _run(repository_ctx, ["xcrun", "--sdk", "macosx", "--show-sdk-path"])
++        repository_ctx.watch(macos_sdkroot)
++
+     repository_ctx.file(".swift-version", repository_ctx.attr.swift_version)
+     repository_ctx.template(
+         "BUILD.bazel",
+         repository_ctx.attr._build_template,
+         substitutions = {
++            "{macos_sdkroot}": macos_sdkroot,
+             "{swift_version}": repository_ctx.attr.swift_version,
+         },
+     )
+@@ -107,19 +109,29 @@ def _standalone_toolchain_impl(repository_ctx):
+-standalone_toolchain = repository_rule(
+-    implementation = _standalone_toolchain_impl,
+-    attrs = {
+-        "_build_template": attr.label(
+-            default = "//swift/internal/extensions:toolchain.BUILD",
+-        ),
+-        "platform": attr.string(
+-            doc = "The host platform name in the swift package download URL",
+-            mandatory = True,
+-        ),
+-        "sha256": attr.string(
+-            doc = "The expected SHA-256 of the file downloaded. This must match the SHA-256 of the file downloaded.",
+-        ),
+-        "swift_version": attr.string(
+-            doc = "Version of the swift toolchain to be installed.",
+-            mandatory = True,
+-        ),
+-    },
++_STANDALONE_TOOLCHAIN_ATTRS = {
++    "_build_template": attr.label(
++        default = "//swift/internal/extensions:toolchain.BUILD",
++    ),
++    "platform": attr.string(
++        doc = "The host platform name in the swift package download URL",
++        mandatory = True,
++    ),
++    "sha256": attr.string(
++        doc = "The expected SHA-256 of the file downloaded. This must match the SHA-256 of the file downloaded.",
++    ),
++    "swift_version": attr.string(
++        doc = "Version of the swift toolchain to be installed.",
++        mandatory = True,
++    ),
++}
++
++standalone_toolchain = repository_rule(
++    implementation = _standalone_toolchain_impl,
++    attrs = _STANDALONE_TOOLCHAIN_ATTRS,
++)
++
++standalone_macos_toolchain = repository_rule(
++    implementation = _standalone_toolchain_impl,
++    attrs = _STANDALONE_TOOLCHAIN_ATTRS,
++    configure = True,
++    environ = ["DEVELOPER_DIR"],
++    local = True,
+ )
+diff --git a/swift/extensions.bzl b/swift/extensions.bzl
+--- a/swift/extensions.bzl
++++ b/swift/extensions.bzl
+@@ -17 +17,5 @@
+-load("//swift/internal/extensions:standalone_toolchain.bzl", "standalone_toolchain")
++load(
++    "//swift/internal/extensions:standalone_toolchain.bzl",
++    "standalone_macos_toolchain",
++    "standalone_toolchain",
++)
+@@ -182,7 +186,8 @@ def _standalone_toolchain_impl(module_ctx):
+         toolchain_releases = toolchain.platform_sha256.items() or swift_releases[swift_version].items()
+         for platform, sha256 in toolchain_releases:
+             repository_name = toolchain.name + "_{}".format(platform)
+-            standalone_toolchain(
++            toolchain_repository = standalone_macos_toolchain if platform == "xcode" else standalone_toolchain
++            toolchain_repository(
+                 name = repository_name,
+                 sha256 = sha256,
+                 platform = platform,

misc/bazel/registry/modules/rules_swift/4.0.0-rc5-codeql.1/source.json

@@ -0,0 +1,8 @@
+{
+    "integrity": "sha256-Ly2lS4AlZJMiyqAxKHyCB+2pGeP5aYkQ6zv8QheeSTI=",
+    "url": "https://github.com/bazelbuild/rules_swift/releases/download/4.0.0-rc5/rules_swift.4.0.0-rc5.tar.gz",
+    "patches": {
+        "register_downloaded_macos_toolchain.patch": "sha256-249WJ4YEH2HmxlvGftl4eD53792joKJx9Dh0j5eHAgo="
+    },
+    "patch_strip": 1
+}

misc/bazel/registry/modules/rules_swift/metadata.json

@@ -0,0 +1,11 @@
+{
+    "homepage": "https://github.com/bazelbuild/rules_swift",
+    "maintainers": [],
+    "repository": [
+        "github:bazelbuild/rules_swift"
+    ],
+    "versions": [
+        "4.0.0-rc5-codeql.1"
+    ],
+    "yanked_versions": {}
+}