Skip to content

Rustc pull update #2349

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

Merged
merged 19 commits into from
Apr 21, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
b4426b7
document config extensions
onur-ozkan Mar 25, 2025
3ed7cc8
document `include` in `bootstrap.example.toml`
onur-ozkan Apr 1, 2025
6cbd6c0
Rollup merge of #138934 - onur-ozkan:extended-config-profiles, r=Kobzol
ChrisDenton Apr 19, 2025
2e5890f
Rollup merge of #139091 - mejrs:format, r=compiler-errors
ChrisDenton Apr 19, 2025
82c3452
Rollup merge of #139753 - folkertdev:naked-function-unsafe-attribute,…
ChrisDenton Apr 19, 2025
8895584
Rollup merge of #139762 - compiler-errors:non-env, r=lcnr
ChrisDenton Apr 19, 2025
fcd257b
Rollup merge of #139834 - ChrisDenton:spf, r=WaffleLapkin
ChrisDenton Apr 19, 2025
6af8f5f
Rollup merge of #139868 - thaliaarchi:move-env-consts-pal, r=joboet
ChrisDenton Apr 19, 2025
e68632c
Rollup merge of #139978 - Kobzol:ci-test-summary, r=jieyouxu
ChrisDenton Apr 19, 2025
03103fe
Rollup merge of #139995 - spencer3035:clean-ui-tests-4-of-n, r=jieyouxu
ChrisDenton Apr 19, 2025
02f25b8
Auto merge of #140043 - ChrisDenton:rollup-vwf0s9j, r=ChrisDenton
bors Apr 20, 2025
4d5c78d
Rollup merge of #137953 - RalfJung:simd-intrinsic-masks, r=WaffleLapkin
ChrisDenton Apr 20, 2025
869d74f
Rollup merge of #139990 - jswrenn:no-nfas, r=tmiasko
ChrisDenton Apr 20, 2025
c1b574e
Rollup merge of #140044 - tshepang:rdg-push, r=jieyouxu
ChrisDenton Apr 20, 2025
cab1085
Rollup merge of #140051 - ehuss:exploit-footnotes, r=jieyouxu
ChrisDenton Apr 20, 2025
a444406
Rollup merge of #140054 - c-git:patch-1, r=joboet
ChrisDenton Apr 20, 2025
e41bf33
Auto merge of #140079 - ChrisDenton:rollup-2h5cg94, r=ChrisDenton
bors Apr 20, 2025
d5cf5a3
Preparing for merge from rustc
invalid-email-address Apr 21, 2025
4c66352
Merge from rustc
invalid-email-address Apr 21, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rust-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
a7c39b68616668a45f0afd62849a1da7c8ad2516
b8005bff3248cfc6e327faf4fa631ac49bb49ba9
37 changes: 37 additions & 0 deletions src/building/suggested.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,43 @@ your `.git/hooks` folder as `pre-push` (without the `.sh` extension!).

You can also install the hook as a step of running `./x setup`!

## Config extensions

When working on different tasks, you might need to switch between different bootstrap configurations.
Sometimes you may want to keep an old configuration for future use. But saving raw config values in
random files and manually copying and pasting them can quickly become messy, especially if you have a
long history of different configurations.

To simplify managing multiple configurations, you can create config extensions.

For example, you can create a simple config file named `cross.toml`:

```toml
[build]
build = "x86_64-unknown-linux-gnu"
host = ["i686-unknown-linux-gnu"]
target = ["i686-unknown-linux-gnu"]


[llvm]
download-ci-llvm = false

[target.x86_64-unknown-linux-gnu]
llvm-config = "/path/to/llvm-19/bin/llvm-config"
```

Then, include this in your `bootstrap.toml`:

```toml
include = ["cross.toml"]
```

You can also include extensions within extensions recursively.

**Note:** In the `include` field, the overriding logic follows a right-to-left order. For example,
in `include = ["a.toml", "b.toml"]`, extension `b.toml` overrides `a.toml`. Also, parent extensions
always overrides the inner ones.

## Configuring `rust-analyzer` for `rustc`

### Project-local rust-analyzer setup
Expand Down