Merge branch 'main' into bindgen

krasimirgg · web-flow · commit 0b1edc68b47d · 2026-02-05T12:04:28.000+01:00
diff --git a/.bazelversion b/.bazelversion
@@ -0,0 +1 @@
+8.4.2
diff --git a/README.md b/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
diff --git a/cargo/private/cargo_build_script.bzl b/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(
diff --git a/crate_universe/extensions.bzl b/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")
diff --git a/examples/all_crate_deps/.bazelversion b/examples/all_crate_deps/.bazelversion
@@ -0,0 +1 @@
+8.4.2
diff --git a/examples/all_deps_vendor/.bazelversion b/examples/all_deps_vendor/.bazelversion
@@ -0,0 +1 @@
+8.4.2
diff --git a/examples/android/.bazelversion b/examples/android/.bazelversion
@@ -0,0 +1 @@
+8.4.2
diff --git a/examples/bazel_env/.bazelversion b/examples/bazel_env/.bazelversion
@@ -0,0 +1 @@
+8.4.2
diff --git a/examples/compile_opt/.bazelversion b/examples/compile_opt/.bazelversion
@@ -0,0 +1 @@
+8.4.2
diff --git a/examples/crate_universe/.bazelversion b/examples/crate_universe/.bazelversion
@@ -0,0 +1 @@
+8.4.2
diff --git a/examples/crate_universe_local_path/.bazelversion b/examples/crate_universe_local_path/.bazelversion
@@ -0,0 +1 @@
+8.4.2
diff --git a/examples/cross_compile/.bazelversion b/examples/cross_compile/.bazelversion
@@ -0,0 +1 @@
+8.4.2
diff --git a/examples/cross_compile_llvm/.bazelversion b/examples/cross_compile_llvm/.bazelversion
@@ -0,0 +1 @@
+8.4.2
diff --git a/examples/cross_compile_musl/.bazelversion b/examples/cross_compile_musl/.bazelversion
@@ -0,0 +1 @@
+8.4.2
diff --git a/examples/cross_compile_nix/.bazelversion b/examples/cross_compile_nix/.bazelversion
@@ -0,0 +1 @@
+8.4.2
diff --git a/examples/cross_compile_zig/.bazelversion b/examples/cross_compile_zig/.bazelversion
@@ -0,0 +1 @@
+8.4.2
diff --git a/examples/ffi/.bazelversion b/examples/ffi/.bazelversion
@@ -0,0 +1 @@
+8.4.2
diff --git a/examples/hello_world/.bazelversion b/examples/hello_world/.bazelversion
@@ -0,0 +1 @@
+8.4.2
diff --git a/examples/hello_world_no_cargo/.bazelversion b/examples/hello_world_no_cargo/.bazelversion
@@ -0,0 +1 @@
+8.4.2
diff --git a/examples/ios/.bazelversion b/examples/ios/.bazelversion
@@ -0,0 +1 @@
+8.4.2
diff --git a/examples/ios_build/.bazelversion b/examples/ios_build/.bazelversion
@@ -0,0 +1 @@
+8.4.2
diff --git a/examples/override_target/.bazelversion b/examples/override_target/.bazelversion
@@ -0,0 +1 @@
+8.4.2
diff --git a/examples/proto/.bazelversion b/examples/proto/.bazelversion
@@ -0,0 +1 @@
+8.4.2
diff --git a/examples/proto_with_toolchain/.bazelversion b/examples/proto_with_toolchain/.bazelversion
@@ -0,0 +1 @@
+8.4.2
diff --git a/examples/sys/.bazelversion b/examples/sys/.bazelversion
@@ -0,0 +1 @@
+8.4.2
diff --git a/extensions/bindgen/.bazelversion b/extensions/bindgen/.bazelversion
@@ -0,0 +1 @@
+8.4.2
diff --git a/extensions/bindgen/private/bindgen.bzl b/extensions/bindgen/private/bindgen.bzl
@@ -243,7 +243,7 @@ def _rust_bindgen_impl(ctx):
     args.add_all(ctx.attr.bindgen_flags)
 
     rust_toolchain = ctx.toolchains[Label("@rules_rust//rust:toolchain_type")]
-    if "--rust-edition " not in [f.split("=")[0] for f in ctx.attr.bindgen_flags]:
+    if "--rust-edition" not in [f.split("=")[0] for f in ctx.attr.bindgen_flags]:
         args.add("--rust-edition=%s" % rust_toolchain.default_edition)
 
     args.add(header)
@@ -284,7 +284,10 @@ def _rust_bindgen_impl(ctx):
         include_directories = cc_lib[CcInfo].compilation_context.includes,
         quote_include_directories = cc_lib[CcInfo].compilation_context.quote_includes,
         system_include_directories = depset(
-            transitive = [cc_lib[CcInfo].compilation_context.system_includes],
+            transitive = [
+                cc_lib[CcInfo].compilation_context.system_includes,
+                cc_lib[CcInfo].compilation_context.external_includes,
+            ],
             direct = cc_toolchain.built_in_include_directories,
         ),
         user_compile_flags = ctx.attr.clang_flags,
diff --git a/extensions/mdbook/.bazelversion b/extensions/mdbook/.bazelversion
@@ -0,0 +1 @@
+8.4.2
diff --git a/extensions/prost/.bazelversion b/extensions/prost/.bazelversion
@@ -0,0 +1 @@
+8.4.2
diff --git a/extensions/protobuf/.bazelversion b/extensions/protobuf/.bazelversion
@@ -0,0 +1 @@
+8.4.2
diff --git a/extensions/pyo3/.bazelversion b/extensions/pyo3/.bazelversion
@@ -0,0 +1 @@
+8.4.2
diff --git a/extensions/pyo3/private/pyo3.bzl b/extensions/pyo3/private/pyo3.bzl
@@ -87,10 +87,43 @@ def _py_pyo3_library_impl(ctx):
     is_windows = extension.basename.endswith(".dll")
 
     # https://pyo3.rs/v0.26.0/building-and-distribution#manual-builds
-    ext = ctx.actions.declare_file("{}{}".format(
-        ctx.label.name,
-        ".pyd" if is_windows else ".so",
-    ))
+    #
+    # Determine the on-disk and logical Python module layout.
+    #
+    # `module` is a full dotted module path (e.g. "foo.bar"). We split on the
+    # last "." such that:
+    #   - module_prefix == "foo"
+    #   - module_name == "bar"
+    #
+    # `module_name` must match the `#[pymodule] fn <name>(...)` in the Rust code
+    # and is also what we pass to the stub generator.
+    module_path = ctx.attr.module_name if ctx.attr.module_name else ctx.label.name.replace("/", ".")
+
+    if module_path.startswith(".") or module_path.endswith(".") or ".." in module_path:
+        fail("Invalid `module` value '{}': expected a dotted module path like 'foo.bar'.".format(module_path))
+
+    last_dot = module_path.rfind(".")
+    if last_dot == -1:
+        module_prefix = None
+        module_name = module_path
+    else:
+        module_prefix = module_path[:last_dot]
+        module_name = module_path[last_dot + 1:]
+
+    if not module_name:
+        fail("Invalid `module` value '{}': module name may not be empty.".format(module_path))
+
+    # Convert module_prefix (e.g. "foo.bar") into a path ("foo/bar") and place
+    # the extension and stubs in the corresponding directory.
+    if module_prefix:
+        module_prefix_path = module_prefix.replace(".", "/")
+        module_relpath = "{}/{}.{}".format(module_prefix_path, module_name, "pyd" if is_windows else "so")
+        stub_relpath = "{}/{}.pyi".format(module_prefix_path, module_name)
+    else:
+        module_relpath = "{}.{}".format(module_name, "pyd" if is_windows else "so")
+        stub_relpath = "{}.pyi".format(module_name)
+
+    ext = ctx.actions.declare_file(module_relpath)
     ctx.actions.symlink(
         output = ext,
         target_file = extension,
@@ -99,10 +132,10 @@ def _py_pyo3_library_impl(ctx):
 
     stub = None
     if _stubs_enabled(ctx.attr.stubs, toolchain):
-        stub = ctx.actions.declare_file("{}.pyi".format(ctx.label.name))
+        stub = ctx.actions.declare_file(stub_relpath)
 
         args = ctx.actions.args()
-        args.add(ctx.label.name, format = "--module_name=%s")
+        args.add(module_name, format = "--module_name=%s")
         args.add(ext, format = "--module_path=%s")
         args.add(stub, format = "--output=%s")
         ctx.actions.run(
@@ -180,6 +213,9 @@ py_pyo3_library = rule(
         "imports": attr.string_list(
             doc = "List of import directories to be added to the `PYTHONPATH`.",
         ),
+        "module_name": attr.string(
+            doc = "A full dotted Python module path implemented by this extension (e.g. `foo.bar`).",
+        ),
         "stubs": attr.int(
             doc = "Whether or not to generate stubs. `-1` will default to the global config, `0` will never generate, and `1` will always generate stubs.",
             default = -1,
@@ -218,6 +254,7 @@ def pyo3_extension(
         stubs = None,
         version = None,
         compilation_mode = "opt",
+        module_name = None,
         **kwargs):
     """Define a PyO3 python extension module.
 
@@ -259,6 +296,7 @@ def pyo3_extension(
             For more details see [rust_shared_library][rsl].
         compilation_mode (str, optional): The [compilation_mode](https://bazel.build/reference/command-line-reference#flag--compilation_mode)
             value to build the extension for. If set to `"current"`, the current configuration will be used.
+        module_name (str, optional): A full dotted Python module path implemented by this extension (e.g. `foo.bar`).
         **kwargs (dict): Additional keyword arguments.
     """
     tags = kwargs.pop("tags", [])
@@ -318,6 +356,7 @@ def pyo3_extension(
         compilation_mode = compilation_mode,
         stubs = stubs_int,
         imports = imports,
+        module_name = module_name,
         tags = tags,
         visibility = visibility,
         **kwargs
diff --git a/extensions/pyo3/test/module_prefix/BUILD.bazel b/extensions/pyo3/test/module_prefix/BUILD.bazel
@@ -0,0 +1,15 @@
+load("@rules_python//python:defs.bzl", "py_test")
+load("//:defs.bzl", "pyo3_extension")
+
+pyo3_extension(
+    name = "module_prefix",
+    srcs = ["bar.rs"],
+    edition = "2021",
+    module_name = "foo.bar",
+)
+
+py_test(
+    name = "module_prefix_import_test",
+    srcs = ["module_prefix_import_test.py"],
+    deps = [":module_prefix"],
+)
diff --git a/extensions/pyo3/test/module_prefix/bar.rs b/extensions/pyo3/test/module_prefix/bar.rs
@@ -0,0 +1,12 @@
+use pyo3::prelude::*;
+
+#[pyfunction]
+fn thing() -> PyResult<&'static str> {
+    Ok("hello from rust")
+}
+
+#[pymodule]
+fn bar(m: &Bound<'_, PyModule>) -> PyResult<()> {
+    m.add_function(wrap_pyfunction!(thing, m)?)?;
+    Ok(())
+}
diff --git a/extensions/pyo3/test/module_prefix/module_prefix_import_test.py b/extensions/pyo3/test/module_prefix/module_prefix_import_test.py
@@ -0,0 +1,18 @@
+"""Tests that a pyo3 extension can be imported via a module prefix."""
+
+import unittest
+from test.module_prefix.foo import bar
+
+
+class ModulePrefixImportTest(unittest.TestCase):
+    """Test Class."""
+
+    def test_import_and_call(self) -> None:
+        """Test that a pyo3 extension can be imported via a module prefix."""
+
+        result = bar.thing()
+        self.assertEqual("hello from rust", result)
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/extensions/pyo3/test/module_prefix_imports/BUILD.bazel b/extensions/pyo3/test/module_prefix_imports/BUILD.bazel
@@ -0,0 +1,18 @@
+load("@rules_python//python:defs.bzl", "py_test")
+load("//:defs.bzl", "pyo3_extension")
+
+# Variant that relies on the `imports` attribute to put this package root on
+# `PYTHONPATH` (so you can import `foo.bar` directly).
+pyo3_extension(
+    name = "module_prefix_imports",
+    srcs = ["bar.rs"],
+    edition = "2021",
+    imports = ["."],
+    module_name = "foo.bar",
+)
+
+py_test(
+    name = "module_prefix_imports_test",
+    srcs = ["module_prefix_imports_test.py"],
+    deps = [":module_prefix_imports"],
+)
diff --git a/extensions/pyo3/test/module_prefix_imports/bar.rs b/extensions/pyo3/test/module_prefix_imports/bar.rs
@@ -0,0 +1,13 @@
+use pyo3::prelude::*;
+
+#[pyfunction]
+fn thing() -> PyResult<&'static str> {
+    Ok("hello from rust")
+}
+
+#[pymodule]
+fn bar(m: &Bound<'_, PyModule>) -> PyResult<()> {
+    m.add_function(wrap_pyfunction!(thing, m)?)?;
+    Ok(())
+}
+
diff --git a/extensions/pyo3/test/module_prefix_imports/module_prefix_imports_test.py b/extensions/pyo3/test/module_prefix_imports/module_prefix_imports_test.py
@@ -0,0 +1,19 @@
+"""Tests importing a pyo3 extension via `imports = ["."]`."""
+
+import unittest
+
+from foo import bar  # type: ignore[import-untyped]
+
+
+class ModulePrefixImportsTest(unittest.TestCase):
+    """Test Class."""
+
+    def test_import_and_call(self) -> None:
+        """Test that a pyo3 extension can be imported via a module prefix."""
+
+        result = bar.thing()
+        self.assertEqual("hello from rust", result)
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/extensions/wasm_bindgen/.bazelversion b/extensions/wasm_bindgen/.bazelversion
@@ -0,0 +1 @@
+8.4.2
diff --git a/rust/known_shas.bzl b/rust/known_shas.bzl
diff --git a/rust/private/BUILD.bazel b/rust/private/BUILD.bazel
diff --git a/rust/private/rust.bzl b/rust/private/rust.bzl
diff --git a/rust/private/rustc.bzl b/rust/private/rustc.bzl
diff --git a/rust/private/stamp.bzl b/rust/private/stamp.bzl
diff --git a/test/integration/cc_common_link/.bazelversion b/test/integration/cc_common_link/.bazelversion
diff --git a/test/integration/cc_common_link_with_global_alloc/.bazelversion b/test/integration/cc_common_link_with_global_alloc/.bazelversion
diff --git a/test/integration/no_std/.bazelversion b/test/integration/no_std/.bazelversion
diff --git a/util/fetch_shas/fetch_shas_NIGHTLY_ISO_DATES.txt b/util/fetch_shas/fetch_shas_NIGHTLY_ISO_DATES.txt
diff --git a/util/fetch_shas/fetch_shas_VERSIONS.txt b/util/fetch_shas/fetch_shas_VERSIONS.txt
