Merge branch 'main' into zbarsky/bazel9

Author: dzbarsky

.bazelversion

@@ -0,0 +1 @@
+8.4.2

README.md

@@ -6,6 +6,10 @@
 
 This repository provides rules for building [Rust](https://www.rust-lang.org/) projects with [Bazel](https://bazel.build/).
 
+### Starter repo
+
+The fastest way to try this in an empty project is to click the green "Use this template" button on https://github.com/bazel-starters/rust.
+
 ## Community
 
 General discussions and announcements take place in the [GitHub Discussions](https://github.com/bazelbuild/rules_rust/discussions), but there are

cargo/private/cargo_build_script.bzl

@@ -420,12 +420,22 @@ def _cargo_build_script_impl(ctx):
     env["LDFLAGS"] = " ".join(_pwd_flags(link_args))
 
     # Defaults for cxx flags.
-    env["CC"] = "${{pwd}}/{}".format(ctx.executable._fallback_cc.path)
-    env["CXX"] = "${{pwd}}/{}".format(ctx.executable._fallback_cxx.path)
-    env["AR"] = "${{pwd}}/{}".format(ctx.executable._fallback_ar.path)
     env["ARFLAGS"] = ""
     env["CFLAGS"] = ""
     env["CXXFLAGS"] = ""
+    fallback_tools = []
+    if not cc_toolchain:
+        fallbacks = {
+            "AR": "_fallback_ar",
+            "CC": "_fallback_cc",
+            "CXX": "_fallback_cxx",
+        }
+        for key, attr in fallbacks.items():
+            tool = getattr(ctx.executable, attr)
+            if not tool:
+                fail("cargo_build_script without a cc toolchain requires %s" % attr)
+            fallback_tools.append(tool)
+            env[key] = "${{pwd}}/{}".format(tool.path)
 
     if cc_toolchain:
         # MSVC requires INCLUDE to be set
@@ -516,10 +526,7 @@ def _cargo_build_script_impl(ctx):
         direct = [
             script,
             ctx.executable._cargo_build_script_runner,
-            ctx.executable._fallback_cc,
-            ctx.executable._fallback_cxx,
-            ctx.executable._fallback_ar,
-        ] + ([toolchain.target_json] if toolchain.target_json else []),
+        ] + fallback_tools + ([toolchain.target_json] if toolchain.target_json else []),
         transitive = script_data + script_tools + toolchain_tools,
     )
 
@@ -744,16 +751,19 @@ cargo_build_script = rule(
         "_fallback_ar": attr.label(
             cfg = "exec",
             executable = True,
+            allow_files = True,
             default = Label("//cargo/private:no_ar"),
         ),
         "_fallback_cc": attr.label(
             cfg = "exec",
             executable = True,
+            allow_files = True,
             default = Label("//cargo/private:no_cc"),
         ),
         "_fallback_cxx": attr.label(
             cfg = "exec",
             executable = True,
+            allow_files = True,
             default = Label("//cargo/private:no_cxx"),
         ),
         "_incompatible_runfiles_cargo_manifest_dir": attr.label(

crate_universe/extensions.bzl

@@ -32,7 +32,7 @@ bazel_dep(name = "rules_rust", version = "0.68.1")
 You find the latest version on the [release page](https://github.com/bazelbuild/rules_rust/releases).
 
 
-After adding `rules_rust` in your `MODULE.bazel, set the following to begin using `crate_universe`:
+After adding `rules_rust` in your `MODULE.bazel`, set the following to begin using `crate_universe`:
 
 ```python
 crate = use_extension("@rules_rust//crate_universe:extensions.bzl", "crate")

crate_universe/src/config.rs

@@ -706,13 +706,34 @@ pub(crate) struct Config {
     pub(crate) rendering: RenderConfig,
 
     /// The contents of a Cargo configuration file
+    #[serde(default, deserialize_with = "deserialize_cargo_config")]
     pub(crate) cargo_config: Option<toml::Value>,
 
     /// A set of platform triples to use in generated select statements
     #[serde(default, skip_serializing_if = "BTreeSet::is_empty")]
     pub(crate) supported_platform_triples: BTreeSet<TargetTriple>,
 }
 
+// rules_rust/crate_universe/private/generate_utils.bzl:generate_config
+// injects the cargo_config as a literal JSON string, this causes line ending
+// instability in Unix vs Windows. Parsing it here fixes any cross platform differences.
+fn deserialize_cargo_config<'de, D>(deserializer: D) -> Result<Option<toml::Value>, D::Error>
+where
+    D: serde::Deserializer<'de>,
+{
+    let value: Option<serde_json::Value> = Option::deserialize(deserializer)?;
+    match value {
+        None | Some(serde_json::Value::Null) => Ok(None),
+        Some(serde_json::Value::String(s)) => s
+            .parse::<toml::Value>()
+            .map(Some)
+            .map_err(serde::de::Error::custom),
+        Some(other) => serde_json::from_value(other)
+            .map(Some)
+            .map_err(serde::de::Error::custom),
+    }
+}
+
 impl Config {
     pub(crate) fn try_from_path<T: AsRef<Path>>(path: T) -> Result<Self> {
         let data = fs::read_to_string(path)?;

crate_universe/src/lockfile.rs

@@ -376,4 +376,57 @@ mod test {
             digest,
         );
     }
+
+    #[test]
+    fn digest_stable_with_crlf_cargo_config() {
+        let context = Context::default();
+        let splicing_metadata = SplicingMetadata::default();
+
+        let json_config = |cargo_config: &str| {
+            serde_json::to_string(&serde_json::json!({
+                "generate_binaries": false,
+                "generate_build_scripts": false,
+                "cargo_config": cargo_config,
+                "rendering": {
+                    "repository_name": "test",
+                    "regen_command": "//test",
+                    "generate_cargo_toml_env_vars": true
+                }
+            }))
+            .unwrap()
+        };
+
+        let config_crlf: Config = serde_json::from_str(&json_config(
+            "[registries.my-registry]\r\nindex = \"sparse+https://example.com/\"",
+        ))
+        .unwrap();
+
+        let config_lf: Config = serde_json::from_str(&json_config(
+            "[registries.my-registry]\nindex = \"sparse+https://example.com/\"",
+        ))
+        .unwrap();
+
+        let digest_crlf = Digest::compute(
+            &context,
+            &config_crlf,
+            &splicing_metadata,
+            "0.1.0",
+            "cargo 1.57.0 (b2e52d7ca 2021-10-21)",
+            "rustc 1.57.0 (f1edd0429 2021-11-29)",
+        );
+
+        let digest_lf = Digest::compute(
+            &context,
+            &config_lf,
+            &splicing_metadata,
+            "0.1.0",
+            "cargo 1.57.0 (b2e52d7ca 2021-10-21)",
+            "rustc 1.57.0 (f1edd0429 2021-11-29)",
+        );
+
+        assert_eq!(
+            digest_crlf, digest_lf,
+            "Digests should be identical regardless of CRLF vs LF line endings in cargo_config"
+        );
+    }
 }

crate_universe/src/rendering/templates/module_bzl.j2

@@ -155,7 +155,7 @@ def all_crate_deps(
         normal (bool, optional): If True, normal dependencies are included in the
             output list.
         normal_dev (bool, optional): If True, normal dev dependencies will be
-            included in the output list..
+            included in the output list.
         proc_macro (bool, optional): If True, proc_macro dependencies are included
             in the output list.
         proc_macro_dev (bool, optional): If True, dev proc_macro dependencies are

examples/all_crate_deps/.bazelversion

@@ -0,0 +1 @@
+8.4.2

examples/all_deps_vendor/.bazelversion

@@ -0,0 +1 @@
+8.4.2

examples/android/.bazelversion

@@ -0,0 +1 @@
+8.4.2