Skip to content

Rollup of 8 pull requests #144238

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 52 commits into from
Jul 21, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
6e3b9dd
triagebot welcome message for new users
RalfJung Jul 16, 2025
4e8ce1e
Merge pull request #4471 from RalfJung/triagebot-welcome
oli-obk Jul 16, 2025
b390c41
triagebot: tweak welcome message
RalfJung Jul 16, 2025
6728da5
set S-waiting-on labels on new PRs
RalfJung Jul 16, 2025
5946616
Preparing for merge from rustc
Jul 17, 2025
52db0ce
Merge from rustc
Jul 17, 2025
0131e38
Merge pull request #4473 from rust-lang/rustup-2025-07-17
RalfJung Jul 17, 2025
387b603
allow using different cargo binary
nia-e Jul 16, 2025
1205c53
tweak PR process description
RalfJung Jul 17, 2025
05df8aa
Merge pull request #4470 from nia-e/custom-cargo-bin
RalfJung Jul 17, 2025
e30baec
Merge pull request #4472 from RalfJung/triagebot
oli-obk Jul 17, 2025
60f6ad8
Preparing for merge from rustc
Jul 18, 2025
3e3166f
Merge from rustc
Jul 18, 2025
8339590
Merge pull request #4474 from rust-lang/rustup-2025-07-18
RalfJung Jul 18, 2025
24ea3e2
make native-lib support compile-time-optional, and centralize cfg usage
RalfJung Jul 18, 2025
cc6bc7a
RA config: disable default features for faster build script build
RalfJung Jul 18, 2025
aef3d9e
Merge pull request #4475 from RalfJung/native-lib-optional
RalfJung Jul 18, 2025
a438401
move page protection logic inside native_lib
RalfJung Jul 18, 2025
3799cbd
Merge pull request #4476 from RalfJung/page-prot
RalfJung Jul 18, 2025
d1a146b
tests: Skip supported-crate-types test on musl hosts
Gelbpunkt Jul 18, 2025
2a03750
debug impls for drop elaborators
beepster4096 Jul 18, 2025
b8bcb4d
Preparing for merge from rustc
Jul 19, 2025
e11ea3d
Merge from rustc
Jul 19, 2025
eef454f
Merge pull request #4478 from rust-lang/rustup-2025-07-19
oli-obk Jul 19, 2025
4aa4376
add -Zmiri-no-extra-rounding-error to specifically disable just that …
RalfJung Jul 19, 2025
1f15460
Merge pull request #4480 from RalfJung/no-extra-rounding-error
oli-obk Jul 19, 2025
c1242b7
cargo update
RalfJung Jul 19, 2025
bb79e79
bump colored dep
RalfJung Jul 19, 2025
4bd8088
bump ipc-channel
RalfJung Jul 19, 2025
0b8f558
bump ui_test
RalfJung Jul 19, 2025
f32ec58
bump cargo-metadata
RalfJung Jul 19, 2025
6ce164d
ditch which dependency
RalfJung Jul 19, 2025
6a67a34
move and update test dependencies
RalfJung Jul 19, 2025
627c031
Merge pull request #4482 from RalfJung/deps
RalfJung Jul 19, 2025
8f77d54
add non-regression test for issue 144168
lqd Jul 19, 2025
329fda0
Preparing for merge from rustc
Jul 20, 2025
c317580
Merge from rustc
Jul 20, 2025
c9f9648
Merge pull request #4485 from rust-lang/rustup-2025-07-20
RalfJung Jul 20, 2025
e9fb744
Add test
Nadrieril Jul 20, 2025
3567ab1
Don't consider unstable fields always-inhabited
Nadrieril Jul 20, 2025
6fd83ea
opt-dist: change build_dir field to be an actual build dir
ognevny Jul 20, 2025
7bf2dd6
update lockfile
RalfJung Jul 20, 2025
d2be1c8
Option::as_slice: fix comment
RalfJung Jul 20, 2025
a546a7c
Fix run-make tests on musl hosts
Gelbpunkt Jul 21, 2025
9fdfaef
Rollup merge of #144144 - Gelbpunkt:musl-crate-types-test, r=compiler…
jhpratt Jul 21, 2025
a275a5f
Rollup merge of #144159 - ognevny:opt-dist-build-dir, r=Kobzol
jhpratt Jul 21, 2025
7d0c7b2
Rollup merge of #144162 - beepster4096:drop_elaborator_debug_impls, r…
jhpratt Jul 21, 2025
b81b2a7
Rollup merge of #144189 - lqd:test-144168, r=petrochenkov
jhpratt Jul 21, 2025
830b823
Rollup merge of #144216 - Nadrieril:revert-pin-hack, r=compiler-errors
jhpratt Jul 21, 2025
b9701de
Rollup merge of #144229 - RalfJung:miri-sync, r=RalfJung
jhpratt Jul 21, 2025
95d9c8d
Rollup merge of #144230 - RalfJung:option-as-slice-comment-fix, r=sco…
jhpratt Jul 21, 2025
f0da6e2
Rollup merge of #144235 - Gelbpunkt:run-make-musl, r=jieyouxu
jhpratt Jul 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
159 changes: 108 additions & 51 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ dependencies = [
name = "cargo-miri"
version = "0.1.0"
dependencies = [
"cargo_metadata 0.19.2",
"cargo_metadata 0.21.0",
"directories",
"rustc-build-sysroot",
"rustc_tools_util 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
Expand All @@ -402,14 +402,39 @@ dependencies = [
"serde",
]

[[package]]
name = "cargo-platform"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "84982c6c0ae343635a3a4ee6dedef965513735c8b183caa7289fa6e27399ebd4"
dependencies = [
"serde",
]

[[package]]
name = "cargo-util-schemas"
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7dc1a6f7b5651af85774ae5a34b4e8be397d9cf4bc063b7e6dbd99a841837830"
dependencies = [
"semver",
"serde",
"serde-untagged",
"serde-value",
"thiserror 2.0.12",
"toml 0.8.23",
"unicode-xid",
"url",
]

[[package]]
name = "cargo_metadata"
version = "0.18.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037"
dependencies = [
"camino",
"cargo-platform",
"cargo-platform 0.1.9",
"semver",
"serde",
"serde_json",
Expand All @@ -423,7 +448,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd5eb614ed4c27c5d706420e4320fbe3216ab31fa1c33cd8246ac36dae4479ba"
dependencies = [
"camino",
"cargo-platform",
"cargo-platform 0.1.9",
"semver",
"serde",
"serde_json",
"thiserror 2.0.12",
]

[[package]]
name = "cargo_metadata"
version = "0.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5cfca2aaa699835ba88faf58a06342a314a950d2b9686165e038286c30316868"
dependencies = [
"camino",
"cargo-platform 0.2.0",
"cargo-util-schemas",
"semver",
"serde",
"serde_json",
Expand Down Expand Up @@ -561,7 +601,7 @@ dependencies = [
"tempfile",
"termize",
"toml 0.7.8",
"ui_test 0.30.2",
"ui_test",
"walkdir",
]

Expand Down Expand Up @@ -703,6 +743,15 @@ dependencies = [
"windows-sys 0.59.0",
]

[[package]]
name = "colored"
version = "3.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fde0e0ec90c9dfb3b4b1a0891a7dcd0e2bffde2f7efed5fe7c9bb00e5bfb915e"
dependencies = [
"windows-sys 0.59.0",
]

[[package]]
name = "comma"
version = "1.0.0"
Expand All @@ -716,7 +765,7 @@ dependencies = [
"anstyle-svg",
"build_helper",
"camino",
"colored",
"colored 2.2.0",
"diff",
"getopts",
"glob",
Expand Down Expand Up @@ -1143,6 +1192,16 @@ version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"

[[package]]
name = "erased-serde"
version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e004d887f51fcb9fef17317a2f3525c887d8aa3f4f50fed920816a688284a5b7"
dependencies = [
"serde",
"typeid",
]

[[package]]
name = "errno"
version = "0.3.13"
Expand Down Expand Up @@ -1831,17 +1890,16 @@ dependencies = [

[[package]]
name = "ipc-channel"
version = "0.19.0"
version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6fb8251fb7bcd9ccd3725ed8deae9fe7db8e586495c9eb5b0c52e6233e5e75ea"
checksum = "5b1c98b70019c830a1fc39cecfe1f60ff99c4122f0a189697c810c90ec545c14"
dependencies = [
"bincode",
"crossbeam-channel",
"fnv",
"lazy_static",
"libc",
"mio",
"rand 0.8.5",
"rand 0.9.1",
"serde",
"tempfile",
"uuid",
Expand Down Expand Up @@ -2240,7 +2298,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c"
dependencies = [
"libc",
"log",
"wasi 0.11.1+wasi-snapshot-preview1",
"windows-sys 0.59.0",
]
Expand All @@ -2263,7 +2320,7 @@ dependencies = [
"capstone",
"chrono",
"chrono-tz",
"colored",
"colored 3.0.0",
"directories",
"getrandom 0.3.3",
"ipc-channel",
Expand All @@ -2280,7 +2337,7 @@ dependencies = [
"smallvec",
"tempfile",
"tikv-jemalloc-sys",
"ui_test 0.29.2",
"ui_test",
]

[[package]]
Expand Down Expand Up @@ -2560,6 +2617,15 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"

[[package]]
name = "ordered-float"
version = "2.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c"
dependencies = [
"num-traits",
]

[[package]]
name = "overload"
version = "0.1.1"
Expand Down Expand Up @@ -4845,6 +4911,27 @@ dependencies = [
"serde_derive",
]

[[package]]
name = "serde-untagged"
version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "299d9c19d7d466db4ab10addd5703e4c615dec2a5a16dbbafe191045e87ee66e"
dependencies = [
"erased-serde",
"serde",
"typeid",
]

[[package]]
name = "serde-value"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c"
dependencies = [
"ordered-float",
"serde",
]

[[package]]
name = "serde_derive"
version = "1.0.219"
Expand Down Expand Up @@ -4942,16 +5029,6 @@ dependencies = [
"windows-sys 0.52.0",
]

[[package]]
name = "spanned"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "86af297923fbcfd107c20a189a6e9c872160df71a7190ae4a7a6c5dce4b2feb6"
dependencies = [
"bstr",
"color-eyre",
]

[[package]]
name = "spanned"
version = "0.4.1"
Expand Down Expand Up @@ -5529,6 +5606,12 @@ dependencies = [
"rustc-hash 2.1.1",
]

[[package]]
name = "typeid"
version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c"

[[package]]
name = "typenum"
version = "1.18.0"
Expand All @@ -5550,32 +5633,6 @@ version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971"

[[package]]
name = "ui_test"
version = "0.29.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1211b1111c752c73b33073d2958072be08825fd97c9ab4d83444da361a06634b"
dependencies = [
"annotate-snippets 0.11.5",
"anyhow",
"bstr",
"cargo-platform",
"cargo_metadata 0.18.1",
"color-eyre",
"colored",
"comma",
"crossbeam-channel",
"indicatif",
"levenshtein",
"prettydiff",
"regex",
"rustc_version",
"rustfix",
"serde",
"serde_json",
"spanned 0.3.0",
]

[[package]]
name = "ui_test"
version = "0.30.2"
Expand All @@ -5585,10 +5642,10 @@ dependencies = [
"annotate-snippets 0.11.5",
"anyhow",
"bstr",
"cargo-platform",
"cargo-platform 0.1.9",
"cargo_metadata 0.18.1",
"color-eyre",
"colored",
"colored 2.2.0",
"comma",
"crossbeam-channel",
"indicatif",
Expand All @@ -5599,7 +5656,7 @@ dependencies = [
"rustfix",
"serde",
"serde_json",
"spanned 0.4.1",
"spanned",
]

[[package]]
Expand Down
16 changes: 0 additions & 16 deletions compiler/rustc_middle/src/ty/inhabitedness/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
//! This code should only compile in modules where the uninhabitedness of `Foo`
//! is visible.

use rustc_span::sym;
use rustc_type_ir::TyKind::*;
use tracing::instrument;

Expand Down Expand Up @@ -85,21 +84,6 @@ impl<'tcx> VariantDef {
InhabitedPredicate::all(
tcx,
self.fields.iter().map(|field| {
// Unstable fields are always considered to be inhabited. In the future,
// this could be extended to be conditional on the field being unstable
// only within the module that's querying the inhabitedness, like:
// `let pred = pred.or(InhabitedPredicate::IsUnstable(field.did));`
// but this is unnecessary for now, since it would only affect nightly-only
// code or code within the standard library itself.
// HACK: We filter out `rustc_private` fields since with the flag
// `-Zforce-unstable-if-unmarked` we consider all unmarked fields to be
// unstable when building the compiler.
if tcx
.lookup_stability(field.did)
.is_some_and(|stab| stab.is_unstable() && stab.feature != sym::rustc_private)
{
return InhabitedPredicate::True;
}
let pred = tcx.type_of(field.did).instantiate_identity().inhabited_predicate(tcx);
if adt.is_enum() {
return pred;
Expand Down
4 changes: 2 additions & 2 deletions compiler/rustc_mir_transform/src/elaborate_drops.rs
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,8 @@ struct ElaborateDropsCtxt<'a, 'tcx> {
}

impl fmt::Debug for ElaborateDropsCtxt<'_, '_> {
fn fmt(&self, _f: &mut fmt::Formatter<'_>) -> fmt::Result {
Ok(())
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
f.debug_struct("ElaborateDropsCtxt").finish_non_exhaustive()
}
}

Expand Down
4 changes: 2 additions & 2 deletions compiler/rustc_mir_transform/src/shim.rs
Original file line number Diff line number Diff line change
Expand Up @@ -434,8 +434,8 @@ pub(super) struct DropShimElaborator<'a, 'tcx> {
}

impl fmt::Debug for DropShimElaborator<'_, '_> {
fn fmt(&self, _f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
Ok(())
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
f.debug_struct("DropShimElaborator").finish_non_exhaustive()
}
}

Expand Down
7 changes: 2 additions & 5 deletions compiler/rustc_pattern_analysis/src/rustc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ use rustc_middle::ty::{
};
use rustc_middle::{bug, span_bug};
use rustc_session::lint;
use rustc_span::{DUMMY_SP, ErrorGuaranteed, Span, sym};
use rustc_span::{DUMMY_SP, ErrorGuaranteed, Span};

use crate::constructor::Constructor::*;
use crate::constructor::{
Expand Down Expand Up @@ -238,10 +238,7 @@ impl<'p, 'tcx: 'p> RustcPatCtxt<'p, 'tcx> {
let is_visible =
adt.is_enum() || field.vis.is_accessible_from(cx.module, cx.tcx);
let is_uninhabited = cx.is_uninhabited(*ty);
let is_unstable = cx.tcx.lookup_stability(field.did).is_some_and(|stab| {
stab.is_unstable() && stab.feature != sym::rustc_private
});
let skip = is_uninhabited && (!is_visible || is_unstable);
let skip = is_uninhabited && !is_visible;
(ty, PrivateUninhabitedField(skip))
});
cx.dropless_arena.alloc_from_iter(tys)
Expand Down
2 changes: 1 addition & 1 deletion library/core/src/option.rs
Original file line number Diff line number Diff line change
Expand Up @@ -842,7 +842,7 @@ impl<T> Option<T> {
// just needs to be aligned, which it is because `&self` is aligned and
// the offset used is a multiple of alignment.
//
// In the new version, the intrinsic always returns a pointer to an
// Here we assume that `offset_of!` always returns an offset to an
// in-bounds and correctly aligned position for a `T` (even if in the
// `None` case it's just padding).
unsafe {
Expand Down
Loading
Loading