Automated pull from upstream `HEAD` by ferrocene-automations[bot] · Pull Request #2158 · ferrocene/ferrocene

ferrocene-automations · 2026-02-16T19:22:01Z

⚠️ 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.

This PR pulls the following changes from the upstream repository:

152701: Rollup of 6 pull requests
- 152686: bootstrap: Inline the is_tool check for setting -Zforce-unstable-if-unmarked
- 152648: Remove timing assertion from oneshot::send_before_recv_timeout
- 152296: Port rust_nonnull_optimization_guaranteed and rustc_do_not_const_check to the new attribute parser
- 152103: Consider captures to be used by closures that unwind
- 150601: support c-variadic functions in rustc_const_eval
- 148206: Deduplicated float tests and unified in floats/mod.rs
152636: Big query system cleanups
152452: feat: show what lint was overruled
152671: Rollup of 4 pull requests
- 152625: Provide all lint group names to Clippy
- 152604: Relocate some tests
- 152278: Fix const normalization for generic const items with trait assoc consts
- 152566: Remove code for ThinLTO from cg_gcc
152605: Pass alignments through the shim as Alignment (not usize)
152375: Use scope for par_slice instead of join
152639: Rollup of 9 pull requests
- 152610: Exchange js_lint message between bless and non-bless
- 152472: unwind/wasm: fix compile error by wrapping wasm_throw in unsafe block
- 152402: Add regression test for #141738
- 152188: Include library/stdarch for CURRENT_RUSTC_VERSION updates
- 152578: ci: Lock cross toolchain version and update docs
- 152534: Test(lib/win/net): Skip UDS tests when under Win7
- 152508: Improve write! and writeln! error when called without destination
- 152132: implement carryless_mul
- 150424: diagnostics: add note when param-env shadows global impl
151380: Shallow resolve ty and const vars to their root vars
152632: Rollup of 7 pull requests
- 152582: rustc_query_impl: Use ControlFlow in visit_waiters instead of nested options
- 152404: tests: adapt align-offset.rs for InstCombine improvements in LLVM 23
- 143575: Remove named lifetimes in some PartialOrd & PartialEq impls
- 152381: Do not require 'static for obtaining reflection information.
- 151365: UnsafePinned: implement opsem effects of UnsafeUnpin
- 145024: Optimize indexing slices and strs with inclusive ranges
- 152622: Update GCC subtree
152627: Rollup of 8 pull requests
- 152612: Rename inline_fluent! to msg!
- 152590: DepGraphQuery: correctly skip adding edges with not-yet-added nodes
- 152570: Port #[rustc_test_marker] to the attribute parser
- 152577: Port #[rustc_proc_macro_decls] to the new attribute parser.
- 152531: proc_macro::bridge: simplify ExecutionStrategy and DispatcherTrait
- 152120: Don't ICE on layout error in vtable computation
- 152001: mGCA: Validate const literal against expected type
- 152618: stdarch subtree update
150681: Make operational semantics of pattern matching independent of crate and module
152516: Move rustc_query_system code, part 3
152602: Rollup of 11 pull requests
- 152587: A couple of tiny polonius things
- 152575: layout_of unexpected rigid alias delayed bug
- 152568: Port #[lang] and #[panic_handler] to the new attribute parsers
- 152567: nix-dev-shell: fix a typo
- 151386: rustdoc: more js cleanup
- 152594: c-variadic: implement va_arg for wasm64
- 152573: move escape_symbol_name to cg_ssa
- 152471: improve associated-type suggestions from bounds
- 152076: Feed ErrorGuaranteed from late lifetime resolution errors through to bound variable resolution
- 149460: rustdoc: sort stable items first
- 151998: Set hidden visibility on naked functions in compiler-builtins
149389: WF check lifetime bounds for locals with type params
152574: Rollup of 14 pull requests
- 152565: fix missleading error for tuple ctor
- 152563: Replace "bug" with "issue" in triagebot ping messages
- 152556: doc: move riscv64a23-unknown-linux-gnu to tier 2
- 152554: Remove deprecated_safe and its corresponding feature gate
- 152536: bootstrap: add explicit UTF-8 encoding to text-mode open() calls
- 152440: Fix typos and grammar in compiler and build documentation
- 152407: Add regression test for type_const with unit struct ctor under mGCA
- 152392: Fix ICE in supertrait_vtable_slot when supertrait has missing generics
- 152356: Improve the inline_fluent! macro
- 152218: Report unconstrained region in hidden types lazily
- 152555: Port #[rustc_diagnostic_item] to the new attribute parsers
- 152515: Extract DepKindVTable constructors to their own module
- 152469: Remove unused features
- 152323: Fix ICE in borrowck when recovering fn_sig for -> _
152533: Clippy subtree update
152562: Rollup of 17 pull requests
- 152552: Add 2048-bit HvxVectorPair support to Hexagon SIMD ABI checks
- 152550: Port #[prelude_import] to the attribute parser
- 152548: reject inline const patterns pre-expansion
- 152529: sparc64: enable abi compatibility test
- 152519: Fix feature gating for new try bikeshed expressions
- 152486: remove redundant backchain attribute in codegen
- 152444: -Znext-solver Prevent committing unfulfilled unsized coercion
- 152329: Simplify parallel! macro
- 152232: Add must_use for FileTimes
- 152082: Move tests
- 152528: Support serializing CodegenContext
- 152520: Don't use DepContext in rustc_middle::traits::cache
- 152514: Collect active query jobs into struct QueryJobMap
- 152496: Fix multi-cgu+debug builds using autodiff by delaying autodiff till lto
- 152422: Change query proc macro to be more rust-analyzer friendly
- 150988: Improve code suggestion for incorrect macro_rules! usage
- 150551: Compute localized outlives constraints lazily
152538: Update cargo submodule
148537: Start using pattern types in libcore (NonZero and friends)
152517: Rollup of 17 pull requests
- 152502: Implement BinaryHeap::from_raw_vec
- 152495: Clean up some subdiagnostics
- 152485: fix issue#152482
- 152481: Use cg_ssa's produce_final_output_artifacts in cg_clif
- 152425: Port #![test_runner] to the attribute parser
- 152394: Correctly check if a macro call is actually a macro call in rustdoc highlighter
- 152316: fix: add continue
- 152498: Partially revert "resolve: Update NameBindingData::vis in place"
- 152478: Remove tm_factory field from CodegenContext
- 152434: Clarify names of QueryVTable functions for "executing" a query
- 152159: Add note for ?Sized params in int-ptr casts diag
- 151863: Borrowck: simplify diagnostics for placeholders
- 151814: layout: handle rigid aliases without params
- 151152: Add FCW for derive helper attributes that will conflict with built-in attributes
- 150768: Don't compute FnAbi for LLVM intrinsics in backends
- 142680: Fix passing/returning structs with the 64-bit SPARC ABI
- 142415: Add note when inherent impl for a alias type defined outside of the crate
152506: Rollup of 7 pull requests
- 152491: Remove unused fluent-syntax dependency from tidy
- 152488: allow deprecated(since = "CURRENT_RUSTC_VERSION")
- 152477: rustc-dev-guide subtree update
- 151142: Support ADT types in type info reflection
- 152281: borrowck: suggest &mut *x for pattern reborrows
- 137487: Stabilize assert_matches
- 152505: Sync relnotes for stable 1.93.1
152484: Rollup of 9 pull requests
- 152441: Fix typos and grammar in top-level and src/doc documentation
- 152397: Update books
- 152383: BikeshedGuaranteedNoDrop trait: add comments indicating that it can be observed on stable
- 152372: style: remove unneeded trailing commas
- 152146: mGCA: Add associated const type check
- 152021: Bump tvOS, visionOS and watchOS Aarch64 targets to tier 2
- 152436: Reenable a GCI+mGCA+GCPT test case
- 152431: Restrict the set of things that const stability can be applied to
- 152419: Move more query system code
152428: Update to LLVM 22.1.0-rc3
152240: Update cargo submodule
152420: compiler-builtins subtree update
151943: Clean up query macros for cache_on_disk_if
151509: Handle race when coloring nodes concurrently as both green and red
152437: Rollup of 10 pull requests
- 152396: Uplift Predicate::allow_normalization to rustc_type_ir
- 152355: Update documentation of rustc_macros
- 152293: Format heterogeneous try blocks
- 150688: typeck: Make it clearer that check_pat_lit only handles literal patterns
- 152417: Move the needs-drop check for arena_cache queries out of macro code
- 152351: Remove SubdiagMessage in favour of the identical DiagMessage
- 152226: Modernize diagnostic for indeterminate trait object lifetime bounds
- 152148: Move impl Interner for TyCtxt to its own submodule
- 151954: Add help message suggesting explicit reference cast for From/TryFrom
- 152364: Port a lot of attributes to the new parser
152412: Rollup of 7 pull requests
- 152326: Remove the compiler adhoc group
- 152013: Update to Xcode 26.2
- 151154: Add s390x-unknown-none-softfloat with RustcAbi::Softfloat
- 150897: rustc_parse_format: improve diagnostics for unsupported debug = syntax
- 152317: fix: sup_trace to sub_trace
- 152157: Fix error spans for asm!() args that are macros
- 151960: rustc_parse: improve the error diagnostic for "missing let"

Don't compute FnAbi for LLVM intrinsics in backends ~~This removes support for `extern "unadjusted"` for anything other than LLVM intrinsics. It only makes sense in the context of calling LLVM intrinsics anyway as it exposes the way the LLVM backend internally represents types. Perhaps it should be renamed to `extern "llvm-intrinsic"`?~~ Follow up to rust-lang/rust#148533

layout: handle rigid aliases without params fixes rust-lang/rust#151791 r? types

@lcnr

…ing, r=lcnr Borrowck: simplify diagnostics for placeholders This folds the call to `region_from_element` into `RegionInferenceContext`, and simplifies the error variant for this case to only talk about regions as opposed to elements. This is the only case where a `RegionElement` leaks out of region inference, so now they can be considered internal to region inference (though that currently isn't expressed). It also clarifies the type information on the methods called to emphasise the fact that they only ever use placeholder regions in the diagnostics completely ignore any other element. It also adds a bunch of FIXMEs to some fishy statements that conjure universes from what seems like arbitrary integers. This was lifted from rust-lang/rust#142623. r? @lcnr

Add note for `?Sized` params in int-ptr casts diag Close rust-lang/rust#74756

Clarify names of `QueryVTable` functions for "executing" a query In the query system, there are several layers of functions involved in “executing” a query, with very different responsibilities at each layer, making it important to be able to tell them apart. This PR renames two of the function pointers in `QueryVTable`, along with their associated helper functions, to hopefully do a better job of indicating what their actual responsibilities are. r? nnethercote

Remove tm_factory field from CodegenContext This is necessary to support serializing the `CodegenContext` to a `.rlink` file in the future for moving LTO to the `-Zlink-only` step. Follow up to rust-lang/rust#149209 Part of rust-lang/compiler-team#908

Partially revert "resolve: Update `NameBindingData::vis` in place" Partial revert of rust-lang/rust@227e7bd. This is a minimal fix for backporting to beta, I'll submit proper fixes later. Fixes rust-lang/rust#152004 Fixes rust-lang/rust#151124 Fixes rust-lang/rust#152347

fix: add continue should be same in: https://github.com/rust-lang/rust/blob/d3ec6a351a027a71bdfbd36429288c1357ccdbea/compiler/rustc_trait_selection/src/error_reporting/infer/nice_region_error/static_impl_trait.rs#L156-L159

@lolbinarycat

Correctly check if a macro call is actually a macro call in rustdoc highlighter Fixes rust-lang/rust#151904. Issues was that if there was a `!` following an ident, we would always assume it's a macro call... except it's very lacking. I'm actually surprised it went for so long unnoticed. To fix it, I added a check for the next (non-blank) token after the `!`, if it's a `{` or a `[` or a `(`, then only do we consider it to be a macro call. r? @lolbinarycat

@JonathanBrouwer

Port #![test_runner] to the attribute parser Tracking issue: rust-lang/rust#131229 r? @JonathanBrouwer

Use cg_ssa's produce_final_output_artifacts in cg_clif

fix issue#152482 Close rust-lang/rust#152482

Clean up some subdiagnostics Just a nice minor cleanup :) * Removes some empty subdiagnostics which could just be subdiagnostic attributes * Convert some manual implementation of `Subdiagnostic` to derives

Implement `BinaryHeap::from_raw_vec` Implements rust-lang/rust#152500. Adds a `BinaryHeap::from_raw_vec` function, which constructs a `BinaryHeap` without performing a heapify, for data that is already a max-heap.

Rollup of 17 pull requests Successful merges: - rust-lang/rust#142415 (Add note when inherent impl for a alias type defined outside of the crate) - rust-lang/rust#142680 (Fix passing/returning structs with the 64-bit SPARC ABI) - rust-lang/rust#150768 (Don't compute FnAbi for LLVM intrinsics in backends) - rust-lang/rust#151152 (Add FCW for derive helper attributes that will conflict with built-in attributes) - rust-lang/rust#151814 (layout: handle rigid aliases without params) - rust-lang/rust#151863 (Borrowck: simplify diagnostics for placeholders) - rust-lang/rust#152159 (Add note for `?Sized` params in int-ptr casts diag) - rust-lang/rust#152434 (Clarify names of `QueryVTable` functions for "executing" a query) - rust-lang/rust#152478 (Remove tm_factory field from CodegenContext) - rust-lang/rust#152498 (Partially revert "resolve: Update `NameBindingData::vis` in place") - rust-lang/rust#152316 (fix: add continue) - rust-lang/rust#152394 (Correctly check if a macro call is actually a macro call in rustdoc highlighter) - rust-lang/rust#152425 (Port #![test_runner] to the attribute parser) - rust-lang/rust#152481 (Use cg_ssa's produce_final_output_artifacts in cg_clif) - rust-lang/rust#152485 (fix issue#152482) - rust-lang/rust#152495 (Clean up some subdiagnostics) - rust-lang/rust#152502 (Implement `BinaryHeap::from_raw_vec`)

This code is now in `rustc_middle`, and doesn't need any non-trivial methods, so it can just use `TyCtxt` directly instead.

llvm will look at both 1. the values of "target-features" and 2. the function string attributes. this removes the redundant function string attribute because it is not needed at all. rustc sets the `+backchain` attribute through `target_features_attr(...)`

…`par_join`

It can't be serialized to a file.

Rollup of 6 pull requests Successful merges: - rust-lang/rust#148206 (Deduplicated float tests and unified in floats/mod.rs) - rust-lang/rust#150601 (support c-variadic functions in `rustc_const_eval`) - rust-lang/rust#152103 (Consider captures to be used by closures that unwind) - rust-lang/rust#152296 (Port `rust_nonnull_optimization_guaranteed` and `rustc_do_not_const_check` to the new attribute parser) - rust-lang/rust#152648 (Remove timing assertion from `oneshot::send_before_recv_timeout`) - rust-lang/rust#152686 (bootstrap: Inline the `is_tool` check for setting `-Zforce-unstable-if-unmarked`) Failed merges: - rust-lang/rust#152512 (core: Implement feature `float_exact_integer_constants`)

This commit is generated by `ferrocene/tools/pull-upstream/pull.sh`. The list of excluded files is defined in `.gitattributes`.

tshepang · 2026-02-18T02:39:59Z

this was removed in a previous commit in this pr

I'm not sure how to action on this.

for some reason it looked like the file was empty instead of removed

tshepang · 2026-02-18T02:41:20Z

please squash, for we have fixup commits here

tshepang · 2026-02-18T02:41:36Z

bors try

bors-ferrocene · 2026-02-18T06:17:27Z

try

Build failed:

full

tshepang · 2026-02-18T14:23:34Z

all Ferrocene changes here should be reverted (in a future pr perhaps), since they are all to accommodate the now-removed custom panic runtime

I believe @Urhengulas has this as a follow up eventually.

Hoverbear · 2026-02-18T18:27:49Z

bors try

bors-ferrocene · 2026-02-18T19:39:03Z

try

Build failed:

full

tshepang · 2026-02-18T19:39:29Z

bors merge

bors-ferrocene · 2026-02-18T19:39:34Z

👎 Rejected by too few approved reviews

tshepang

bors merge

Hoverbear · 2026-02-18T19:47:32Z

bors try

bors-ferrocene · 2026-02-18T20:28:48Z

try

Build failed:

full

bors-ferrocene · 2026-02-19T00:15:38Z

Build failed (retrying...):

full

bors-ferrocene · 2026-02-19T10:33:25Z

Build succeeded:

full

jhpratt and others added 30 commits February 12, 2026 00:41

Rollup merge of #151814 - lcnr:silent-layout-error, r=jackh726

3db13e2

layout: handle rigid aliases without params fixes rust-lang/rust#151791 r? types

Rollup merge of #152159 - JohnTitor:issue-74756, r=estebank

3ad8e9c

Add note for `?Sized` params in int-ptr casts diag Close rust-lang/rust#74756

Rollup merge of #152425 - Ozzy1423:test-runner, r=JonathanBrouwer

9cbcd11

Port #![test_runner] to the attribute parser Tracking issue: rust-lang/rust#131229 r? @JonathanBrouwer

Rollup merge of #152481 - bjorn3:backends_reduce_duplication, r=fmease

596faf0

Use cg_ssa's produce_final_output_artifacts in cg_clif

Rollup merge of #152485 - ban-xiu:fix-issue-152482, r=jieyouxu

5822878

fix issue#152482 Close rust-lang/rust#152482

Rollup merge of #152495 - JonathanBrouwer:remove-empty-subdiags, r=lqd

9376482

Clean up some subdiagnostics Just a nice minor cleanup :) * Removes some empty subdiagnostics which could just be subdiagnostic attributes * Convert some manual implementation of `Subdiagnostic` to derives

Rollup merge of #152502 - Dan54:heap-from-raw-vec, r=scottmcm

faac3c5

Implement `BinaryHeap::from_raw_vec` Implements rust-lang/rust#152500. Adds a `BinaryHeap::from_raw_vec` function, which constructs a `BinaryHeap` without performing a heapify, for data that is already a max-heap.

Don't use DepContext in rustc_middle::traits::cache

576901f

This code is now in `rustc_middle`, and doesn't need any non-trivial methods, so it can just use `TyCtxt` directly instead.

Improve code suggestion for incorrect macro_rules! usage

caf7cdf

UnsafePinned: implement opsem effects of UnsafeUnpin

590c1c9

try to work around rustdoc bug, and other rustdoc adjustments

0cbe1cc

Replace parallel! macro with par_fns function and rename join to …

8c5ce26

…`par_join`

use ? instead of * for return types

13189f4

remove DispatcherTrait

2f24a5e

Change query proc macro to be more rust-analyzer friendly

8cc4b93

sparc64: enable abi compatibility test

d8ed639

fix GATs logic

1eddc17

fix tidy

7a2f2fe

Remove SelfProfilerRef from CodegenContext

506ed6d

It can't be serialized to a file.

Remove SelfProfilerRef from CodegenContext

293e950

It can't be serialized to a file.

bors and others added 3 commits February 16, 2026 09:55

remove excluded files from upstream

f55806a

This commit is generated by `ferrocene/tools/pull-upstream/pull.sh`. The list of excluded files is defined in `.gitattributes`.

pull new changes from upstream

3fa1ad0

ferrocene-automations Bot added automation Issue or PR created by an automation backport:never PR that should never be backported labels Feb 16, 2026

Hoverbear force-pushed the automation/pull-upstream-HEAD/6c7soo5p branch from 79cb444 to 7bda035 Compare February 17, 2026 16:08

tshepang reviewed Feb 18, 2026

View reviewed changes

bors-ferrocene Bot added a commit that referenced this pull request Feb 18, 2026

Try #2158:

f764bc4

tshepang reviewed Feb 18, 2026

View reviewed changes

Comment thread src/bootstrap/src/lib.rs Outdated

tshepang reviewed Feb 18, 2026

View reviewed changes

Comment thread library/core/src/num/nonzero.rs Outdated

Fix conflicts

f589c2b

Hoverbear force-pushed the automation/pull-upstream-HEAD/6c7soo5p branch from 996aa31 to f589c2b Compare February 18, 2026 18:14

bors-ferrocene Bot added a commit that referenced this pull request Feb 18, 2026

Try #2158:

5284e41

tshepang approved these changes Feb 18, 2026

View reviewed changes

bors-ferrocene Bot added a commit that referenced this pull request Feb 18, 2026

Try #2158:

70732cf

bors-ferrocene Bot merged commit 159218b into main Feb 19, 2026
4 checks passed

github-actions Bot added the merged-in:1.95 label Feb 19, 2026

Conversation

ferrocene-automations Bot commented Feb 16, 2026

Uh oh!

tshepang Feb 18, 2026

Choose a reason for hiding this comment

Uh oh!

Hoverbear Feb 18, 2026

Choose a reason for hiding this comment

Uh oh!

tshepang Feb 18, 2026

Choose a reason for hiding this comment

Uh oh!

tshepang commented Feb 18, 2026

Uh oh!

tshepang commented Feb 18, 2026

Uh oh!

bors-ferrocene Bot commented Feb 18, 2026

try

Uh oh!

Uh oh!

tshepang Feb 18, 2026

Choose a reason for hiding this comment

Uh oh!

Hoverbear Feb 18, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Hoverbear commented Feb 18, 2026

Uh oh!

bors-ferrocene Bot commented Feb 18, 2026

try

Uh oh!

tshepang commented Feb 18, 2026

Uh oh!

bors-ferrocene Bot commented Feb 18, 2026

Uh oh!

tshepang left a comment

Choose a reason for hiding this comment

Uh oh!

Hoverbear commented Feb 18, 2026

Uh oh!

bors-ferrocene Bot commented Feb 18, 2026

try

Uh oh!

bors-ferrocene Bot commented Feb 19, 2026

Uh oh!

bors-ferrocene Bot commented Feb 19, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants