Skip to content

Rustc pull update #2244

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 30 commits into from
Feb 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
60f1983
Auto merge of #133138 - azhogin:azhogin/target-modifiers, r=davidtwco…
bors Feb 3, 2025
9f683c9
tree-wide: parallel: Fully removed all `Lrc`, replaced with `Arc`
safinaskar Feb 3, 2025
98d3632
Auto merge of #136413 - EnzymeAD:fix-autodiff-comptime-regression, r=…
bors Feb 3, 2025
8e02255
Auto merge of #136352 - lqd:ensure-stacks, r=compiler-errors
bors Feb 3, 2025
33ff8e7
Auto merge of #136146 - RalfJung:x86-abi, r=workingjubilee
bors Feb 3, 2025
69732e6
Auto merge of #135265 - pascaldekloe:fmt-int-speed, r=tgross35,ChrisD…
bors Feb 4, 2025
f1ce440
Auto merge of #135760 - scottmcm:disjoint-bitor, r=WaffleLapkin
bors Feb 4, 2025
bfe56fd
Auto merge of #136115 - Mark-Simulacrum:shard-alloc-id, r=RalfJung
bors Feb 4, 2025
097fec4
Auto merge of #136094 - davidv1992:upgrade-elsa, r=oli-obk
bors Feb 5, 2025
0238431
Update rustc-dev-guide
Kobzol Feb 4, 2025
ad04957
Auto merge of #136302 - oli-obk:push-vvqmwzunxsrk, r=compiler-errors
bors Feb 5, 2025
d0973a7
Auto merge of #136253 - notriddle:notriddle/aot-minify, r=GuillaumeGomez
bors Feb 5, 2025
da0fc25
Auto merge of #136265 - notriddle:notriddle/clean-up, r=fmease
bors Feb 6, 2025
a91c1b4
Auto merge of #136409 - TDecking:mul_hi, r=Mark-Simulacrum
bors Feb 6, 2025
9afcbe4
Auto merge of #136471 - safinaskar:parallel, r=SparrowLii
bors Feb 6, 2025
cbeabc0
Rollup merge of #136311 - compiler-errors:vtable-fixes-2, r=lcnr
matthiaskrgr Feb 6, 2025
4db8b90
Rollup merge of #136315 - estebank:long-ty-binop, r=SparrowLii
matthiaskrgr Feb 6, 2025
1e5eeec
Rollup merge of #136435 - Zalathar:thir-pat-stuff, r=Nadrieril
matthiaskrgr Feb 6, 2025
840618a
Auto merge of #136585 - gvozdvmozgu:memchr-eat-until-lexer, r=lcnr
bors Feb 6, 2025
3a3c203
Auto merge of #136641 - matthiaskrgr:rollup-lajwje5, r=matthiaskrgr
bors Feb 6, 2025
5a519cc
Auto merge of #136588 - ChrisDenton:no-msys2, r=Kobzol
bors Feb 8, 2025
989ce77
Rollup merge of #134679 - ChrisDenton:rm-readonly, r=Mark-Simulacrum
Urgau Feb 8, 2025
43e4354
Rollup merge of #136213 - erickt:fs, r=Mark-Simulacrum
Urgau Feb 8, 2025
ce1d055
Rollup merge of #136530 - Kobzol:x-perf, r=onur-ozkan
Urgau Feb 8, 2025
2183564
Rollup merge of #136601 - compiler-errors:borrow-null-zst, r=saethlin
Urgau Feb 8, 2025
8187cb6
Rollup merge of #136659 - wesleywiser:dwarf_version_lto_merge_behavio…
Urgau Feb 8, 2025
ac9ff1b
Auto merge of #136754 - Urgau:rollup-qlkhjqr, r=Urgau
bors Feb 9, 2025
5e6bb7a
Auto merge of #136751 - bjorn3:update_rustfmt, r=Mark-Simulacrum
bors Feb 9, 2025
b72d906
Preparing for merge from rustc
invalid-email-address Feb 10, 2025
26a4c95
Merge from rustc
invalid-email-address Feb 10, 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
4 changes: 2 additions & 2 deletions examples/rustc-driver-example.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ extern crate rustc_span;

use std::io;
use std::path::Path;
use std::sync::Arc;

use rustc_ast_pretty::pprust::item_to_string;
use rustc_data_structures::sync::Lrc;
use rustc_driver::{Compilation, run_compiler};
use rustc_interface::interface::{Compiler, Config};
use rustc_middle::ty::TyCtxt;
Expand All @@ -43,7 +43,7 @@ fn main() {
}
}

fn read_binary_file(&self, _path: &Path) -> io::Result<Lrc<[u8]>> {
fn read_binary_file(&self, _path: &Path) -> io::Result<Arc<[u8]>> {
Err(io::Error::other("oops"))
}
}
Expand Down
4 changes: 2 additions & 2 deletions examples/rustc-driver-interacting-with-the-ast.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ extern crate rustc_span;

use std::io;
use std::path::Path;
use std::sync::Arc;

use rustc_ast_pretty::pprust::item_to_string;
use rustc_data_structures::sync::Lrc;
use rustc_driver::{Compilation, run_compiler};
use rustc_interface::interface::{Compiler, Config};
use rustc_middle::ty::TyCtxt;
Expand All @@ -43,7 +43,7 @@ fn main() {
}
}

fn read_binary_file(&self, _path: &Path) -> io::Result<Lrc<[u8]>> {
fn read_binary_file(&self, _path: &Path) -> io::Result<Arc<[u8]>> {
Err(io::Error::other("oops"))
}
}
Expand Down
2 changes: 1 addition & 1 deletion rust-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
613bdd49978298648ed05ace086bd1ecad54b44a
124cc92199ffa924f6b4c7cc819a85b65e0c3984
2 changes: 1 addition & 1 deletion src/diagnostics/lintstore.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ Lints are registered via the [`LintStore::register_lint`] function. This should
happen just once for any lint, or an ICE will occur.

Once the registration is complete, we "freeze" the lint store by placing it in
an `Lrc`.
an `Arc`.

Lint passes are registered separately into one of the categories
(pre-expansion, early, late, late module). Passes are registered as a closure
Expand Down
1 change: 0 additions & 1 deletion src/parallel-rustc.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ are implemented differently depending on whether `parallel-compiler` is true.

| data structure | parallel | non-parallel |
| -------------------------------- | --------------------------------------------------- | ------------ |
| Lrc | std::sync::Arc | std::rc::Rc |
| Weak | std::sync::Weak | std::rc::Weak |
| Atomic{Bool}/{Usize}/{U32}/{U64} | std::sync::atomic::Atomic{Bool}/{Usize}/{U32}/{U64} | (std::cell::Cell<bool/usize/u32/u64>) |
| OnceCell | std::sync::OnceLock | std::cell::OnceCell |
Expand Down
4 changes: 1 addition & 3 deletions src/profiling/with_rustc_perf.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@ However, using the suite manually can be a bit cumbersome. To make this easier f
the compiler build system (`bootstrap`) also provides built-in integration with the benchmarking suite,
which will download and build the suite for you, build a local compiler toolchain and let you profile it using a simplified command-line interface.

You can use the `./x perf -- <command> [options]` command to use this integration.

> Note that you need to specify arguments after `--` in the `x perf` command! You will not be able to pass arguments without the double dashes.
You can use the `./x perf <command> [options]` command to use this integration.

You can use normal bootstrap flags for this command, such as `--stage 1` or `--stage 2`, for example to modify the stage of the created sysroot. It might also be useful to configure `config.toml` to better support profiling, e.g. set `rust.debuginfo-level = 1` to add source line information to the built compiler.

Expand Down