Rollup of 3 pull requests by matthiaskrgr · Pull Request #150682 · rust-lang/rust

matthiaskrgr · 2026-01-04T20:14:06Z

Successful merges:

resolve: Split Scope::Module into two scopes for non-glob and glob bindings #149681 (resolve: Split Scope::Module into two scopes for non-glob and glob bindings )
Update offload test and verify that tgt_(un)register_lib have the right type #150426 (Update offload test and verify that tgt_(un)register_lib have the right type)
relate.rs: tiny cleanup: eliminate temp vars #150678 (relate.rs: tiny cleanup: eliminate temp vars)

r? @ghost
@rustbot modify labels: rollup

…d the innermost binding. Previously we could lose the already found binding and break with an error, if some blocking error was found in the shadowed scopes. Also, avoid some impossible state in the return type of `fn resolve_ident_in_scope`.

…bindings

in the same module to the usual ambiguity infra in `resolve_ident_in_scope_set`

for looking up a name in two scopes inside a module - non-glob and glob bindings.

…ings in the same module to the usual ambiguity infra in `resolve_ident_in_scope_set`

…ious commit

… scopes

It can only be `GlobVsGlob` now.

resolve: Split `Scope::Module` into two scopes for non-glob and glob bindings This is a re-implementation of rust-lang#144131 with all the issues mentioned there fixed. As it turned out, the non-trivial part of the split was already done in rust-lang@c91b6ca, so the remaining part implemented in this PR is *mostly* mechanical. After addressing the issue of already found bindings being lost due to indeterminacies in outer scopes (rust-lang@7e890bf) and adding one missing `Stage::Late` in `Finalize` the scope splitting refactoring just worked. (One more ICE was revealed by the refactoring, but not caused by it, fixed up in the last commit.) This is a part of implementation for the [Open API](https://rust-lang.github.io/rust-project-goals/2025h1/open-namespaces.html) proposal.

…idtwco Update offload test and verify that tgt_(un)register_lib have the right type Apparently, we weren't running offload tests when Enzyme wasn't built. Time to fix that. Also adds a test mode which generates the host IR, but does not expect device IR/artifacts. This way, we don't have to handle artifacts and paths in our tests. Also removes some outdated documentation. cc `@Kevinsala,` `@Sa4dUs` closes: rust-lang#150415 ~~blocked on `needs-offload` infrastructure landing in rust-lang#150427

relate.rs: tiny cleanup: eliminate temp vars

matthiaskrgr · 2026-01-04T20:18:46Z

@bors r+ rollup=never p=5

bors · 2026-01-04T20:18:49Z

📌 Commit 8b1f449 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2026-01-04T21:47:19Z

⌛ Testing commit 8b1f449 with merge 451b7b6...

bors · 2026-01-05T01:04:51Z

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 451b7b6 to main...

rust-timer · 2026-01-05T01:05:45Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#149681	resolve: Split `Scope::Module` into two scopes for non-glob…	`1782736a28024a68de3f94a524c6416f9281aa0f` (link)
#150426	Update offload test and verify that tgt_(un)register_lib ha…	`2f0b279fb684d5127dcf271c6ba2cf7e0aaa34b1` (link)
#150678	relate.rs: tiny cleanup: eliminate temp vars	`c75d975a4271df21364abf1c675039cb3c328463` (link)

previous master: e29fcf45e4

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 · 2026-01-05T01:07:54Z

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 e29fcf4 (parent) -> 451b7b6 (this PR)

Test differences

Show 46 test diffs

Stage 1

[ui] tests/ui/imports/overwritten-glob-ambig.rs: [missing] -> pass (J0)
[codegen] tests/codegen-llvm/gpu_offload/gpu_host.rs: ignore (ignored when LLVM Enzyme is disabled or LLVM is not the default codegen backend) -> ignore (ignored when LLVM Offload is disabled or LLVM is not the default codegen backend) (J2)

Stage 2

[codegen] tests/codegen-llvm/gpu_offload/gpu_host.rs: ignore (ignored when LLVM Enzyme is disabled or LLVM is not the default codegen backend) -> ignore (ignored when LLVM Offload is disabled or LLVM is not the default codegen backend) (J1)
[ui] tests/ui/imports/overwritten-glob-ambig.rs: [missing] -> pass (J3)

Additionally, 42 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 451b7b6c775a2378fd18d2560bbfb31c3695d1cc --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

dist-aarch64-linux: 8698.5s -> 6446.2s (-25.9%)
x86_64-rust-for-linux: 2721.9s -> 3191.3s (+17.2%)
pr-check-1: 1680.7s -> 1936.2s (+15.2%)
x86_64-gnu-llvm-20-3: 6173.7s -> 7088.2s (+14.8%)
x86_64-gnu-tools: 3175.7s -> 3624.9s (+14.1%)
aarch64-gnu-llvm-20-2: 2792.9s -> 3164.4s (+13.3%)
i686-gnu-1: 7431.2s -> 8392.3s (+12.9%)
x86_64-gnu-gcc: 3049.7s -> 3419.7s (+12.1%)
dist-x86_64-apple: 7311.9s -> 6525.8s (-10.8%)
pr-check-2: 2327.4s -> 2558.6s (+9.9%)

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 · 2026-01-05T01:56:31Z

Finished benchmarking commit (451b7b6): comparison URL.

Overall result: ❌✅ regressions and improvements - please read the text below

Our benchmarks found a performance regression caused by this PR.
This might be an actual regression, but it can also be just noise.

Next Steps:

If the regression was expected or you think it can be justified,
please write a comment with sufficient written justification, and add
@rustbot label: +perf-regression-triaged to it, to mark the regression as triaged.
If you think that you know of a way to resolve the regression, try to create
a new PR with a fix for the regression.
If you do not understand the regression or you think that it is just noise,
you can ask the @rust-lang/wg-compiler-performance working group for help (members of this group
were already notified of this PR).

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

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.5%	[0.1%, 1.5%]	154
Regressions ❌ (secondary)	0.7%	[0.0%, 3.5%]	87
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-0.1%	[-0.1%, -0.1%]	4
All ❌✅ (primary)	0.5%	[0.1%, 1.5%]	154

Max RSS (memory usage)

Results (primary 0.0%, secondary -0.3%)

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

	mean	range	count
Regressions ❌ (primary)	2.1%	[2.1%, 2.1%]	1
Regressions ❌ (secondary)	1.3%	[1.3%, 1.4%]	3
Improvements ✅ (primary)	-2.0%	[-2.0%, -2.0%]	1
Improvements ✅ (secondary)	-2.8%	[-3.0%, -2.6%]	2
All ❌✅ (primary)	0.0%	[-2.0%, 2.1%]	2

Cycles

Results (secondary 3.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)	5.1%	[1.6%, 8.3%]	5
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-3.5%	[-3.5%, -3.5%]	1
All ❌✅ (primary)	-	-	0

Binary size

Results (primary -0.1%, secondary -0.1%)

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)	-	-	0
Improvements ✅ (primary)	-0.1%	[-0.1%, -0.0%]	35
Improvements ✅ (secondary)	-0.1%	[-0.1%, -0.0%]	21
All ❌✅ (primary)	-0.1%	[-0.1%, -0.0%]	35

Bootstrap: 475.648s -> 477.322s (0.35%)
Artifact size: 390.89 MiB -> 390.73 MiB (-0.04%)

Kobzol · 2026-01-06T08:24:10Z

The regression was caused by #149681, continuing discussion there.

@rustbot label: +perf-regression-triaged

petrochenkovand others added 13 commits January 2, 2026 14:00

resolve: Split Scope::Module into two scopes for non-glob and glob …
75d9009
…bindings

resolve: Migrate a special ambiguity for glob vs non-glob bindings
bcfbb56
in the same module to the usual ambiguity infra in `resolve_ident_in_scope_set`

resolve: Introduce ScopeSet::Module
d7d4924
for looking up a name in two scopes inside a module - non-glob and glob bindings.

resolve: Migrate one more special ambiguity for glob vs non-glob bind…
0016a71
…ings in the same module to the usual ambiguity infra in `resolve_ident_in_scope_set`

resolve: Patch up an inconsistent resolution ICE revealed by the prev…
78c61be
…ious commit

resolve: Avoid additional ambiguities from splitting modules into two…
2e123ae
… scopes

metadata: Stop keeping AmbiguityKind in name bindings
3f3db93
It can only be `GlobVsGlob` now.

Update test and verify that tgt_(un)register_lib have the right type
fa584fa

relate.rs: tiny cleanup: eliminate temp vars
359f060

Rollup merge ofrust-lang#150678- hkBst:relate-1, r=Kivooeo
8b1f449
relate.rs: tiny cleanup: eliminate temp vars

bors 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 Jan 4, 2026

bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 5, 2026

bors merged commit 451b7b6 into rust-lang:mainJan 5, 2026
12 checks passed

rustbot added this to the 1.94.0 milestone Jan 5, 2026

bors mentioned this pull request Jan 5, 2026
resolve: Factor out and document the glob binding overwriting logic #150502
Merged

bors mentioned this pull request Jan 5, 2026
Support importing path-segment keyword with renaming #146972
Merged

bors mentioned this pull request Jan 5, 2026
Explicitly export core and std macros #139493
Merged

rustbot added the perf-regression Performance regression. label Jan 5, 2026

Kobzol mentioned this pull request Jan 5, 2026
resolve: Split Scope::Module into two scopes for non-glob and glob bindings #149681
Merged

rustbot added the perf-regression-triaged The performance regression has been triaged. label Jan 6, 2026

github-actionsBot mentioned this pull request Jan 27, 2026
Toolchain upgrade to nightly-2026-02-09 flux-rs/flux#1345
Closed

khyperia mentioned this pull request Aug 20, 2026
Add regression test for inconsistent import resolution from issue 147208 #161302
Merged

Navigation Menu

Uh oh!

Uh oh!

Rollup of 3 pull requests - #150682

Rollup of 3 pull requests#150682
bors merged 13 commits into
rust-lang:mainfrom
matthiaskrgr:rollup-jrkhivl

matthiaskrgr commented Jan 4, 2026•
edited by rustbot
Loading

Uh oh!

matthiaskrgr commented Jan 4, 2026

Uh oh!

bors commented Jan 4, 2026

Uh oh!

bors commented Jan 4, 2026

Uh oh!

bors commented Jan 5, 2026

Uh oh!

Uh oh!

rust-timer commented Jan 5, 2026

Uh oh!

github-actionsBot commented Jan 5, 2026

Stage 1

Stage 2

Uh oh!

rust-timer commented Jan 5, 2026

Uh oh!

Kobzol commented Jan 6, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

Uh oh!

Uh oh!

Conversation

matthiaskrgr commented Jan 4, 2026• edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

matthiaskrgr commented Jan 4, 2026

Uh oh!

bors commented Jan 4, 2026

Uh oh!

bors commented Jan 4, 2026

Uh oh!

bors commented Jan 5, 2026

Uh oh!

Uh oh!

rust-timer commented Jan 5, 2026

Uh oh!

github-actionsBot commented Jan 5, 2026

Test differences

Stage 1

Stage 2

Job duration changes

Uh oh!

rust-timer commented Jan 5, 2026

Overall result: ❌✅ regressions and improvements - please read the text below

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Kobzol commented Jan 6, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

matthiaskrgr commented Jan 4, 2026•
edited by rustbot
Loading