Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rustdoc: Fix glob import inlining #106952

Merged
merged 1 commit into from
Jan 18, 2023
Merged

rustdoc: Fix glob import inlining #106952

merged 1 commit into from
Jan 18, 2023

Conversation

petrochenkov
Copy link
Contributor

Filter away names that are not actually imported by the glob, e.g. because they are shadowed by something else.

Fixes the issue found in #94857 (comment).

Filter away names that are not actually imported by the glob, e.g. because they are shadowed by something else
@rustbot
Copy link
Collaborator

rustbot commented Jan 16, 2023

r? @notriddle

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Jan 16, 2023
@GuillaumeGomez
Copy link
Member

Looks good to me, thanks! r=me once CI pass

@notriddle
Copy link
Contributor

Looks like a reasonable fix. It might have a perf impact, so:

@bors r=notriddle,GuillaumeGomez rollup=never

@bors
Copy link
Contributor

bors commented Jan 16, 2023

📌 Commit 3b0d306 has been approved by notriddle,GuillaumeGomez

It is now in the queue for this repository.

@bors 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 16, 2023
@bors
Copy link
Contributor

bors commented Jan 18, 2023

⌛ Testing commit 3b0d306 with merge aaa9bb9...

@bors
Copy link
Contributor

bors commented Jan 18, 2023

☀️ Test successful - checks-actions
Approved by: notriddle,GuillaumeGomez
Pushing aaa9bb9 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 18, 2023
@bors bors merged commit aaa9bb9 into rust-lang:master Jan 18, 2023
@rustbot rustbot added this to the 1.68.0 milestone Jan 18, 2023
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (aaa9bb9): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

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

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

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

Cycles

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants