Skip to content

Automated pull from upstream HEAD#2447

Open
ferrocene-automations[bot] wants to merge 312 commits into
mainfrom
automation/pull-upstream-HEAD/85wpxgug
Open

Automated pull from upstream HEAD#2447
ferrocene-automations[bot] wants to merge 312 commits into
mainfrom
automation/pull-upstream-HEAD/85wpxgug

Conversation

@ferrocene-automations

@ferrocene-automations ferrocene-automations Bot commented Jul 6, 2026

Copy link
Copy Markdown

⚠️ The automation reported these warnings: ⚠️

  • There are merge conflicts in this PR. Merge conflict markers have been committed.
  • Couldn't regenerate the x.py completions. Please run ./x run generate-completions after fixing the merge conflicts.
  • Couldn't regenerate the x.py help file. Please run ./x run generate-help after fixing the merge conflicts.
  • Couldn't regenerate the symbol report. Please run './x test ferrocene/doc/symbol-report.csv --bless' after fixing the conflicts.

This PR pulls the following changes from the upstream repository:

bors and others added 30 commits June 29, 2026 06:27
@bors
Auto merge of #158477 - theemathas:del-dyn-compat-check, r=oli-obk
63f05e3 
Remove redundant dyn-compatibility check.

This check is already handled in [`rustc_trait_selection::traits::fulfill::FulfillProcessor::process_obligation`](https://github.com/rust-lang/rust/blob/16761606d606b6ec4d0c88fc9251670742ad9fd2/compiler/rustc_trait_selection/src/traits/fulfill.rs#L524).

r? types
@jyn514
tidy: make it more clear that it has to be run under bootstrap, not a…
9b443be 
…s a standalone command

- error if RUSTC isn't set, which means it'll fall back to the
  user-installed default (wrong)
- be more specific in `--bless` suggestions that they should use `x test
  tidy`, not tidy directly.
@jyn514
enable TIDY_PRINT_DIFF by default
264bf6d 
for non-interactive cases, such as CI, this makes it easier to tell what
went wrong without having to interactively debug the problem.
@heinwol
Actual fix inside fn normalize_output
800fdb7
@heinwol
additional: remove unnecessary //@ normalize-stderr
15ceff0 
in `tests/ui/consts/const-eval/raw-bytes.rs` as we now handle this in
our modified regex in `runtest`
@heinwol
Remove ignore directives
5b76fe0 
Specifically, all `//@ ignore-parallel-frontend different alloc ids`
@heinwol
bless stderr
d06599e
@heinwol
Rename several //~ ERROR <...> ALLOC0 directives
9803c28 
across other tests because they fail with our
normalization strategy: `ALLOC0` -> `ALLOC$ID`
@bors
Auto merge of #146275 - niacdoial:improperctypes-refactor3, r=jdonsze…
7dc2c16 
…lmann

lint ImproperCTypes: refactor linting architecture (part 3)



This is the third PR in an effort to split rust-lang/rust#134697 (refactor plus overhaul of the ImproperCTypes family of lints) into individually-mergeable parts.

Contains:
- the changes of the first two PRs
- other user-invisible changes,
- the prevention of stack overflows while checking irregular recursive types.

Fixes: rust-lang/rust#130310
Superset of: rust-lang/rust#146271 and its superset rust-lang/rust#146273
@Kobzol
Fix flag_if_supported in cc-rs by configuring an out_dir
1a7439c
@Kobzol
Slightly refactor cc code
f832372
@Kobzol
Add missing zlib library to x86_64-gnu-distcheck
ae0fb27
@Kobzol
Add compress-debuginfo option to bootstrap and fix debuginfo compre…
65f0657 
…ssion with LLD.
@Kobzol
Enable debuginfo compression by default in dist builds
10c2c9d
@fmease
Use doctest attribute ignore-wasm instead of manual cfg_attr
cca8cd1
@bjorn3
Remove debuginfo_finalize from DebugInfoCodegenMethods
67c85cc 
It isn't called from cg_ssa.
@bjorn3
Move a bunch of debuginfo functions from codegen to builder methods
3247057 
These functions are scoped to a single codegened function
@bjorn3
Move a couple more debuginfo functions from codegen to builder methods
aa81c21 
These functions are scoped to a single codegened function
@bjorn3
Pass &mut self to all debuginfo builder methods
0943c50
@bjorn3
Avoid storing module in CodegenUnitDebugContext
7d346e2
@Kobzol
Record step creation locations in bootstrap tracing DOT graph
96f3774
@Kobzol
Add a few #[track_caller] annotations to make tracing locations mor…
e6dc840 
…e accurate
@Kobzol
Better record locations of executed steps
ee4ea97 
Before it would just show the `ensure` function
@chenyukang
Avoid building rustdoc for tests without doctests
69f0187
@pmur
Allow section override when using patchable-function-entries
c340e8a 
Sometimes it is necessary to group patchable function entrypoint
records in distinct linker sections. This is the case for some bpf
functions within the linux kernel which shouldn't be visible to
ftrace.

Extend `-Zpatchable-function-entry` to accept an argument of the form
`prefix_nops,total_nops,record_section`, which places all entry
record into a user specified section.

Likewise, extend the `patchable_function_entry` attribute to accept an
optional `section="name"` option to place a function into a specific
section.

This is made possible by llvm attribute `patchable-function-entry-section`
added in llvm 21.
@aerooneqq
Inline information of whether this segment is delegation's child segm…
91a762b 
…ent into `PathSegment`
@lqd
fix typo in -Z min-recursion-limit unstable doc
cd55f64
@LorrensP-2158466
Use an explicit set to detect resolution cycles instead of `try_borro…
3056b8e 
…w_mut` on `RefCell<NameResolution>`.

Use a TLS for this set ahead of parallel import resolution.
@lapla-cogito
Show use-site paths for unevaluated const array lengths
1f4b09e
@liza371
llvm-wrapper: use accessors for private fields in LLVM 23+
a60be48 
In LLVM, FeatureKV/SubtargetKV pointers are now private:
llvm/llvm-project#206237
This change fixes compiler errors when building rustc with ToT LLVM
by using the key() and desc() accessors.
jyn514
jyn514 approved these changes Jul 6, 2026
View reviewed changes

@jyn514 jyn514 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

r=me with or without the nit fixed

Comment thread library/coretests/tests/ferrocene/atomic.rs
Comment thread library/std/src/os/unix/net/addr.rs
// don't add it here to match what a C program passes to bind(2) and
// similar functions
if cfg!(not(any(target_env = "nto80", target_env = "nto71"))) {
if cfg!(not(any(target_os = "qnx", target_env = "nto71"))) {

@jyn514 jyn514 Jul 6, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

noting that this is #2439, pulled in through upstream. we'll need to backport the upstream PR, which is rust-lang/rust#158449.

@jyn514 jyn514 Jul 7, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

wait, hold on, this is in your commit. shouldn't this fix go upstream? it's ok to land it now, but please put these fixes (and the test fixes below) in their own commit so it's easy to upstream them.

@jonathanpallant jonathanpallant Jul 9, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

It did, but I did "rename the target" as a separate PR from "fix libstd so it actually builds on the target" because testing that second part also involved fixes to libc and cc-rs.

@jonathanpallant jonathanpallant Jul 9, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

You'll want:

Comment thread tests/ui/ferrocene/compiler-arguments/print/print_ok-option_print_different-option.stdout
aarch64-unknown-linux-gnu_ilp32
aarch64-unknown-linux-musl
aarch64-unknown-linux-ohos
aarch64-unknown-linux-pauthtest

@jyn514 jyn514 Jul 6, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

it would be nice if this test didn't require --blessing each time a target gets added. i'll open an issue.

@jyn514 jyn514 added backport:manual PR requiring manual intervention to backport backport:1.97 and removed backport:never PR that should never be backported labels Jul 6, 2026
@tshepang tshepang force-pushed the automation/pull-upstream-HEAD/85wpxgug branch from 6ae7a4b to ad9ac6e Compare July 6, 2026 15:49
@jyn514

This comment was marked as outdated.

Sign in to view
bors-ferrocene Bot added a commit that referenced this pull request Jul 7, 2026
@bors-ferrocene @AsakuraMizu
@bors @jyn514 @heinwol @Kobzol @fmease @bjorn3 @chenyukang @pmur @aerooneqq @lqd @LorrensP-2158466 @lapla-cogito
Merge #2447
25c9746 
2447: Automated pull from upstream `HEAD` r=jyn514 a=ferrocene-automations[bot]

:warning: **The automation reported these warnings:** :warning:

* There are merge conflicts in this PR. Merge conflict markers have been committed.
* Couldn't regenerate the `x.py` completions. Please run `./x run generate-completions` after fixing the merge conflicts.
* Couldn't regenerate the `x.py` help file. Please run `./x run generate-help` after fixing the merge conflicts.
* Couldn't regenerate the symbol report. Please run './x test ferrocene/doc/symbol-report.csv --bless' after fixing the conflicts.

This PR pulls the following changes from the upstream repository:

* `158811`: [Rollup of 19 pull requests](https://www.github.com/rust-lang/rust/issues/158811)
  * `158706`: [Tweaks to MIR building scope API](https://www.github.com/rust-lang/rust/issues/158706)
  * `158698`: [Update TypeVisitable implementation](https://www.github.com/rust-lang/rust/issues/158698)
  * `158689`: [resolver: don't use `Finalize` when resolving visibilities during AST expansion](https://www.github.com/rust-lang/rust/issues/158689)
  * `158659`: [refactor the normalization in `coerce_shared_info`](https://www.github.com/rust-lang/rust/issues/158659)
  * `158539`: [Move `SizeHint` and `IoHandle` to `core::io`](https://www.github.com/rust-lang/rust/issues/158539)
  * `158751`: [rustdoc: Fix crash when trying to inline foreign item which cannot have attributes](https://www.github.com/rust-lang/rust/issues/158751)
  * `158711`: [library: Comment on libtest's dicey internal soundness](https://www.github.com/rust-lang/rust/issues/158711)
  * `158704`: [Optimize `ArrayChunks::try_rfold` with `DoubleEndedIterator::next_chunk_back`](https://www.github.com/rust-lang/rust/issues/158704)
  * `158624`: [borrowck: Introduce BlameConstraint::to_obligation_cause_from_path()](https://www.github.com/rust-lang/rust/issues/158624)
  * `158552`: [make some tidy errors around python easier to understand](https://www.github.com/rust-lang/rust/issues/158552)
  * `158434`: [delegation: refactor AST -> HIR lowering](https://www.github.com/rust-lang/rust/issues/158434)
  * `157857`: [Stabilize `#[my_macro] mod foo;` (part of `proc_macro_hygiene`)](https://www.github.com/rust-lang/rust/issues/157857)
  * `157835`: [expand free alias types in the auto-trait orphan check](https://www.github.com/rust-lang/rust/issues/157835)
  * `157151`: [JSON target specs: remove 'x86-softfloat' compatibility alias](https://www.github.com/rust-lang/rust/issues/157151)
  * `156777`: [Add -Zautodiff_post_passes flag to limit which llvm passes to run after enzyme to make autodiff tests more robust](https://www.github.com/rust-lang/rust/issues/156777)
  * `155989`: [Update `transmute_copy` to ub_checks and `?Sized`](https://www.github.com/rust-lang/rust/issues/155989)
  * `155932`: [MIR Call terminator: evaluate destination place before arguments](https://www.github.com/rust-lang/rust/issues/155932)
  * `134021`: [Implement `IntoIterator` for `[&[mut]] Box<[T; N], A>`](https://www.github.com/rust-lang/rust/issues/134021)
  * `158692`: [Add release notes for 1.96.1](https://www.github.com/rust-lang/rust/issues/158692)
* `158740`: [Bump version to 1.99.0](https://www.github.com/rust-lang/rust/issues/158740)
* `158169`: [Fix debuginfo compression in bootstrap](https://www.github.com/rust-lang/rust/issues/158169)
* `158795`: [Rollup of 21 pull requests](https://www.github.com/rust-lang/rust/issues/158795)
  * `158688`: [Cleanup attribute docs and add links to other mentioned attributes](https://www.github.com/rust-lang/rust/issues/158688)
  * `158687`: [Streamline `MacEager`](https://www.github.com/rust-lang/rust/issues/158687)
  * `158684`: [Add missing generic test coverage for ```#[splat]```](https://www.github.com/rust-lang/rust/issues/158684)
  * `158682`: [Avoid delayed bug for disabled on_type_error arguments](https://www.github.com/rust-lang/rust/issues/158682)
  * `158681`: [Remove unnecessary `Hash` derives from MIR types](https://www.github.com/rust-lang/rust/issues/158681)
  * `158680`: [Avoid ICE for `NonZero<char>` in improper_ctypes](https://www.github.com/rust-lang/rust/issues/158680)
  * `158677`: [Add extra splat tests](https://www.github.com/rust-lang/rust/issues/158677)
  * `158674`: [library: Polish transmute's `split_at_stdlib` example](https://www.github.com/rust-lang/rust/issues/158674)
  * `158669`: [Remove `src/tools/test-float-parse/Cargo.lock`](https://www.github.com/rust-lang/rust/issues/158669)
  * `158651`: [ptr doc: reduce use of unsafe block to where needed](https://www.github.com/rust-lang/rust/issues/158651)
  * `158637`: [hir_ty_lowering: avoid self type lookup for inherent aliases](https://www.github.com/rust-lang/rust/issues/158637)
  * `158585`: [Improve diagnostic for too many super keywords](https://www.github.com/rust-lang/rust/issues/158585)
  * `158549`: [process::exec: using appropriate exit code on vxworks.](https://www.github.com/rust-lang/rust/issues/158549)
  * `158473`: [Add `riscv32imfc-unknown-none-elf` bare-metal target](https://www.github.com/rust-lang/rust/issues/158473)
  * `158021`: [Remove old MinGW workaround](https://www.github.com/rust-lang/rust/issues/158021)
  * `158665`: [Revert "Remove redundant dyn-compatibility check."](https://www.github.com/rust-lang/rust/issues/158665)
  * `158658`: [Update LLVM submodule](https://www.github.com/rust-lang/rust/issues/158658)
  * `158627`: [Simplify option-iterator flattening in the compiler](https://www.github.com/rust-lang/rust/issues/158627)
  * `158606`: [use ProjectionPredicate instead of AliasRelate](https://www.github.com/rust-lang/rust/issues/158606)
  * `158494`: [Improve E0277 diagnostics for conditionally implemented traits](https://www.github.com/rust-lang/rust/issues/158494)
  * `158100`: [Emit retags in codegen to support BorrowSanitizer (part 4)](https://www.github.com/rust-lang/rust/issues/158100)
* `158691`: [Update cargo submodule](https://www.github.com/rust-lang/rust/issues/158691)
* `158774`: [Mirror kernel archives in `ci-mirrors` to not depend on currently unavailable kernel mirror sources](https://www.github.com/rust-lang/rust/issues/158774)
* `158525`: [Reorganize `tests/ui/issues` [17/N]](https://www.github.com/rust-lang/rust/issues/158525)
* `158676`: [Rollup of 8 pull requests](https://www.github.com/rust-lang/rust/issues/158676)
  * `158667`: [rustc_sanitizers: use twox-hash without default features](https://www.github.com/rust-lang/rust/issues/158667)
  * `158364`: [rustc_target/asm: add LoongArch LSX/LASX inline asm register support](https://www.github.com/rust-lang/rust/issues/158364)
  * `158334`: [rustdoc: Show use-site paths for unevaluated const array lengths](https://www.github.com/rust-lang/rust/issues/158334)
  * `158574`: [Clarify ExitStatusExt documentation](https://www.github.com/rust-lang/rust/issues/158574)
  * `158531`: [Change `adjust_ident_and_get_scope` arg to `LocalDefId`](https://www.github.com/rust-lang/rust/issues/158531)
  * `158427`: [Implement `ptr::{read,write}_unaligned` via `repr(packed)`](https://www.github.com/rust-lang/rust/issues/158427)
  * `158180`: [std: use `OnceLock` for SGX environment variable storage](https://www.github.com/rust-lang/rust/issues/158180)
  * `156737`: [Implement `DoubleEndedIterator::next_chunk_back`](https://www.github.com/rust-lang/rust/issues/156737)
* `158663`: [Rollup of 8 pull requests](https://www.github.com/rust-lang/rust/issues/158663)
  * `158647`: [Document `strip_circumfix` behavior on overlapping prefix and suffix.](https://www.github.com/rust-lang/rust/issues/158647)
  * `158634`: [Add missing `needs_drop` check to `DroplessArena`.](https://www.github.com/rust-lang/rust/issues/158634)
  * `158633`: [Remove unnecessary `Clone` derives on resolver types](https://www.github.com/rust-lang/rust/issues/158633)
  * `158620`: [Remove skip_norm_w/i/p().def_id with a helper](https://www.github.com/rust-lang/rust/issues/158620)
  * `158613`: [Fix getrandom fallback test on platforms with `panic=abort`](https://www.github.com/rust-lang/rust/issues/158613)
  * `158397`: [delegation: support simplest output `Self` mapping](https://www.github.com/rust-lang/rust/issues/158397)
  * `156716`: [tests: fix: parallel frontend test failures: different alloc ids](https://www.github.com/rust-lang/rust/issues/156716)
  * `158294`: [Use .drectve for MSVC DLL exports](https://www.github.com/rust-lang/rust/issues/158294)
* `158604`: [resolve: no allocation in `resolve_ident_in(_local)_module_*`](https://www.github.com/rust-lang/rust/issues/158604)
* `158639`: [Rollup of 6 pull requests](https://www.github.com/rust-lang/rust/issues/158639)
  * `158636`: [linkchecker: upgrade to `html5ever v0.39`](https://www.github.com/rust-lang/rust/issues/158636)
  * `158542`: [Rename `align` to `default_align` on `Scalar` and `Primitive`](https://www.github.com/rust-lang/rust/issues/158542)
  * `158516`: [ Deduplicate codegen backends in bootstrap config](https://www.github.com/rust-lang/rust/issues/158516)
  * `158483`: [signed strict division: just use normal division](https://www.github.com/rust-lang/rust/issues/158483)
  * `158449`: [QNX target renaming](https://www.github.com/rust-lang/rust/issues/158449)
  * `157718`: [Do not increase depth when evaluating nested goals of `NormalizesTo`](https://www.github.com/rust-lang/rust/issues/157718)
* `158629`: [Rollup of 7 pull requests](https://www.github.com/rust-lang/rust/issues/158629)
  * `158616`: [Remove dependency from `rustc_metadata` on `rustc_incremental`](https://www.github.com/rust-lang/rust/issues/158616)
  * `158614`: [Fix error message when rejecting implicit stage != 2 in CI](https://www.github.com/rust-lang/rust/issues/158614)
  * `158573`: [stabilize `feature(atomic_from_mut)`](https://www.github.com/rust-lang/rust/issues/158573)
  * `158569`: [[rustdoc] Fix handling of inlining of `no_inline` of foreign items](https://www.github.com/rust-lang/rust/issues/158569)
  * `157650`: [rustc_target: Add OpenEmbedded/Yocto Linux base targets](https://www.github.com/rust-lang/rust/issues/157650)
  * `157347`: [Implement `Box::as_non_null()`.](https://www.github.com/rust-lang/rust/issues/157347)
  * `156379`: [lint on `core::ffi::c_void` as a return type](https://www.github.com/rust-lang/rust/issues/156379)
* `158610`: [Rollup of 5 pull requests](https://www.github.com/rust-lang/rust/issues/158610)
  * `158592`: [tests: only run `lexical-scope-in-match.rs` for LLDB >= 21](https://www.github.com/rust-lang/rust/issues/158592)
  * `158571`: [Update books](https://www.github.com/rust-lang/rust/issues/158571)
  * `158563`: [Test(lib/net): Fix `hostname_smoketest` for Win7](https://www.github.com/rust-lang/rust/issues/158563)
  * `158560`: [Move per-function debuginfo methods from codegen to builder methods](https://www.github.com/rust-lang/rust/issues/158560)
  * `158600`: [Fix `rustc --unpretty=expanded` emit of `[const] [unsafe] impl Trait for`](https://www.github.com/rust-lang/rust/issues/158600)
* `158595`: [Rollup of 7 pull requests](https://www.github.com/rust-lang/rust/issues/158595)
  * `158591`: [Fix spacing issue for unused parentheses lint](https://www.github.com/rust-lang/rust/issues/158591)
  * `158327`: [Move attribute and keyword docs from `std` to `core`](https://www.github.com/rust-lang/rust/issues/158327)
  * `157445`: [Allow section override when using patchable-function-entries](https://www.github.com/rust-lang/rust/issues/157445)
  * `158562`: [Improve tracing of steps in bootstrap](https://www.github.com/rust-lang/rust/issues/158562)
  * `158561`: [Avoid building rustdoc for tests without doctests](https://www.github.com/rust-lang/rust/issues/158561)
  * `158256`: [Avoid parser panics bubbling out to proc macros](https://www.github.com/rust-lang/rust/issues/158256)
  * `158073`: [bootstrap: fix panic when repo path contains spaces by switching to CARGO_ENCODED_RUSTFLAGS](https://www.github.com/rust-lang/rust/issues/158073)
* `158593`: [Rollup of 11 pull requests](https://www.github.com/rust-lang/rust/issues/158593)
  * `158582`: [Comment on needed RAM in huge-stacks.rs](https://www.github.com/rust-lang/rust/issues/158582)
  * `158568`: [llvm-wrapper: use accessors for private fields in LLVM 23+](https://www.github.com/rust-lang/rust/issues/158568)
  * `158564`: [fix `-Z min-recursion-limit` unstable chapter name](https://www.github.com/rust-lang/rust/issues/158564)
  * `158543`: [Note usage of documentation hard links in `core::io`](https://www.github.com/rust-lang/rust/issues/158543)
  * `158468`: [Include default-stability info in rustdoc JSON.](https://www.github.com/rust-lang/rust/issues/158468)
  * `158081`: [trait-system: Recover deferred closure calls after errors](https://www.github.com/rust-lang/rust/issues/158081)
  * `158556`: [delegation: store child segment flag in `PathSegment`](https://www.github.com/rust-lang/rust/issues/158556)
  * `158375`: [Support `DefKind::InlineConst` in `ConstKind::Unevaluated`](https://www.github.com/rust-lang/rust/issues/158375)
  * `156295`: [Pass the whole `GenericArgs` to `Interner::for_each_relevant_impl()`](https://www.github.com/rust-lang/rust/issues/156295)
  * `156230`: [tests: check wasm compiler_builtins object architecture](https://www.github.com/rust-lang/rust/issues/156230)
  * `155722`: [Introduce aarch64-unknown-linux-pauthtest target](https://www.github.com/rust-lang/rust/issues/155722)
* `158035`: [resolve: Explicit Set for detecting resolution cycles](https://www.github.com/rust-lang/rust/issues/158035)
* `146275`: [lint ImproperCTypes: refactor linting architecture (part 3)](https://www.github.com/rust-lang/rust/issues/146275)
* `158477`: [Remove redundant dyn-compatibility check.](https://www.github.com/rust-lang/rust/issues/158477)


Co-authored-by: 朝倉水希 <asakuramizu111@gmail.com>
Co-authored-by: bors <bors@rust-lang.org>
Co-authored-by: jyn <github@jyn.dev>
Co-authored-by: heinwol <heinvvol@gmail.com>
Co-authored-by: Jakub Beránek <berykubik@gmail.com>
Co-authored-by: León Orell Valerian Liehr <me@fmease.dev>
Co-authored-by: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Co-authored-by: Yukang <moorekang@gmail.com>
Co-authored-by: Paul Murphy <murp@redhat.com>
Co-authored-by: aerooneqq <aerooneq@yandex.ru>
Co-authored-by: Rémy Rakic <remy.rakic@arm.com>
Co-authored-by: LorrensP-2158466 <lorrens.pantelis@student.uhasselt.be>
Co-authored-by: lapla <me@lapla.dev>
@bors-ferrocene

This comment was marked as outdated.

Sign in to view
@tshepang tshepang force-pushed the automation/pull-upstream-HEAD/85wpxgug branch from ad9ac6e to 93cde04 Compare July 7, 2026 13:30
@tshepang tshepang mentioned this pull request Jul 7, 2026
Closed
@jyn514 jyn514 mentioned this pull request Jul 7, 2026
Draft
jyn514
jyn514 requested changes Jul 7, 2026
View reviewed changes

@jyn514 jyn514 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

you might want to double-check that you found all the CI failures, i found at least one from the bors try that hasn't been fixed yet (i've left a comment below).

Comment thread library/std/src/os/unix/net/addr.rs
// don't add it here to match what a C program passes to bind(2) and
// similar functions
if cfg!(not(any(target_env = "nto80", target_env = "nto71"))) {
if cfg!(not(any(target_os = "qnx", target_env = "nto71"))) {

@jyn514 jyn514 Jul 7, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

wait, hold on, this is in your commit. shouldn't this fix go upstream? it's ok to land it now, but please put these fixes (and the test fixes below) in their own commit so it's easy to upstream them.

Comment thread src/bootstrap/src/core/build_steps/test.rs
@jyn514 jyn514 added the waiting-on-author If this PR was opened by an automation, the "author" is the assignee. label Jul 7, 2026
This was referenced Jul 7, 2026
Draft
Closed
@jyn514 jyn514 added the backport:never PR that should never be backported label Jul 8, 2026
@Urhengulas

This comment was marked as outdated.

Sign in to view
bors-ferrocene Bot added a commit that referenced this pull request Jul 8, 2026
@bors-ferrocene
Try #2447:
a509131
@bors-ferrocene

This comment was marked as outdated.

Sign in to view
@Urhengulas Urhengulas removed the request for review from Hoverbear July 9, 2026 10:32
@Urhengulas Urhengulas force-pushed the automation/pull-upstream-HEAD/85wpxgug branch 2 times, most recently from 3fbae8e to 7857f31 Compare July 9, 2026 15:17
@Urhengulas Urhengulas force-pushed the automation/pull-upstream-HEAD/85wpxgug branch from 7857f31 to 0b6e646 Compare July 9, 2026 15:21
jyn514
jyn514 approved these changes Jul 9, 2026
View reviewed changes

@jyn514 jyn514 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

this looks good to me. i'm approving so you can merge, as long as you've tested this fixes the problem.

what a mess ... thanks for helping out with this :)

@Urhengulas

Urhengulas commented Jul 9, 2026

Copy link
Copy Markdown
Member

bors merge=jyn514

bors-ferrocene Bot added a commit that referenced this pull request Jul 9, 2026
@bors-ferrocene @bors
@jyn514 @heinwol @Kobzol @fmease @bjorn3 @chenyukang @pmur @aerooneqq @lqd @LorrensP-2158466 @lapla-cogito @liza371
Merge #2447
8fb3262 
2447: Automated pull from upstream `HEAD` r=jyn514 a=ferrocene-automations[bot]

:warning: **The automation reported these warnings:** :warning:

* There are merge conflicts in this PR. Merge conflict markers have been committed.
* Couldn't regenerate the `x.py` completions. Please run `./x run generate-completions` after fixing the merge conflicts.
* Couldn't regenerate the `x.py` help file. Please run `./x run generate-help` after fixing the merge conflicts.
* Couldn't regenerate the symbol report. Please run './x test ferrocene/doc/symbol-report.csv --bless' after fixing the conflicts.

This PR pulls the following changes from the upstream repository:

* `158811`: [Rollup of 19 pull requests](https://www.github.com/rust-lang/rust/issues/158811)
  * `158706`: [Tweaks to MIR building scope API](https://www.github.com/rust-lang/rust/issues/158706)
  * `158698`: [Update TypeVisitable implementation](https://www.github.com/rust-lang/rust/issues/158698)
  * `158689`: [resolver: don't use `Finalize` when resolving visibilities during AST expansion](https://www.github.com/rust-lang/rust/issues/158689)
  * `158659`: [refactor the normalization in `coerce_shared_info`](https://www.github.com/rust-lang/rust/issues/158659)
  * `158539`: [Move `SizeHint` and `IoHandle` to `core::io`](https://www.github.com/rust-lang/rust/issues/158539)
  * `158751`: [rustdoc: Fix crash when trying to inline foreign item which cannot have attributes](https://www.github.com/rust-lang/rust/issues/158751)
  * `158711`: [library: Comment on libtest's dicey internal soundness](https://www.github.com/rust-lang/rust/issues/158711)
  * `158704`: [Optimize `ArrayChunks::try_rfold` with `DoubleEndedIterator::next_chunk_back`](https://www.github.com/rust-lang/rust/issues/158704)
  * `158624`: [borrowck: Introduce BlameConstraint::to_obligation_cause_from_path()](https://www.github.com/rust-lang/rust/issues/158624)
  * `158552`: [make some tidy errors around python easier to understand](https://www.github.com/rust-lang/rust/issues/158552)
  * `158434`: [delegation: refactor AST -> HIR lowering](https://www.github.com/rust-lang/rust/issues/158434)
  * `157857`: [Stabilize `#[my_macro] mod foo;` (part of `proc_macro_hygiene`)](https://www.github.com/rust-lang/rust/issues/157857)
  * `157835`: [expand free alias types in the auto-trait orphan check](https://www.github.com/rust-lang/rust/issues/157835)
  * `157151`: [JSON target specs: remove 'x86-softfloat' compatibility alias](https://www.github.com/rust-lang/rust/issues/157151)
  * `156777`: [Add -Zautodiff_post_passes flag to limit which llvm passes to run after enzyme to make autodiff tests more robust](https://www.github.com/rust-lang/rust/issues/156777)
  * `155989`: [Update `transmute_copy` to ub_checks and `?Sized`](https://www.github.com/rust-lang/rust/issues/155989)
  * `155932`: [MIR Call terminator: evaluate destination place before arguments](https://www.github.com/rust-lang/rust/issues/155932)
  * `134021`: [Implement `IntoIterator` for `[&[mut]] Box<[T; N], A>`](https://www.github.com/rust-lang/rust/issues/134021)
  * `158692`: [Add release notes for 1.96.1](https://www.github.com/rust-lang/rust/issues/158692)
* `158740`: [Bump version to 1.99.0](https://www.github.com/rust-lang/rust/issues/158740)
* `158169`: [Fix debuginfo compression in bootstrap](https://www.github.com/rust-lang/rust/issues/158169)
* `158795`: [Rollup of 21 pull requests](https://www.github.com/rust-lang/rust/issues/158795)
  * `158688`: [Cleanup attribute docs and add links to other mentioned attributes](https://www.github.com/rust-lang/rust/issues/158688)
  * `158687`: [Streamline `MacEager`](https://www.github.com/rust-lang/rust/issues/158687)
  * `158684`: [Add missing generic test coverage for ```#[splat]```](https://www.github.com/rust-lang/rust/issues/158684)
  * `158682`: [Avoid delayed bug for disabled on_type_error arguments](https://www.github.com/rust-lang/rust/issues/158682)
  * `158681`: [Remove unnecessary `Hash` derives from MIR types](https://www.github.com/rust-lang/rust/issues/158681)
  * `158680`: [Avoid ICE for `NonZero<char>` in improper_ctypes](https://www.github.com/rust-lang/rust/issues/158680)
  * `158677`: [Add extra splat tests](https://www.github.com/rust-lang/rust/issues/158677)
  * `158674`: [library: Polish transmute's `split_at_stdlib` example](https://www.github.com/rust-lang/rust/issues/158674)
  * `158669`: [Remove `src/tools/test-float-parse/Cargo.lock`](https://www.github.com/rust-lang/rust/issues/158669)
  * `158651`: [ptr doc: reduce use of unsafe block to where needed](https://www.github.com/rust-lang/rust/issues/158651)
  * `158637`: [hir_ty_lowering: avoid self type lookup for inherent aliases](https://www.github.com/rust-lang/rust/issues/158637)
  * `158585`: [Improve diagnostic for too many super keywords](https://www.github.com/rust-lang/rust/issues/158585)
  * `158549`: [process::exec: using appropriate exit code on vxworks.](https://www.github.com/rust-lang/rust/issues/158549)
  * `158473`: [Add `riscv32imfc-unknown-none-elf` bare-metal target](https://www.github.com/rust-lang/rust/issues/158473)
  * `158021`: [Remove old MinGW workaround](https://www.github.com/rust-lang/rust/issues/158021)
  * `158665`: [Revert "Remove redundant dyn-compatibility check."](https://www.github.com/rust-lang/rust/issues/158665)
  * `158658`: [Update LLVM submodule](https://www.github.com/rust-lang/rust/issues/158658)
  * `158627`: [Simplify option-iterator flattening in the compiler](https://www.github.com/rust-lang/rust/issues/158627)
  * `158606`: [use ProjectionPredicate instead of AliasRelate](https://www.github.com/rust-lang/rust/issues/158606)
  * `158494`: [Improve E0277 diagnostics for conditionally implemented traits](https://www.github.com/rust-lang/rust/issues/158494)
  * `158100`: [Emit retags in codegen to support BorrowSanitizer (part 4)](https://www.github.com/rust-lang/rust/issues/158100)
* `158691`: [Update cargo submodule](https://www.github.com/rust-lang/rust/issues/158691)
* `158774`: [Mirror kernel archives in `ci-mirrors` to not depend on currently unavailable kernel mirror sources](https://www.github.com/rust-lang/rust/issues/158774)
* `158525`: [Reorganize `tests/ui/issues` [17/N]](https://www.github.com/rust-lang/rust/issues/158525)
* `158676`: [Rollup of 8 pull requests](https://www.github.com/rust-lang/rust/issues/158676)
  * `158667`: [rustc_sanitizers: use twox-hash without default features](https://www.github.com/rust-lang/rust/issues/158667)
  * `158364`: [rustc_target/asm: add LoongArch LSX/LASX inline asm register support](https://www.github.com/rust-lang/rust/issues/158364)
  * `158334`: [rustdoc: Show use-site paths for unevaluated const array lengths](https://www.github.com/rust-lang/rust/issues/158334)
  * `158574`: [Clarify ExitStatusExt documentation](https://www.github.com/rust-lang/rust/issues/158574)
  * `158531`: [Change `adjust_ident_and_get_scope` arg to `LocalDefId`](https://www.github.com/rust-lang/rust/issues/158531)
  * `158427`: [Implement `ptr::{read,write}_unaligned` via `repr(packed)`](https://www.github.com/rust-lang/rust/issues/158427)
  * `158180`: [std: use `OnceLock` for SGX environment variable storage](https://www.github.com/rust-lang/rust/issues/158180)
  * `156737`: [Implement `DoubleEndedIterator::next_chunk_back`](https://www.github.com/rust-lang/rust/issues/156737)
* `158663`: [Rollup of 8 pull requests](https://www.github.com/rust-lang/rust/issues/158663)
  * `158647`: [Document `strip_circumfix` behavior on overlapping prefix and suffix.](https://www.github.com/rust-lang/rust/issues/158647)
  * `158634`: [Add missing `needs_drop` check to `DroplessArena`.](https://www.github.com/rust-lang/rust/issues/158634)
  * `158633`: [Remove unnecessary `Clone` derives on resolver types](https://www.github.com/rust-lang/rust/issues/158633)
  * `158620`: [Remove skip_norm_w/i/p().def_id with a helper](https://www.github.com/rust-lang/rust/issues/158620)
  * `158613`: [Fix getrandom fallback test on platforms with `panic=abort`](https://www.github.com/rust-lang/rust/issues/158613)
  * `158397`: [delegation: support simplest output `Self` mapping](https://www.github.com/rust-lang/rust/issues/158397)
  * `156716`: [tests: fix: parallel frontend test failures: different alloc ids](https://www.github.com/rust-lang/rust/issues/156716)
  * `158294`: [Use .drectve for MSVC DLL exports](https://www.github.com/rust-lang/rust/issues/158294)
* `158604`: [resolve: no allocation in `resolve_ident_in(_local)_module_*`](https://www.github.com/rust-lang/rust/issues/158604)
* `158639`: [Rollup of 6 pull requests](https://www.github.com/rust-lang/rust/issues/158639)
  * `158636`: [linkchecker: upgrade to `html5ever v0.39`](https://www.github.com/rust-lang/rust/issues/158636)
  * `158542`: [Rename `align` to `default_align` on `Scalar` and `Primitive`](https://www.github.com/rust-lang/rust/issues/158542)
  * `158516`: [ Deduplicate codegen backends in bootstrap config](https://www.github.com/rust-lang/rust/issues/158516)
  * `158483`: [signed strict division: just use normal division](https://www.github.com/rust-lang/rust/issues/158483)
  * `158449`: [QNX target renaming](https://www.github.com/rust-lang/rust/issues/158449)
  * `157718`: [Do not increase depth when evaluating nested goals of `NormalizesTo`](https://www.github.com/rust-lang/rust/issues/157718)
* `158629`: [Rollup of 7 pull requests](https://www.github.com/rust-lang/rust/issues/158629)
  * `158616`: [Remove dependency from `rustc_metadata` on `rustc_incremental`](https://www.github.com/rust-lang/rust/issues/158616)
  * `158614`: [Fix error message when rejecting implicit stage != 2 in CI](https://www.github.com/rust-lang/rust/issues/158614)
  * `158573`: [stabilize `feature(atomic_from_mut)`](https://www.github.com/rust-lang/rust/issues/158573)
  * `158569`: [[rustdoc] Fix handling of inlining of `no_inline` of foreign items](https://www.github.com/rust-lang/rust/issues/158569)
  * `157650`: [rustc_target: Add OpenEmbedded/Yocto Linux base targets](https://www.github.com/rust-lang/rust/issues/157650)
  * `157347`: [Implement `Box::as_non_null()`.](https://www.github.com/rust-lang/rust/issues/157347)
  * `156379`: [lint on `core::ffi::c_void` as a return type](https://www.github.com/rust-lang/rust/issues/156379)
* `158610`: [Rollup of 5 pull requests](https://www.github.com/rust-lang/rust/issues/158610)
  * `158592`: [tests: only run `lexical-scope-in-match.rs` for LLDB >= 21](https://www.github.com/rust-lang/rust/issues/158592)
  * `158571`: [Update books](https://www.github.com/rust-lang/rust/issues/158571)
  * `158563`: [Test(lib/net): Fix `hostname_smoketest` for Win7](https://www.github.com/rust-lang/rust/issues/158563)
  * `158560`: [Move per-function debuginfo methods from codegen to builder methods](https://www.github.com/rust-lang/rust/issues/158560)
  * `158600`: [Fix `rustc --unpretty=expanded` emit of `[const] [unsafe] impl Trait for`](https://www.github.com/rust-lang/rust/issues/158600)
* `158595`: [Rollup of 7 pull requests](https://www.github.com/rust-lang/rust/issues/158595)
  * `158591`: [Fix spacing issue for unused parentheses lint](https://www.github.com/rust-lang/rust/issues/158591)
  * `158327`: [Move attribute and keyword docs from `std` to `core`](https://www.github.com/rust-lang/rust/issues/158327)
  * `157445`: [Allow section override when using patchable-function-entries](https://www.github.com/rust-lang/rust/issues/157445)
  * `158562`: [Improve tracing of steps in bootstrap](https://www.github.com/rust-lang/rust/issues/158562)
  * `158561`: [Avoid building rustdoc for tests without doctests](https://www.github.com/rust-lang/rust/issues/158561)
  * `158256`: [Avoid parser panics bubbling out to proc macros](https://www.github.com/rust-lang/rust/issues/158256)
  * `158073`: [bootstrap: fix panic when repo path contains spaces by switching to CARGO_ENCODED_RUSTFLAGS](https://www.github.com/rust-lang/rust/issues/158073)
* `158593`: [Rollup of 11 pull requests](https://www.github.com/rust-lang/rust/issues/158593)
  * `158582`: [Comment on needed RAM in huge-stacks.rs](https://www.github.com/rust-lang/rust/issues/158582)
  * `158568`: [llvm-wrapper: use accessors for private fields in LLVM 23+](https://www.github.com/rust-lang/rust/issues/158568)
  * `158564`: [fix `-Z min-recursion-limit` unstable chapter name](https://www.github.com/rust-lang/rust/issues/158564)
  * `158543`: [Note usage of documentation hard links in `core::io`](https://www.github.com/rust-lang/rust/issues/158543)
  * `158468`: [Include default-stability info in rustdoc JSON.](https://www.github.com/rust-lang/rust/issues/158468)
  * `158081`: [trait-system: Recover deferred closure calls after errors](https://www.github.com/rust-lang/rust/issues/158081)
  * `158556`: [delegation: store child segment flag in `PathSegment`](https://www.github.com/rust-lang/rust/issues/158556)
  * `158375`: [Support `DefKind::InlineConst` in `ConstKind::Unevaluated`](https://www.github.com/rust-lang/rust/issues/158375)
  * `156295`: [Pass the whole `GenericArgs` to `Interner::for_each_relevant_impl()`](https://www.github.com/rust-lang/rust/issues/156295)
  * `156230`: [tests: check wasm compiler_builtins object architecture](https://www.github.com/rust-lang/rust/issues/156230)
  * `155722`: [Introduce aarch64-unknown-linux-pauthtest target](https://www.github.com/rust-lang/rust/issues/155722)
* `158035`: [resolve: Explicit Set for detecting resolution cycles](https://www.github.com/rust-lang/rust/issues/158035)
* `146275`: [lint ImproperCTypes: refactor linting architecture (part 3)](https://www.github.com/rust-lang/rust/issues/146275)
* `158477`: [Remove redundant dyn-compatibility check.](https://www.github.com/rust-lang/rust/issues/158477)


Co-authored-by: bors <bors@rust-lang.org>
Co-authored-by: jyn <github@jyn.dev>
Co-authored-by: heinwol <heinvvol@gmail.com>
Co-authored-by: Jakub Beránek <berykubik@gmail.com>
Co-authored-by: León Orell Valerian Liehr <me@fmease.dev>
Co-authored-by: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Co-authored-by: Yukang <moorekang@gmail.com>
Co-authored-by: Paul Murphy <murp@redhat.com>
Co-authored-by: aerooneqq <aerooneq@yandex.ru>
Co-authored-by: Rémy Rakic <remy.rakic@arm.com>
Co-authored-by: LorrensP-2158466 <lorrens.pantelis@student.uhasselt.be>
Co-authored-by: lapla <me@lapla.dev>
Co-authored-by: Liza Burakova <liza@chromium.org>
@bors-ferrocene

bors-ferrocene Bot commented Jul 9, 2026

Copy link
Copy Markdown
Contributor

Build failed:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jonathanpallant jonathanpallant jonathanpallant left review comments
@jyn514 jyn514 jyn514 approved these changes

Assignees

@tshepang tshepang

Labels

automation Issue or PR created by an automation backport:manual PR requiring manual intervention to backport backport:never PR that should never be backported backport:1.97 waiting-on-author If this PR was opened by an automation, the "author" is the assignee.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.