Merge branch 'main' into mypatches

.bazelignore

@@ -1,8 +1,10 @@
+.direnv
 bzlmod
+crate_universe/private/bootstrap
 docs
 examples
-crate_universe/private/bootstrap
+extensions
+test/aliased_toolchains
 test/bzlmod_repo_mapping
 test/cc_common_link
 test/no_std
-.direnv

.bazelversion

@@ -0,0 +1 @@
+7.3.2

.bcr/config.yml

@@ -1,3 +1,4 @@
 fixedReleaser:
   login: scentini
   email: [email protected]
+  moduleRoots: [".", "extensions"]

.bcr/extensions/bindgen/metadata.template.json

@@ -0,0 +1,23 @@
+{
+  "homepage": "https://github.com/bazelbuild/rules_rust/extensions/bindgen",
+  "maintainers": [
+    {
+        "email": "[email protected]",
+        "github": "UebelAndre",
+        "name": "UebelAndre"
+    },
+    {
+      "email": "[email protected]",
+      "github": "illicitonion",
+      "name": "Daniel Wagner-Hall"
+    },
+    {
+      "email": "[email protected]",
+      "github": "scentini",
+      "name": "Rosica Dejanovska"
+    }
+  ],
+  "repository": ["github:bazelbuild/rules_rust"],
+  "versions": [],
+  "yanked_versions": {}
+}

.bcr/extensions/bindgen/presubmit.yml

@@ -0,0 +1,15 @@
+bcr_test_module:
+  module_path: "extensions/bindgen"
+  matrix:
+    platform: ["macos_arm64", "ubuntu2004", "windows"]
+    bazel: ["7.x"]
+  tasks:
+    run_tests:
+      name: "Run test module"
+      platform: ${{ platform }}
+      bazel: ${{ bazel }}
+      # Remove the lockfile because we generate on Bazel 7, but test on Bazel 6 which may not be able to parse a future-generated lockfile.
+      shell_commands:
+        - "rm MODULE.bazel.lock"
+      test_targets:
+        - "//..."

.bcr/extensions/bindgen/source.template.json

@@ -0,0 +1,5 @@
+{
+  "integrity": "**leave this alone**",
+  "strip_prefix": "",
+  "url": "https://github.com/{OWNER}/{REPO}/releases/download/{TAG}/{REPO}_bindgen-{VERSION}.tar.gz"
+}

.bcr/extensions/prost/metadata.template.json

@@ -0,0 +1,23 @@
+{
+  "homepage": "https://github.com/bazelbuild/rules_rust/extensions/prost",
+  "maintainers": [
+    {
+        "email": "[email protected]",
+        "github": "UebelAndre",
+        "name": "UebelAndre"
+    },
+    {
+      "email": "[email protected]",
+      "github": "illicitonion",
+      "name": "Daniel Wagner-Hall"
+    },
+    {
+      "email": "[email protected]",
+      "github": "scentini",
+      "name": "Rosica Dejanovska"
+    }
+  ],
+  "repository": ["github:bazelbuild/rules_rust"],
+  "versions": [],
+  "yanked_versions": {}
+}

.bcr/extensions/prost/presubmit.yml

@@ -0,0 +1,15 @@
+bcr_test_module:
+  module_path: "extensions/prost"
+  matrix:
+    platform: ["macos_arm64", "ubuntu2004", "windows"]
+    bazel: ["7.x"]
+  tasks:
+    run_tests:
+      name: "Run test module"
+      platform: ${{ platform }}
+      bazel: ${{ bazel }}
+      # Remove the lockfile because we generate on Bazel 7, but test on Bazel 6 which may not be able to parse a future-generated lockfile.
+      shell_commands:
+        - "rm MODULE.bazel.lock"
+      test_targets:
+        - "//..."

.bcr/extensions/prost/source.template.json

@@ -0,0 +1,5 @@
+{
+  "integrity": "**leave this alone**",
+  "strip_prefix": "",
+  "url": "https://github.com/{OWNER}/{REPO}/releases/download/{TAG}/{REPO}_prost-{VERSION}.tar.gz"
+}

.bcr/extensions/protobuf/metadata.template.json

@@ -0,0 +1,23 @@
+{
+  "homepage": "https://github.com/bazelbuild/rules_rust/extensions/protobuf",
+  "maintainers": [
+    {
+        "email": "[email protected]",
+        "github": "UebelAndre",
+        "name": "UebelAndre"
+    },
+    {
+      "email": "[email protected]",
+      "github": "illicitonion",
+      "name": "Daniel Wagner-Hall"
+    },
+    {
+      "email": "[email protected]",
+      "github": "scentini",
+      "name": "Rosica Dejanovska"
+    }
+  ],
+  "repository": ["github:bazelbuild/rules_rust"],
+  "versions": [],
+  "yanked_versions": {}
+}

.bcr/extensions/protobuf/presubmit.yml

@@ -0,0 +1,15 @@
+bcr_test_module:
+  module_path: "extensions/protobuf"
+  matrix:
+    platform: ["macos_arm64", "ubuntu2004", "windows"]
+    bazel: ["7.x"]
+  tasks:
+    run_tests:
+      name: "Run test module"
+      platform: ${{ platform }}
+      bazel: ${{ bazel }}
+      # Remove the lockfile because we generate on Bazel 7, but test on Bazel 6 which may not be able to parse a future-generated lockfile.
+      shell_commands:
+        - "rm MODULE.bazel.lock"
+      test_targets:
+        - "//..."

.bcr/extensions/protobuf/source.template.json

@@ -0,0 +1,5 @@
+{
+  "integrity": "**leave this alone**",
+  "strip_prefix": "",
+  "url": "https://github.com/{OWNER}/{REPO}/releases/download/{TAG}/{REPO}_protobuf-{VERSION}.tar.gz"
+}

.bcr/extensions/wasm_bindgen/metadata.template.json

@@ -0,0 +1,23 @@
+{
+  "homepage": "https://github.com/bazelbuild/rules_rust/extensions/wasm_bindgen",
+  "maintainers": [
+    {
+        "email": "[email protected]",
+        "github": "UebelAndre",
+        "name": "UebelAndre"
+    },
+    {
+      "email": "[email protected]",
+      "github": "illicitonion",
+      "name": "Daniel Wagner-Hall"
+    },
+    {
+      "email": "[email protected]",
+      "github": "scentini",
+      "name": "Rosica Dejanovska"
+    }
+  ],
+  "repository": ["github:bazelbuild/rules_rust"],
+  "versions": [],
+  "yanked_versions": {}
+}

.bcr/extensions/wasm_bindgen/presubmit.yml

@@ -0,0 +1,15 @@
+bcr_test_module:
+  module_path: "extensions/wasm_bindgen"
+  matrix:
+    platform: ["macos_arm64", "ubuntu2004", "windows"]
+    bazel: ["7.x"]
+  tasks:
+    run_tests:
+      name: "Run test module"
+      platform: ${{ platform }}
+      bazel: ${{ bazel }}
+      # Remove the lockfile because we generate on Bazel 7, but test on Bazel 6 which may not be able to parse a future-generated lockfile.
+      shell_commands:
+        - "rm MODULE.bazel.lock"
+      test_targets:
+        - "//..."

.bcr/extensions/wasm_bindgen/source.template.json

@@ -0,0 +1,5 @@
+{
+  "integrity": "**leave this alone**",
+  "strip_prefix": "",
+  "url": "https://github.com/{OWNER}/{REPO}/releases/download/{TAG}/{REPO}_wasm_bindgen-{VERSION}.tar.gz"
+}

.bcr/presubmit.yml

@@ -1,7 +1,7 @@
 bcr_test_module:
   module_path: ""
   matrix:
-    platform: ["macos", "ubuntu2004"]
+    platform: ["macos_arm64", "ubuntu2004"]
     bazel: ["6.x", "7.x"]
   tasks:
     run_tests:
@@ -13,7 +13,7 @@ bcr_test_module:
       shell_commands:
         - "rm MODULE.bazel.lock"
       run_targets:
-        - "//third-party:vendor"
+        - "//third-party-in-workspace:vendor"
         - "@rules_rust//tools/rust_analyzer:gen_rust_project"
       test_targets:
         - "//..."
@@ -32,7 +32,7 @@ bcr_test_module_windows:
       shell_commands:
         - "rm MODULE.bazel.lock"
       run_targets:
-        - "//third-party:vendor"
+        - "//third-party-in-workspace:vendor"
       build_targets:
         - "@rules_rust//tools/rust_analyzer:gen_rust_project"
       test_targets:

.bcr/source.template.json

@@ -1,5 +1,5 @@
 {
   "integrity": "**leave this alone**",
   "strip_prefix": "",
-  "url": "https://github.com/{OWNER}/{REPO}/releases/download/{TAG}/{REPO}-v{VERSION}.tar.gz"
+  "url": "https://github.com/{OWNER}/{REPO}/releases/download/{TAG}/{REPO}-{VERSION}.tar.gz"
 }

.gitattributes

@@ -1,20 +1,20 @@
 **/*Cargo.Bazel.lock linguist-generated
 **/cargo-bazel-lock.json linguist-generated
-bindgen/3rdparty/crates/** linguist-generated
 crate_universe/3rdparty/crates/** linguist-generated
 crate_universe/test_data/metadata/*/metadata.json linguist-generated
 examples/bzlmod/hello_world/third-party/crates/** linguist-generated
+examples/crate_universe_unnamed/vendor_remote_manifests/crates/** linguist-generated
+examples/crate_universe_unnamed/vendor_remote_pkgs/crates/** linguist-generated
 examples/crate_universe/vendor_external/crates/** linguist-generated
 examples/crate_universe/vendor_local_manifests/crates/** linguist-generated
 examples/crate_universe/vendor_local_pkgs/crates/** linguist-generated
 examples/crate_universe/vendor_remote_manifests/crates/** linguist-generated
 examples/crate_universe/vendor_remote_pkgs/crates/** linguist-generated
-examples/crate_universe_unnamed/vendor_remote_manifests/crates/** linguist-generated
-examples/crate_universe_unnamed/vendor_remote_pkgs/crates/** linguist-generated
 examples/sys/basic/3rdparty/crates/** linguist-generated
 examples/sys/complex/3rdparty/crates/** linguist-generated
-proto/prost/private/3rdparty/crates/** linguist-generated
-proto/protobuf/3rdparty/crates/** linguist-generated
+extensions/bindgen/3rdparty/crates/** linguist-generated
+extensions/prost/private/3rdparty/crates/** linguist-generated
+extensions/protobuf/3rdparty/crates/** linguist-generated
+extensions/wasm_bindgen/3rdparty/crates/** linguist-generated
 tools/rust_analyzer/3rdparty/crates/** linguist-generated
 util/import/3rdparty/crates/** linguist-generated
-wasm_bindgen/3rdparty/crates/** linguist-generated

.github/release_notes.template

@@ -1,5 +1,7 @@
 # {version}
 
+Additional documentation can be found at: https://bazelbuild.github.io/rules_rust/#setup
+
 ## Bzlmod
 
 ```python
@@ -13,8 +15,100 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
     name = "rules_rust",
     integrity = "sha256-{sha256_base64}",
-    urls = ["https://github.com/bazelbuild/rules_rust/releases/download/{version}/rules_rust-v{version}.tar.gz"],
+    urls = ["https://github.com/bazelbuild/rules_rust/releases/download/{version}/rules_rust-{version}.tar.gz"],
 )
 ```
 
-Additional documentation can be found at: https://bazelbuild.github.io/rules_rust/#setup
+## Extensions
+
+### Bindgen
+
+<details>
+
+#### Bzlmod
+
+```python
+bazel_dep(name = "rules_rust_bindgen", version = "{version}")
+```
+
+#### WORKSPACE
+
+```python
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+http_archive(
+    name = "rules_rust_bindgen",
+    integrity = "sha256-{ext_bindgen_sha256_base64}",
+    urls = ["https://github.com/bazelbuild/rules_rust/releases/download/{version}/rules_rust_bindgen-{version}.tar.gz"],
+)
+```
+
+</details>
+
+### Prost
+
+<details>
+
+#### Bzlmod
+
+```python
+bazel_dep(name = "rules_rust_prost", version = "{version}")
+```
+
+#### WORKSPACE
+
+```python
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+http_archive(
+    name = "rules_rust_prost",
+    integrity = "sha256-{ext_prost_sha256_base64}",
+    urls = ["https://github.com/bazelbuild/rules_rust/releases/download/{version}/rules_rust_prost-{version}.tar.gz"],
+)
+```
+
+</details>
+
+### Protobuf
+
+<details>
+
+#### Bzlmod
+
+```python
+bazel_dep(name = "rules_rust_protobuf", version = "{version}")
+```
+
+#### WORKSPACE
+
+```python
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+http_archive(
+    name = "rules_rust_protobuf",
+    integrity = "sha256-{ext_protobuf_sha256_base64}",
+    urls = ["https://github.com/bazelbuild/rules_rust/releases/download/{version}/rules_rust_protobuf-{version}.tar.gz"],
+)
+```
+
+</details>
+
+### Wasm-Bindgen
+
+<details>
+
+#### Bzlmod
+
+```python
+bazel_dep(name = "rules_rust_wasm_bindgen", version = "{version}")
+```
+
+#### WORKSPACE
+
+```python
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+http_archive(
+    name = "rules_rust",
+    integrity = "sha256-{ext_wasm_bindgen_sha256_base64}",
+    urls = ["https://github.com/bazelbuild/rules_rust/releases/download/{version}/rules_rust_wasm_bindgen-{version}.tar.gz"],
+)
+```
+
+</details>