Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Apply extra_rustc_flags list to all toolchains #2693

Merged
merged 2 commits into from
Jun 14, 2024

Conversation

nmattia
Copy link
Contributor

@nmattia nmattia commented Jun 13, 2024

Fixes #2692

This fixes rust_register_toolchains to correctly call rust_toolchain_repository with a list of extra_rustc_flags.

Previously, the extra_rustc_flags argument of
rust_register_toolchains was assumed (when set) to be a dict of toolchain triple to list. With this change, a list parameter is used for all toolchain triples.

@nmattia
Copy link
Contributor Author

nmattia commented Jun 13, 2024

I'm a starlark newbie, feedback welcome!

This fixes `rust_register_toolchains` to correctly call
`rust_toolchain_repository` with a list of `extra_rustc_flags`.

Previously, the `extra_rustc_flags` argument of
`rust_register_toolchains` was assumed (when set) to be a dict of
toolchain triple to list. With this change, a `list` parameter is used for all
toolchain triples.
Copy link
Collaborator

@UebelAndre UebelAndre left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

@UebelAndre UebelAndre added this pull request to the merge queue Jun 14, 2024
Merged via the queue into bazelbuild:main with commit 78c68d6 Jun 14, 2024
3 checks passed
@nmattia nmattia deleted the nm-extra-rustc-flags branch June 14, 2024 16:54
rrbutani referenced this pull request in bazel-contrib/toolchains_llvm Jul 9, 2024
[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [rules_rust](https://github.com/bazelbuild/rules_rust) |
http_archive | minor | `0.46.0` -> `0.47.1` |

---

### Release Notes

<details>
<summary>bazelbuild/rules_rust (rules_rust)</summary>

###
[`v0.47.1`](https://github.com/bazelbuild/rules_rust/releases/tag/0.47.1)

[Compare
Source](https://github.com/bazelbuild/rules_rust/compare/0.46.0...0.47.1)

### 0.47.1

#### Bzlmod

```python
bazel_dep(name = "rules_rust", version = "0.47.1")
```

#### WORKSPACE

```python
load("@&#8203;bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
http_archive(
    name = "rules_rust",
    integrity = "sha256-35cwdTOaqqu4y+aXgIUU2C2PAKMz4+uyJ7/UMIGCmFs=",
    urls = ["https://github.com/bazelbuild/rules_rust/releases/download/0.47.1/rules_rust-v0.47.1.tar.gz"],
)
```

Additional documentation can be found at:
https://bazelbuild.github.io/rules_rust/#setup

#### What's Changed

- Remote vendor doesn't require srcs present by
[@&#8203;illicitonion](https://github.com/illicitonion) in
[https://github.com/bazelbuild/rules_rust/pull/2688](https://github.com/bazelbuild/rules_rust/pull/2688)
- Add flag to refer to a `sh_toolchain` for process wrapper bootstrap
shebangs by [@&#8203;UebelAndre](https://github.com/UebelAndre) in
[https://github.com/bazelbuild/rules_rust/pull/2694](https://github.com/bazelbuild/rules_rust/pull/2694)
- Added Rust 1.79.0 by
[@&#8203;UebelAndre](https://github.com/UebelAndre) in
[https://github.com/bazelbuild/rules_rust/pull/2695](https://github.com/bazelbuild/rules_rust/pull/2695)
- `crate_universe`: Make module extension restarts less expensive. by
[@&#8203;criemen](https://github.com/criemen) in
[https://github.com/bazelbuild/rules_rust/pull/2691](https://github.com/bazelbuild/rules_rust/pull/2691)
- Add example of using JNI to call into Rust by
[@&#8203;illicitonion](https://github.com/illicitonion) in
[https://github.com/bazelbuild/rules_rust/pull/2690](https://github.com/bazelbuild/rules_rust/pull/2690)
- Apply extra_rustc_flags list to all toolchains by
[@&#8203;nmattia](https://github.com/nmattia) in
[https://github.com/bazelbuild/rules_rust/pull/2693](https://github.com/bazelbuild/rules_rust/pull/2693)
- rust-analyzer: Factor aliases into the project by
[@&#8203;illicitonion](https://github.com/illicitonion) in
[https://github.com/bazelbuild/rules_rust/pull/2709](https://github.com/bazelbuild/rules_rust/pull/2709)
- crate_universe docs: Split bzlmod from workspace by
[@&#8203;illicitonion](https://github.com/illicitonion) in
[https://github.com/bazelbuild/rules_rust/pull/2700](https://github.com/bazelbuild/rules_rust/pull/2700)
- Updated external dependencies docs by
[@&#8203;UebelAndre](https://github.com/UebelAndre) in
[https://github.com/bazelbuild/rules_rust/pull/2711](https://github.com/bazelbuild/rules_rust/pull/2711)
- Update wasm-bindgen to 0.2.92 by
[@&#8203;alexkirsz](https://github.com/alexkirsz) in
[https://github.com/bazelbuild/rules_rust/pull/2714](https://github.com/bazelbuild/rules_rust/pull/2714)
- upstream wrappers for cargo, rustc, cargo-clippy by
[@&#8203;kolloch](https://github.com/kolloch) in
[https://github.com/bazelbuild/rules_rust/pull/2703](https://github.com/bazelbuild/rules_rust/pull/2703)
- Clean up downloads that go through the API instead of the CDN by
[@&#8203;ograff](https://github.com/ograff) in
[https://github.com/bazelbuild/rules_rust/pull/2718](https://github.com/bazelbuild/rules_rust/pull/2718)
- Updated rust-analyzer to use repo vs generated files as crate roots by
[@&#8203;UebelAndre](https://github.com/UebelAndre) in
[https://github.com/bazelbuild/rules_rust/pull/2717](https://github.com/bazelbuild/rules_rust/pull/2717)
- crate-universe allows workspaces with MODULE.bazel only by
[@&#8203;matt-duch](https://github.com/matt-duch) in
[https://github.com/bazelbuild/rules_rust/pull/2720](https://github.com/bazelbuild/rules_rust/pull/2720)
- Release 0.47.0 by
[@&#8203;UebelAndre](https://github.com/UebelAndre) in
[https://github.com/bazelbuild/rules_rust/pull/2725](https://github.com/bazelbuild/rules_rust/pull/2725)
- Update bindgen.bzl to use toolchain system include directories as well
by [@&#8203;hlopko](https://github.com/hlopko) in
[https://github.com/bazelbuild/rules_rust/pull/2727](https://github.com/bazelbuild/rules_rust/pull/2727)
- Use newer macos runners by
[@&#8203;ograff](https://github.com/ograff) in
[https://github.com/bazelbuild/rules_rust/pull/2732](https://github.com/bazelbuild/rules_rust/pull/2732)

#### New Contributors

- [@&#8203;nmattia](https://github.com/nmattia) made their first
contribution in
[https://github.com/bazelbuild/rules_rust/pull/2693](https://github.com/bazelbuild/rules_rust/pull/2693)
- [@&#8203;kolloch](https://github.com/kolloch) made their first
contribution in
[https://github.com/bazelbuild/rules_rust/pull/2703](https://github.com/bazelbuild/rules_rust/pull/2703)
- [@&#8203;matt-duch](https://github.com/matt-duch) made their first
contribution in
[https://github.com/bazelbuild/rules_rust/pull/2720](https://github.com/bazelbuild/rules_rust/pull/2720)

**Full Changelog**:
bazelbuild/rules_rust@0.46.0...0.47.1

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/bazel-contrib/toolchains_llvm).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy40MjUuMSIsInVwZGF0ZWRJblZlciI6IjM3LjQyNS4xIiwidGFyZ2V0QnJhbmNoIjoibWFzdGVyIiwibGFiZWxzIjpbXX0=-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] cannot specify list extra_rustc_flags in rust_register_toolchains
2 participants