Skip to content

Rollup of 6 pull requests#153278

Merged
rust-bors[bot] merged 25 commits intorust-lang:mainfrom
JonathanBrouwer:rollup-k88jgqQ
Mar 2, 2026
Merged

Rollup of 6 pull requests#153278
rust-bors[bot] merged 25 commits intorust-lang:mainfrom
JonathanBrouwer:rollup-k88jgqQ

Conversation

@JonathanBrouwer
Copy link
Contributor

Successful merges:

r? @ghost

Create a similar rollup

bjorn3 and others added 25 commits February 24, 2026 10:34
This allows removing the Metadata associated type from BackendTypes.
In Cranelift the regular Type enum can't represent function signatures.
Function pointers are represented as plain pointer sized integer.
In Cranelift a Value can't hold arbitrarily sized values.
Avoids GNU ld warnings like:
```
type and size of dynamic symbol `meooooooooooooooow' are not defined
```
First noticed in
rust-lang#152451 (comment)
with changes from rust-lang#149937.
stabilizes `core::range::RangeToInclusive`
add missing trait impls for new RangeToInclusive
add missing trait impls for new RangeFrom
This makes it clear the `CycleError` is not used after the call.
When there are two cases of equal size and importance, I find an if/else
expression easier to read than an early return.
It's an unnecessary level of indirection.
Calling `abort_if_errors` after emitting an error is guaranteed to call
`raise_fatal`, so just do that directly instead.
This exact comment block also appears in
`compiler/rustc_middle/src/queries.rs`, which is a better place for it.
`Value` is an unhelpfully generic name. Standard naming procedure for a
trait with a single method is for the trait name to match the method
name, which is what this commit does. Likewise, the enclosing module is
renamed from `values` to `from_cycle_error`.

Also add a comment about some non-obvious behaviour.
It has no effect.

`symbol_name` is the only query that produces a `SymbolName`. If it was
marked with `cycle_delayed_bug`/`cycle_stash` then this `FromCycleError`
impl would make sense, but that's not the case. Maybe it was the case in
the past.
…ochenkov

Various small query cleanups

I found these while doing a close read of the query code.

r? @oli-obk
…gross35

stabilize new RangeToInclusive type

stabilizes `core::range::RangeToInclusive`

```rust
// in core::range

pub struct RangeToInclusive<Idx> {
    pub last: Idx,
}

impl<Idx: fmt::Debug> fmt::Debug for RangeInclusive<Idx> { /* ... */ }

impl<Idx: PartialOrd<Idx>> RangeToInclusive<Idx> {
    pub const fn contains<U>(&self, item: &U) -> bool
    where
        Idx: [const] PartialOrd<U>,
        U: ?Sized + [const] PartialOrd<Idx>;
}

impl<T> const RangeBounds<T> for RangeToInclusive<T> { /* ... */ }
impl<T> const RangeBounds<T> for RangeToInclusive<&T> { /* ... */ }

impl<T> const From<RangeToInclusive<T>> for legacy::RangeToInclusive<T> { /* ... */ }
impl<T> const From<legacy::RangeToInclusive<T>> for RangeToInclusive<T> { /* ... */ }

unsafe impl<T> const SliceIndex<[T]> for range::RangeToInclusive<usize> {
    type Output = [T];
    /* ... */
}
unsafe impl const SliceIndex<str> for range::RangeToInclusive<usize> {
    type Output = str;
    /* ... */
}
```

Tracking issue: rust-lang#125687
Couple of cg_ssa refactorings

These should help a bit with using cg_ssa in cg_clif at some point in the future.
elf-raw-dylib: set type for functions

Avoids GNU ld warnings like:
```
type and size of dynamic symbol `meooooooooooooooow' are not defined
```
First noticed in rust-lang#152451 (comment) with changes from rust-lang#149937.
…m, r=ehuss

tests/ui/asm: add annotations for reference rules

r? ehuss

Replaced rust-lang#152881 which got closed when the branch was renamed

@rustbot label +A-docs
…-test, r=nnethercote

test: add regression test for fuzzy_provenance_casts lint ICE

This PR adds a regression test for an ICE in `draw_code_line` that occurred when emitting a `fuzzy_provenance_casts` lint diagnostic for code with an inner attribute spanning the entire file, causing a panic on an empty `file_lines` from a dummy span.

The ICE no longer reproduces on the latest main. This PR only adds a regression test to prevent future regressions.
The test is based on the auto-reduced code from the issue.
rust-lang#137588
@rust-bors rust-bors bot added the rollup A PR which is a rollup label Mar 2, 2026
@rustbot rustbot added A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Mar 2, 2026
@rustbot rustbot added the T-libs Relevant to the library team, which will review and decide on the PR/issue. label Mar 2, 2026
@JonathanBrouwer
Copy link
Contributor Author

@bors r+ rollup=never p=5

@rust-bors
Copy link
Contributor

rust-bors bot commented Mar 2, 2026

📌 Commit 80a9870 has been approved by JonathanBrouwer

It is now in the queue for this repository.

@rust-bors rust-bors bot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 2, 2026
@JonathanBrouwer
Copy link
Contributor Author

Trying commonly failed jobs
@bors try jobs=test-various,x86_64-gnu-aux,x86_64-gnu-llvm-21-3,x86_64-msvc-1,aarch64-apple,x86_64-mingw-1

@rust-bors

This comment has been minimized.

rust-bors bot pushed a commit that referenced this pull request Mar 2, 2026
Rollup of 6 pull requests


try-job: test-various
try-job: x86_64-gnu-aux
try-job: x86_64-gnu-llvm-21-3
try-job: x86_64-msvc-1
try-job: aarch64-apple
try-job: x86_64-mingw-1
@rust-bors

This comment has been minimized.

@rust-bors
Copy link
Contributor

rust-bors bot commented Mar 2, 2026

☀️ Try build successful (CI)
Build commit: e5a6556 (e5a6556ac0daff5bf46ac9052cf1898302a3e41a, parent: ddd36bd57051f796850345b76c17e9402e28a9e4)

@rust-bors rust-bors bot added merged-by-bors This PR was explicitly merged by bors. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 2, 2026
@rust-bors
Copy link
Contributor

rust-bors bot commented Mar 2, 2026

☀️ Test successful - CI
Approved by: JonathanBrouwer
Duration: 3h 54m 35s
Pushing 8ddf4ef to main...

@rust-bors rust-bors bot merged commit 8ddf4ef into rust-lang:main Mar 2, 2026
13 checks passed
@rustbot rustbot added this to the 1.96.0 milestone Mar 2, 2026
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#152304 stabilize new RangeToInclusive type d7c57d626a6f2c6e394c1b3c7917d473893171c8 (link)
#153046 Couple of cg_ssa refactorings 0544a81487284601d7b830513d70cebf2c0c21c5 (link)
#153090 elf-raw-dylib: set type for functions 82df08f80c07a6e5b989c78a717a1ec3847d034f (link)
#153169 Various small query cleanups ef1fd9193d826d2a8f1b9d32a2248e6b8cbb250a (link)
#153225 tests/ui/asm: add annotations for reference rules 698d3f48c74fbffd7c84429d0c259dc812af054f (link)
#153233 test: add regression test for fuzzy_provenance_casts lint I… b25c82c6a3b0cca94da388a92daf2c0d71ba9916 (link)

previous master: 8d50bccc5b

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@github-actions
Copy link
Contributor

github-actions bot commented Mar 2, 2026

What is this? This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 8d50bcc (parent) -> 8ddf4ef (this PR)

Test differences

Show 34 test diffs

Stage 1

  • [ui] tests/ui/lint/ice-fuzzy-provenance-casts-with-inner-attr.rs: [missing] -> pass (J1)

Stage 2

  • [ui] tests/ui/lint/ice-fuzzy-provenance-casts-with-inner-attr.rs: [missing] -> pass (J0)

Additionally, 32 doctest diffs were found. These are ignored, as they are noisy.

Job group index

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard 8ddf4ef064fb702fed0f3d239ec8d0bac607484e --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

  1. x86_64-rust-for-linux: 42m 43s -> 52m 30s (+22.9%)
  2. x86_64-gnu-gcc: 55m 20s -> 1h 7m (+21.8%)
  3. x86_64-gnu-llvm-20-2: 1h 26m -> 1h 43m (+19.2%)
  4. dist-aarch64-apple: 1h 51m -> 2h 10m (+17.0%)
  5. aarch64-gnu-llvm-20-1: 52m 58s -> 1h (+14.8%)
  6. pr-check-1: 27m 42s -> 31m 10s (+12.5%)
  7. armhf-gnu: 1h 23m -> 1h 32m (+11.2%)
  8. x86_64-msvc-ext1: 2h 2m -> 2h 16m (+11.0%)
  9. i686-gnu-2: 1h 30m -> 1h 40m (+10.8%)
  10. x86_64-gnu-miri: 1h 21m -> 1h 28m (+9.4%)
How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (8ddf4ef): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results (primary -3.0%, secondary -1.9%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
5.7% [5.7%, 5.7%] 1
Improvements ✅
(primary)
-3.0% [-3.1%, -2.9%] 2
Improvements ✅
(secondary)
-5.7% [-7.8%, -3.5%] 2
All ❌✅ (primary) -3.0% [-3.1%, -2.9%] 2

Cycles

Results (secondary 0.7%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
3.7% [3.7%, 3.7%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.2% [-2.2%, -2.2%] 1
All ❌✅ (primary) - - 0

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 479.657s -> 480.113s (0.10%)
Artifact size: 396.97 MiB -> 396.96 MiB (-0.00%)

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

Labels

A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants