Merge main

Drop import macro (bazelbuild#2411)

As discussed over at
bazelbuild#2383

Fix rustfmt toolchains when consuming rules_rust with bzlmod. (bazelbuild#2410)

Fixes bazelbuild#2260

Provide a better error message when trying to generate rust-project.json (bazelbuild#2196)

Currently when trying to generate a `rust-project.json`, if there aren't
actually any Rust targets defined, the script mysteriously fails.

This adds a better error message.

Update android example to use Starlark version of android_ndk_repository (bazelbuild#2417)

The native version of `android_ndk_repository` rule no longer work with
the newer ndk versions.

When I set `ANDROID_NDK_HOME` to
`/usr/local/vinhdaitran/Android/Sdk/ndk/26.1.10909125`, the rule expects
a different structure from the Android NDK path.
```
ERROR: /usr/local/vinhdaitran/github/rules_rust/examples/android/WORKSPACE.bazel:67:23: fetching android_ndk_repository rule //external:androidndk: java.io.IOException:
Expected directory at /usr/local/vinhdaitran/Android/Sdk/ndk/26.1.10909125/platforms but it is not a directory or it does not exist.
Unable to read the Android NDK at /usr/local/vinhdaitran/Android/Sdk/ndk/26.1.10909125, the path may be invalid. Is the path in android_ndk_repository() or ANDROID_NDK_HOME set correctly?
If the path is correct, the contents in the Android NDK directory may have been modified.
```

Using the Starlark version of the rule, as recommended in
https://bazel.build/reference/be/android#android_ndk_repository, fixes
the issue.

cc: @keith

Allow ~ in repository names (bazelbuild#2427)

Fixes bazelbuild#2426

Prepare rust rules for Starlark CcToolchainInfo. (bazelbuild#2424)

bazelbuild#2425

Author: scentini

.bazelci/presubmit.yml

@@ -581,6 +581,12 @@ tasks:
       - "--android_platforms=//:arm64-v8a"
     build_targets:
       - "//:android_app"
+    environment:
+      # This ndk version matches with rules_android_ndk repo's CI
+      # https://github.com/bazelbuild/rules_android_ndk/blob/877c68ef34c9f3353028bf490d269230c1990483/.bazelci/presubmit.yml#L37
+      # The ndk is installed by this script 
+      # https://github.com/bazelbuild/continuous-integration/blob/ba56013373821feadd9f2eaa6b81eb19528795f0/macos/mac-android.sh
+      ANDROID_NDK_HOME: /opt/android-ndk-r25b
   android_examples_macos:
     name: Android Examples
     platform: macos
@@ -591,6 +597,12 @@ tasks:
       - "--android_platforms=//:arm64-v8a"
     build_targets:
       - "//:android_app"
+    environment:
+      # This ndk version matches with rules_android_ndk repo's CI
+      # https://github.com/bazelbuild/rules_android_ndk/blob/877c68ef34c9f3353028bf490d269230c1990483/.bazelci/presubmit.yml#L42
+      # The ndk is installed by this script 
+      # https://github.com/bazelbuild/continuous-integration/blob/ba56013373821feadd9f2eaa6b81eb19528795f0/macos/mac-android.sh
+      ANDROID_NDK_HOME: /Users/buildkite/android-ndk-r25b
   ios_examples:
     name: iOS Examples
     platform: macos

MODULE.bazel

@@ -100,12 +100,6 @@ use_repo(
     "rules_rust_test_load_arbitrary_tool",
     "rules_rust_tinyjson",
     "rules_rust_toolchain_test_target_json",
-    "rules_rust_util_import__aho-corasick-0.7.15",
-    "rules_rust_util_import__lazy_static-1.4.0",
-    "rules_rust_util_import__proc-macro2-1.0.33",
-    "rules_rust_util_import__quickcheck-1.0.3",
-    "rules_rust_util_import__quote-1.0.10",
-    "rules_rust_util_import__syn-1.0.82",
     "rules_rust_wasm_bindgen__anyhow-1.0.71",
     "rules_rust_wasm_bindgen__assert_cmd-1.0.8",
     "rules_rust_wasm_bindgen__diff-0.1.13",

WORKSPACE.bazel

@@ -45,10 +45,6 @@ load("@rules_rust//tools/rust_analyzer:deps.bzl", "rust_analyzer_dependencies")
 
 rust_analyzer_dependencies()
 
-load("@rules_rust//util/import:deps.bzl", "import_deps")
-
-import_deps()
-
 load("@rules_rust//wasm_bindgen:repositories.bzl", "rust_wasm_bindgen_repositories")
 
 rust_wasm_bindgen_repositories()

crate_universe/src/utils/starlark/label.rs

@@ -63,7 +63,7 @@ impl FromStr for Label {
     type Err = anyhow::Error;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let re = Regex::new(r"^(@@?[\w\d\-_\.]*)?(//)?([\w\d\-_\./+]+)?(:([\+\w\d\-_\./]+))?$")?;
+        let re = Regex::new(r"^(@@?[\w\d\-_\.~]*)?(//)?([\w\d\-_\./+]+)?(:([\+\w\d\-_\./]+))?$")?;
         let cap = re
             .captures(s)
             .with_context(|| format!("Failed to parse label from string: {s}"))?;
@@ -449,6 +449,19 @@ mod test {
         assert_eq!(label.target(), "target");
     }
 
+    #[test]
+    fn full_label_bzlmod_with_tilde() {
+        let label = Label::from_str("@@repo~name//package/sub_package:target").unwrap();
+        assert_eq!(label.to_string(), "@@repo~name//package/sub_package:target");
+        assert!(label.is_absolute());
+        assert_eq!(
+            label.repository(),
+            Some(&Repository::Canonical(String::from("repo~name")))
+        );
+        assert_eq!(label.package(), Some("package/sub_package"));
+        assert_eq!(label.target(), "target");
+    }
+
     #[test]
     fn full_label_with_slash_after_colon() {
         let label = Label::from_str("@repo//package/sub_package:subdir/target").unwrap();

examples/android/.bazelrc

@@ -3,7 +3,7 @@ common --enable_platform_specific_config
 startup --windows_enable_symlinks
 build:windows --enable_runfiles
 
-build --fat_apk_cpu=arm64-v8a
+build --fat_apk_cpu=arm64-v8a --android_crosstool_top=@androidndk//:toolchain
 
 # TODO: migrate all dependencies from WORKSPACE to MODULE.bazel
 # https://github.com/bazelbuild/rules_rust/issues/2181

examples/android/WORKSPACE.bazel

@@ -45,6 +45,19 @@ rbe_preconfig(
     toolchain = "ubuntu1804-bazel-java11",
 )
 
-android_sdk_repository(name = "androidsdk")
+android_sdk_repository(
+    name = "androidsdk",
+)
+
+http_archive(
+    name = "rules_android_ndk",
+    sha256 = "b1a5ddd784e6ed915c2035c0db536a278b5f50c64412128c06877115991391ef",
+    strip_prefix = "rules_android_ndk-877c68ef34c9f3353028bf490d269230c1990483",
+    url = "https://github.com/bazelbuild/rules_android_ndk/archive/877c68ef34c9f3353028bf490d269230c1990483.zip",
+)
+
+load("@rules_android_ndk//:rules.bzl", "android_ndk_repository")
 
-android_ndk_repository(name = "androidndk")
+android_ndk_repository(
+    name = "androidndk",
+)

examples/bzlmod/hello_world/BUILD.bazel

@@ -56,3 +56,10 @@ build_test(
         "@rules_rust//tools/rust_analyzer:gen_rust_project",
     ],
 )
+
+build_test(
+    name = "rust_fmt",
+    targets = [
+        "@rules_rust//:rustfmt",
+    ],
+)

rust/private/extensions.bzl

@@ -7,7 +7,6 @@ load("//proto/prost:repositories.bzl", "rust_prost_dependencies")
 load("//rust/private:repository_utils.bzl", "TINYJSON_KWARGS")
 load("//test:deps.bzl", "rules_rust_test_deps")
 load("//tools/rust_analyzer:deps.bzl", "rust_analyzer_dependencies")
-load("//util/import:deps.bzl", "import_deps")
 load("//wasm_bindgen:repositories.bzl", "rust_wasm_bindgen_dependencies")
 
 def _internal_deps_impl(module_ctx):
@@ -23,7 +22,6 @@ def _internal_deps_impl(module_ctx):
     direct_deps.extend(rust_prost_dependencies(bzlmod = True))
     direct_deps.extend(rust_bindgen_dependencies())
     direct_deps.extend(rust_analyzer_dependencies())
-    direct_deps.extend(import_deps())
     direct_deps.extend(rust_wasm_bindgen_dependencies())
     direct_deps.extend(rules_rust_test_deps())
 

rust/private/rustc.bzl

@@ -685,7 +685,15 @@ def collect_inputs(
     """
     linker_script = getattr(file, "linker_script") if hasattr(file, "linker_script") else None
 
-    linker_depset = cc_toolchain.linker_files()
+    # TODO: As of writing this comment Bazel used Java CcToolchainInfo.
+    # However there is ongoing work to rewrite provider in Starlark.
+    # rules_rust is not coupled with Bazel release. Remove conditional and change to
+    # _linker_files once Starlark CcToolchainInfo is visible to Bazel.
+    # https://github.com/bazelbuild/rules_rust/issues/2425
+    if hasattr(cc_toolchain, "_linker_files"):
+        linker_depset = cc_toolchain._linker_files
+    else:
+        linker_depset = cc_toolchain.linker_files()
     compilation_mode = ctx.var["COMPILATION_MODE"]
 
     use_pic = _should_use_pic(cc_toolchain, feature_configuration, crate_info.type, compilation_mode)

rust/repositories.bzl

@@ -262,6 +262,12 @@ def rust_register_toolchains(
             target_compatible_with_by_toolchain[toolchain.name] = triple_to_constraint_set(toolchain.target_triple)
             toolchain_types[toolchain.name] = "@rules_rust//rust:toolchain"
 
+        toolchain_names.append(rustfmt_repo_name)
+        toolchain_labels[rustfmt_repo_name] = "@{}_tools//:rustfmt_toolchain".format(rustfmt_repo_name)
+        exec_compatible_with_by_toolchain[rustfmt_repo_name] = triple_to_constraint_set(exec_triple)
+        target_compatible_with_by_toolchain[rustfmt_repo_name] = []
+        toolchain_types[rustfmt_repo_name] = "@rules_rust//rust/rustfmt:toolchain_type"
+
     toolchain_repository_hub(
         name = "rust_toolchains",
         toolchain_names = toolchain_names,

tools/rust_analyzer/aquery.rs

@@ -110,7 +110,18 @@ fn parse_aquery_output_files(
     execution_root: &Path,
     aquery_stdout: &str,
 ) -> anyhow::Result<Vec<PathBuf>> {
-    let out: AqueryOutput = serde_json::from_str(aquery_stdout)?;
+    let out: AqueryOutput = serde_json::from_str(aquery_stdout).map_err(|_| {
+        // Parsing to `AqueryOutput` failed, try parsing into a `serde_json::Value`:
+        match serde_json::from_str::<serde_json::Value>(aquery_stdout) {
+            Ok(serde_json::Value::Object(_)) => {
+                // If the JSON is an object, it's likely that the aquery command failed.
+                anyhow::anyhow!("Aquery returned an empty result, are there any Rust targets in the specified paths?.")
+            }
+            _ => {
+                anyhow::anyhow!("Failed to parse aquery output as JSON")
+            }
+        }
+    })?;
 
     let artifacts = out
         .artifacts