resolve: Preserve ambiguous glob reexports in crate metadata #147984

petrochenkov · 2025-10-22T13:12:42Z

So in cross-crate scenarios they can work in the same way as in crate-local scenarios.

Resurrection of #114682.
One of unblocking steps for #145108.
Fixes #36837.

rustbot · 2025-10-22T13:12:47Z

rustbot has assigned @jdonszelmann.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

petrochenkov · 2025-10-22T13:13:01Z

@bors try

resolve: Preserve ambiguous glob reexports in crate metadata

petrochenkov · 2025-10-22T13:14:38Z

cc @LorrensP-2158466 @bvanjoi

rust-bors · 2025-10-22T15:32:03Z

☀️ Try build successful (CI)
Build commit: b4c5508 (b4c55082edd8dec08ce8af276d7054d9c4db20c4, parent: f5e2df741b4a9820a7579f0c8eccc951706a8782)

petrochenkov · 2025-10-22T15:33:22Z

@craterbot check

craterbot · 2025-10-22T15:33:47Z

👌 Experiment pr-147984 created and queued.
🤖 Automatically detected try build b4c5508
🔍 You can check out the queue and this experiment's details.

ℹ️ Crater is a tool to run experiments across parts of the Rust ecosystem. Learn more

craterbot · 2025-10-22T15:34:03Z

🚧 Experiment pr-147984 is now running

ℹ️ Crater is a tool to run experiments across parts of the Rust ecosystem. Learn more

craterbot · 2025-10-24T07:11:57Z

🎉 Experiment pr-147984 is completed!
📊 2312 regressed and 2 fixed (721923 total)
📊 1766 spurious results on the retry-regessed-list.txt, consider a retry¹ if this is a significant amount.
📰 Open the summary report.

⚠️ If you notice any spurious failure please add them to the denylist!
ℹ️ Crater is a tool to run experiments across parts of the Rust ecosystem. Learn more

re-run the experiment with crates=https://crater-reports.s3.amazonaws.com/pr-147984/retry-regressed-list.txt ↩

petrochenkov · 2025-10-24T12:28:34Z

That's a lot of breakage.
Mostly from dependencies, including various version of openssl that we've seen previously.
I'll demote this error to always be reported as a lint in cross-crate scenarios, and then rerun crater.

petrochenkov · 2025-10-24T12:58:17Z

@bors try

@craterbot run mode=check-only p=1 crates=https://crater-reports.s3.amazonaws.com/pr-147984/retry-regressed-list.txt

resolve: Preserve ambiguous glob reexports in crate metadata

rust-bors · 2025-10-24T15:17:26Z

☀️ Try build successful (CI)
Build commit: c6359cd (c6359cd3b4418e8472bae1a89c242796f2b86d56, parent: 75948c8bb3bd37f1e8ee20273a04edea4c1f84f8)

petrochenkov · 2025-10-24T15:24:38Z

@craterbot run mode=check-only p=1 crates=https://crater-reports.s3.amazonaws.com/pr-147984/retry-regressed-list.txt

craterbot · 2025-10-24T15:24:47Z

👌 Experiment pr-147984-1 created and queued.
🤖 Automatically detected try build c6359cd
🔍 You can check out the queue and this experiment's details.

ℹ️ Crater is a tool to run experiments across parts of the Rust ecosystem. Learn more

rustbot · 2025-12-06T00:19:56Z

Reminder, once the PR becomes ready for a review, use @rustbot ready.

petrochenkov · 2025-12-06T09:34:27Z

@rustbot ready

yaahc · 2025-12-08T19:26:48Z

tests/ui/imports/ambiguous-glob-vs-expanded-extern.stderr

+   = note: ambiguous because of multiple glob imports of a name in the same module
+note: `mac` could refer to the macro defined here
+  --> $DIR/auxiliary/glob-vs-expanded.rs:18:9
+   |
+LL | pub use m::*;
+   |         ^
+note: `mac` could also refer to the macro defined here
+  --> $DIR/auxiliary/glob-vs-expanded.rs:18:9
+   |
+LL | pub use m::*;
+   |         ^


This seems to be emitting the diagnostic as though it were a globvsglob rather than a globvsexpanded ambiguity.

I would expect it to say:

= note: ambiguous because of a conflict between a name from a glob import and a macro-expanded name in the same module during import or macro resolution note: `mac` could refer to the macro imported here

Removed the unnecessary glob reexport from the test for now.
The root issue here is sort of hard to fix, for that you need https://github.com/petrochenkov/rust/tree/neverwrite, but it is mostly blocked on #149195.

yaahc · 2025-12-08T19:32:53Z

go ahead and r=me once the issue with the diagnostic on the globvsexpanded test is corrected.

yaahc · 2025-12-08T19:33:04Z

@rustbot author

So in cross-crate scenarios they can work in the same way as in crate-local scenarios.

rustbot · 2025-12-09T10:52:14Z

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

petrochenkov · 2025-12-09T10:53:12Z

@bors r=yaahc

bors · 2025-12-09T10:53:15Z

📌 Commit 51780a5 has been approved by yaahc

It is now in the queue for this repository.

bors · 2025-12-09T16:22:58Z

⌛ Testing commit 51780a5 with merge c61a3a4...

bors · 2025-12-09T19:36:15Z

☀️ Test successful - checks-actions
Approved by: yaahc
Pushing c61a3a4 to main...

github-actions · 2025-12-09T19:39:08Z

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 e2893f7 (parent) -> c61a3a4 (this PR)

Test differences

Show 52 test diffs

Stage 1

[ui] tests/ui/imports/ambiguous-glob-vs-expanded-extern.rs: [missing] -> pass (J1)

Stage 2

[ui] tests/ui/imports/ambiguous-glob-vs-expanded-extern.rs: [missing] -> pass (J0)

Additionally, 50 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 c61a3a44d1a5bee35914cada6c788a05e0808f5b --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

pr-check-1: 1663.0s -> 2020.4s (+21.5%)
x86_64-gnu-llvm-20-2: 5110.6s -> 6097.8s (+19.3%)
x86_64-gnu-llvm-20: 2399.9s -> 2836.2s (+18.2%)
aarch64-apple: 9367.4s -> 10755.1s (+14.8%)
x86_64-gnu-tools: 3169.7s -> 3613.6s (+14.0%)
dist-apple-various: 4313.7s -> 4913.7s (+13.9%)
i686-gnu-nopt-1: 7405.3s -> 8424.0s (+13.8%)
x86_64-gnu-llvm-20-3: 5752.6s -> 6517.7s (+13.3%)
x86_64-gnu-gcc: 3003.9s -> 3400.4s (+13.2%)
aarch64-gnu-llvm-20-2: 2086.6s -> 2346.4s (+12.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-timer · 2025-12-09T20:17:51Z

Finished benchmarking commit (c61a3a4): comparison URL.

Overall result: ❌ regressions - 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.3%	[0.1%, 0.5%]	24
Regressions ❌ (secondary)	0.3%	[0.2%, 0.7%]	13
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-0.1%	[-0.1%, -0.1%]	1
All ❌✅ (primary)	0.3%	[0.1%, 0.5%]	24

Max RSS (memory usage)

Results (secondary 2.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)	4.9%	[4.5%, 5.2%]	2
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-0.9%	[-0.9%, -0.9%]	1
All ❌✅ (primary)	-	-	0

Cycles

Results (secondary -3.2%)

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
Improvements ✅ (secondary)	-3.2%	[-3.2%, -3.2%]	1
All ❌✅ (primary)	-	-	0

Binary size

Results (primary 0.2%, secondary 0.0%)

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

	mean	range	count
Regressions ❌ (primary)	0.2%	[0.2%, 0.2%]	8
Regressions ❌ (secondary)	0.0%	[0.0%, 0.0%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.2%	[0.2%, 0.2%]	8

Bootstrap: 471.528s -> 471.772s (0.05%)
Artifact size: 388.98 MiB -> 389.00 MiB (0.00%)

rustbot assigned jdonszelmann Oct 22, 2025

rustbot added 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 Oct 22, 2025

rust-bors bot added a commit that referenced this pull request Oct 22, 2025

Auto merge of #147984 - petrochenkov:expambig, r=<try>

b4c5508

resolve: Preserve ambiguous glob reexports in crate metadata

This comment has been minimized.

Sign in to view

petrochenkov added S-waiting-on-crater Status: Waiting on a crater run to be completed. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 22, 2025

craterbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-crater Status: Waiting on a crater run to be completed. labels Oct 24, 2025

petrochenkov added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 24, 2025

petrochenkov force-pushed the expambig branch from aa2fb6e to e388d62 Compare October 24, 2025 12:56

This comment has been minimized.

Sign in to view

rust-bors bot added a commit that referenced this pull request Oct 24, 2025

Auto merge of #147984 - petrochenkov:expambig, r=<try>

c6359cd

resolve: Preserve ambiguous glob reexports in crate metadata

petrochenkov added S-waiting-on-crater Status: Waiting on a crater run to be completed. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 24, 2025

petrochenkov force-pushed the expambig branch from 743dc68 to 255f6c3 Compare December 6, 2025 09:33

This comment has been minimized.

Sign in to view

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 6, 2025

This comment was marked as resolved.

Sign in to view

yaahc reviewed Dec 8, 2025

View reviewed changes

rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 8, 2025

resolve: Preserve ambiguous glob reexports in crate metadata

51780a5

So in cross-crate scenarios they can work in the same way as in crate-local scenarios.

petrochenkov force-pushed the expambig branch from 255f6c3 to 51780a5 Compare December 9, 2025 10:52

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 9, 2025

petrochenkov mentioned this pull request Dec 9, 2025

Support importing path-segment keyword with renaming #146972

Open

bors mentioned this pull request Dec 9, 2025

Make typo in field and name suggestions verbose #149816

Open

bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 9, 2025

bors merged commit c61a3a4 into rust-lang:main Dec 9, 2025
12 checks passed

rustbot added this to the 1.94.0 milestone Dec 9, 2025

rustbot added the perf-regression Performance regression. label Dec 9, 2025

bors mentioned this pull request Dec 9, 2025

resolve: Report more visibility-related early resolution ambiguities for imports #149596

Open

resolve: Preserve ambiguous glob reexports in crate metadata #147984

resolve: Preserve ambiguous glob reexports in crate metadata #147984

Uh oh!

Conversation

petrochenkov commented Oct 22, 2025 • edited by yaahc Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Oct 22, 2025

Uh oh!

petrochenkov commented Oct 22, 2025

Uh oh!

This comment has been minimized.

petrochenkov commented Oct 22, 2025

Uh oh!

rust-bors bot commented Oct 22, 2025

Uh oh!

petrochenkov commented Oct 22, 2025

Uh oh!

craterbot commented Oct 22, 2025

Uh oh!

craterbot commented Oct 22, 2025

Uh oh!

craterbot commented Oct 24, 2025

Footnotes

Uh oh!

petrochenkov commented Oct 24, 2025

Uh oh!

This comment has been minimized.

petrochenkov commented Oct 24, 2025

Uh oh!

This comment has been minimized.

rust-bors bot commented Oct 24, 2025

Uh oh!

petrochenkov commented Oct 24, 2025

Uh oh!

craterbot commented Oct 24, 2025

Uh oh!

rustbot commented Dec 6, 2025

Uh oh!

This comment has been minimized.

petrochenkov commented Dec 6, 2025

Uh oh!

This comment was marked as resolved.

yaahc Dec 8, 2025

Choose a reason for hiding this comment

Uh oh!

petrochenkov Dec 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

yaahc commented Dec 8, 2025

Uh oh!

yaahc commented Dec 8, 2025

Uh oh!

rustbot commented Dec 9, 2025

Uh oh!

petrochenkov commented Dec 9, 2025

Uh oh!

bors commented Dec 9, 2025

Uh oh!

bors commented Dec 9, 2025

Uh oh!

bors commented Dec 9, 2025

Uh oh!

Uh oh!

github-actions bot commented Dec 9, 2025

Test differences

Stage 1

Stage 2

Job duration changes

Uh oh!

rust-timer commented Dec 9, 2025

Overall result: ❌ regressions - please read the text below

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Reviewers

Assignees

petrochenkov commented Oct 22, 2025 •

edited by yaahc

Loading

petrochenkov Dec 9, 2025 •

edited

Loading