Skip to content

Rollup of 3 pull requests#154039

Merged
rust-bors[bot] merged 13 commits intorust-lang:mainfrom
Zalathar:rollup-Emyd5AO
Mar 18, 2026
Merged

Rollup of 3 pull requests#154039
rust-bors[bot] merged 13 commits intorust-lang:mainfrom
Zalathar:rollup-Emyd5AO

Conversation

@Zalathar
Copy link
Member

@Zalathar Zalathar commented Mar 18, 2026

Successful merges:

r? @ghost

Create a similar rollup

mati865 and others added 13 commits March 17, 2026 21:21
@mati865
Refactor DllImport to better differentiate types
82727b0
@mati865
Extend raw-dylib to handle statics and TLS for ELF
2fad36b
@mati865
Set symbol size in raw-dylib for ELF
f365432
@mati865
Put statics in .data section in raw-dylib for ELF
3638155 
This fixes issues with statics when using static relocation model and
linking with GNU ld. Other linkers don't work yet.
@mati865
Set symbols value in raw-dylib for ELF
ed4afa5 
With this change LLD finally produces working binaries with static
relocation model.
@mati865
Extend raw-dylib test for ELF with reloc models
3531ed9
@aryannrd
Moved issue-23981 to tests/ui/macros
a9838dd
@aryannrd
Added test description and a link to github page for the relevant iss…
fb88575 
…ue to the test
@Zalathar
Move trait IntoQueryParam into its own file
4c16ba1 
Removing coherent and self-contained chunks of code from a catch-all "plumbing"
module is typically an improvement.

Giving the trait its own file also gets rid of the unhelpful `sealed` module
that it was previously in.
@Zalathar
Rename IntoQueryParam to IntoQueryKey and tweak some occurrences
38aaeef 
All methods that accept `impl IntoQueryKey<_>` have been adjusted to
consistently call `into_query_key` before doing anything else.

When a function with a conversion trait calls another function with the same
conversion trait, doing the conversion eagerly can reduce the overall number of
instantiations.
@Zalathar
Rollup merge of rust-lang#153580 - mati865:elf-raw-dylib-static-and-t…
c0172a3 
…ls, r=bjorn3

Handle statics and TLS in raw-dylib for ELF

Follow-up to rust-lang#153090
@Zalathar
Rollup merge of rust-lang#154020 - aryannrd:move-issue-23891, r=JohnT…
3cfde0e 
…itor

Moved tests/ui/issues/issue-23891.rs to tests/ui/macros/
@Zalathar
Rollup merge of rust-lang#154028 - Zalathar:into-query-key, r=nnether…
205d100 
…cote

Rename trait `IntoQueryParam` to `IntoQueryKey`

This is in line with the general trend towards consistently referring to a query method parameter/argument as a “key”.

In addition to the actual renaming, this PR also moves the trait out of `plumbing` and into its own file, and tweaks some of the occurrences of the trait to be more consistent with each other.

r? nnethercote
@rust-bors rust-bors bot added the rollup A PR which is a rollup label Mar 18, 2026
@rustbot rustbot added A-run-make Area: port run-make Makefiles to rmake.rs 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 18, 2026
@Zalathar
Copy link
Member Author

Zalathar commented Mar 18, 2026

Rollup of everything.

@bors r+ rollup=never p=5

@rust-bors
Copy link
Contributor

rust-bors bot commented Mar 18, 2026

📌 Commit 205d100 has been approved by Zalathar

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 18, 2026
@rust-bors

This comment has been minimized.

Sign in to view
@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 18, 2026
@rust-bors
Copy link
Contributor

rust-bors bot commented Mar 18, 2026

☀️ Test successful - CI
Approved by: Zalathar
Duration: 3h 50m 10s
Pushing 53d60bb to main...

@rust-bors rust-bors bot merged commit 53d60bb into rust-lang:main Mar 18, 2026
12 checks passed
@rustbot rustbot added this to the 1.96.0 milestone Mar 18, 2026
@github-actions
Copy link
Contributor

github-actions bot commented Mar 18, 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 70dd5b8 (parent) -> 53d60bb (this PR)

Test differences

Show 6 test diffs

Stage 1

  • [ui] tests/ui/issues/issue-23891.rs: pass -> [missing] (J0)
  • [ui] tests/ui/macros/macro-in-or-pattern.rs: [missing] -> pass (J0)

Stage 2

  • [ui] tests/ui/issues/issue-23891.rs: pass -> [missing] (J1)
  • [ui] tests/ui/macros/macro-in-or-pattern.rs: [missing] -> pass (J1)

Additionally, 2 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 53d60bb1c5d325b43419c7618287a1405dec36d0 --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. aarch64-gnu-debug: 1h 5m -> 1h 16m (+16.9%)
  2. x86_64-gnu-tools: 55m 15s -> 1h 3m (+14.2%)
  3. i686-gnu-nopt-1: 2h 6m -> 2h 24m (+14.1%)
  4. x86_64-msvc-2: 3h 1m -> 2h 36m (-13.4%)
  5. pr-check-1: 27m 57s -> 31m 38s (+13.1%)
  6. x86_64-gnu-gcc: 1h 1m -> 1h 8m (+11.6%)
  7. x86_64-gnu-llvm-21: 1h 10m -> 1h 18m (+11.4%)
  8. dist-apple-various: 1h 46m -> 1h 34m (-11.1%)
  9. aarch64-gnu-llvm-21-1: 52m 8s -> 57m 51s (+11.0%)
  10. dist-x86_64-msvc-alt: 3h 8m -> 2h 49m (-10.5%)
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-bors rust-bors bot mentioned this pull request Mar 18, 2026
Draft
@rust-timer
Copy link
Collaborator

rust-timer commented Mar 18, 2026

Finished benchmarking commit (53d60bb): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -0.2% [-0.3%, -0.1%] 6
All ❌✅ (primary) - - 0

Max RSS (memory usage)

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

Cycles

Results (primary 4.4%, secondary 5.4%)

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

mean range count
Regressions ❌
(primary)		 4.4% [4.4%, 4.4%] 1
Regressions ❌
(secondary)		 5.4% [4.0%, 6.8%] 2
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 4.4% [4.4%, 4.4%] 1

Binary size

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

Bootstrap: 480.328s -> 479.87s (-0.10%)
Artifact size: 396.95 MiB -> 397.03 MiB (0.02%)

@Zalathar Zalathar deleted the rollup-Emyd5AO branch March 18, 2026 21:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

A-run-make Area: port run-make Makefiles to rmake.rs 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.

Projects

None yet

Milestone

1.96.0

Development

Successfully merging this pull request may close these issues.

5 participants

@Zalathar @rust-timer @rustbot @mati865 @aryannrd