Skip to content

rustdoc: Correctly handle attribute merge if this is a glob reexport #120501

New issue

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

#

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

Already on GitHub? # to your account

Jump to bottom
Merged
merged 2 commits into from
Jan 31, 2024
Merged

rustdoc: Correctly handle attribute merge if this is a glob reexport #120501

merged 2 commits into from
Jan 31, 2024

Conversation

GuillaumeGomez
Copy link
Member

Fixes #120487.

The regression was introduced in #113091. Only non-glob reexports should have been impacted.

cc @Nemo157
r? @notriddle

@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 30, 2024
@notriddle
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Jan 30, 2024

📌 Commit 024364a has been approved by notriddle

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 30, 2024
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jan 30, 2024
@GuillaumeGomez
Rollup merge of rust-lang#120501 - GuillaumeGomez:glob-reexport-attr-…
d79cec1 
…merge-bugfix, r=notriddle

rustdoc: Correctly handle attribute merge if this is a glob reexport

Fixes rust-lang#120487.

The regression was introduced in rust-lang#113091. Only non-glob reexports should have been impacted.

cc `@Nemo157`
r? `@notriddle`
@GuillaumeGomez GuillaumeGomez mentioned this pull request Jan 30, 2024
Closed
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 30, 2024
@matthiaskrgr
Rollup merge of rust-lang#120501 - GuillaumeGomez:glob-reexport-attr-…
77b3b23 
…merge-bugfix, r=notriddle

rustdoc: Correctly handle attribute merge if this is a glob reexport

Fixes rust-lang#120487.

The regression was introduced in rust-lang#113091. Only non-glob reexports should have been impacted.

cc ``@Nemo157``
r? ``@notriddle``
@matthiaskrgr matthiaskrgr mentioned this pull request Jan 30, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 30, 2024
@bors
Auto merge of rust-lang#120512 - matthiaskrgr:rollup-gcqiihd, r=matth…
2c9bfbb 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#120207 (check `RUST_BOOTSTRAP_CONFIG` in `profile_user_dist` test)
 - rust-lang#120321 (pattern_analysis: cleanup the contexts)
 - rust-lang#120346 (hir: Refactor getters for owner nodes)
 - rust-lang#120396 (Account for unbounded type param receiver in suggestions)
 - rust-lang#120435 (Suggest name value cfg when only value is used for check-cfg)
 - rust-lang#120470 (Mark "unused binding" suggestion as maybe incorrect)
 - rust-lang#120495 (Remove the `abi_amdgpu_kernel` feature)
 - rust-lang#120501 (rustdoc: Correctly handle attribute merge if this is a glob reexport)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 30, 2024
@bors
Auto merge of rust-lang#120512 - matthiaskrgr:rollup-gcqiihd, r=matth…
79adec7 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#120207 (check `RUST_BOOTSTRAP_CONFIG` in `profile_user_dist` test)
 - rust-lang#120321 (pattern_analysis: cleanup the contexts)
 - rust-lang#120346 (hir: Refactor getters for owner nodes)
 - rust-lang#120396 (Account for unbounded type param receiver in suggestions)
 - rust-lang#120435 (Suggest name value cfg when only value is used for check-cfg)
 - rust-lang#120470 (Mark "unused binding" suggestion as maybe incorrect)
 - rust-lang#120495 (Remove the `abi_amdgpu_kernel` feature)
 - rust-lang#120501 (rustdoc: Correctly handle attribute merge if this is a glob reexport)

r? `@ghost`
`@rustbot` modify labels: rollup
Nadrieril added a commit to Nadrieril/rust that referenced this pull request Jan 31, 2024
@Nadrieril
Rollup merge of rust-lang#120501 - GuillaumeGomez:glob-reexport-attr-…
f93dbfc 
…merge-bugfix, r=notriddle

rustdoc: Correctly handle attribute merge if this is a glob reexport

Fixes rust-lang#120487.

The regression was introduced in rust-lang#113091. Only non-glob reexports should have been impacted.

cc ```@Nemo157```
r? ```@notriddle```
@Nadrieril Nadrieril mentioned this pull request Jan 31, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 31, 2024
@bors
Auto merge of rust-lang#120519 - Nadrieril:rollup-fup0akd, r=Nadrieril
6eac264 
Rollup of 12 pull requests

Successful merges:

 - rust-lang#120207 (check `RUST_BOOTSTRAP_CONFIG` in `profile_user_dist` test)
 - rust-lang#120321 (pattern_analysis: cleanup the contexts)
 - rust-lang#120323 (On E0277 be clearer about implicit `Sized` bounds on type params and assoc types)
 - rust-lang#120355 (document `FromIterator for Vec` allocation behaviors)
 - rust-lang#120396 (Account for unbounded type param receiver in suggestions)
 - rust-lang#120430 (std: thread_local::register_dtor fix proposal for FreeBSD.)
 - rust-lang#120435 (Suggest name value cfg when only value is used for check-cfg)
 - rust-lang#120470 (Mark "unused binding" suggestion as maybe incorrect)
 - rust-lang#120472 (Make duplicate lang items fatal)
 - rust-lang#120490 (Don't hash lints differently to non-lints.)
 - rust-lang#120495 (Remove the `abi_amdgpu_kernel` feature)
 - rust-lang#120501 (rustdoc: Correctly handle attribute merge if this is a glob reexport)

Failed merges:

 - rust-lang#120346 (hir: Refactor getters for owner nodes)

r? `@ghost`
`@rustbot` modify labels: rollup
Nadrieril added a commit to Nadrieril/rust that referenced this pull request Jan 31, 2024
@Nadrieril
Rollup merge of rust-lang#120501 - GuillaumeGomez:glob-reexport-attr-…
26b411e 
…merge-bugfix, r=notriddle

rustdoc: Correctly handle attribute merge if this is a glob reexport

Fixes rust-lang#120487.

The regression was introduced in rust-lang#113091. Only non-glob reexports should have been impacted.

cc ````@Nemo157````
r? ````@notriddle````
@Nadrieril Nadrieril mentioned this pull request Jan 31, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 31, 2024
@bors
Auto merge of rust-lang#120522 - Nadrieril:rollup-zexjiyc, r=Nadrieril
ec2e61f 
Rollup of 9 pull requests

Successful merges:

 - rust-lang#120207 (check `RUST_BOOTSTRAP_CONFIG` in `profile_user_dist` test)
 - rust-lang#120321 (pattern_analysis: cleanup the contexts)
 - rust-lang#120355 (document `FromIterator for Vec` allocation behaviors)
 - rust-lang#120430 (std: thread_local::register_dtor fix proposal for FreeBSD.)
 - rust-lang#120469 (Provide more context on derived obligation error primary label)
 - rust-lang#120470 (Mark "unused binding" suggestion as maybe incorrect)
 - rust-lang#120472 (Make duplicate lang items fatal)
 - rust-lang#120495 (Remove the `abi_amdgpu_kernel` feature)
 - rust-lang#120501 (rustdoc: Correctly handle attribute merge if this is a glob reexport)

r? `@ghost`
`@rustbot` modify labels: rollup
@Nadrieril Nadrieril mentioned this pull request Jan 31, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 31, 2024
@bors
Auto merge of rust-lang#120524 - Nadrieril:rollup-67952ib, r=Nadrieril
11f32b7 
Rollup of 9 pull requests

Successful merges:

 - rust-lang#120207 (check `RUST_BOOTSTRAP_CONFIG` in `profile_user_dist` test)
 - rust-lang#120321 (pattern_analysis: cleanup the contexts)
 - rust-lang#120355 (document `FromIterator for Vec` allocation behaviors)
 - rust-lang#120430 (std: thread_local::register_dtor fix proposal for FreeBSD.)
 - rust-lang#120469 (Provide more context on derived obligation error primary label)
 - rust-lang#120472 (Make duplicate lang items fatal)
 - rust-lang#120490 (Don't hash lints differently to non-lints.)
 - rust-lang#120495 (Remove the `abi_amdgpu_kernel` feature)
 - rust-lang#120501 (rustdoc: Correctly handle attribute merge if this is a glob reexport)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 4eaf4c2 into rust-lang:master Jan 31, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jan 31, 2024
@rust-timer
Unrolled build for rust-lang#120501
e768039 
Rollup merge of rust-lang#120501 - GuillaumeGomez:glob-reexport-attr-merge-bugfix, r=notriddle

rustdoc: Correctly handle attribute merge if this is a glob reexport

Fixes rust-lang#120487.

The regression was introduced in rust-lang#113091. Only non-glob reexports should have been impacted.

cc `````@Nemo157`````
r? `````@notriddle`````
@rustbot rustbot added this to the 1.77.0 milestone Jan 31, 2024
@GuillaumeGomez GuillaumeGomez deleted the glob-reexport-attr-merge-bugfix branch January 31, 2024 17:48
@GuillaumeGomez GuillaumeGomez mentioned this pull request Feb 1, 2024
Merged
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Feb 13, 2024
@matthiaskrgr
Rollup merge of rust-lang#120548 - GuillaumeGomez:glob-reexport-cfg-m…
5d9c899 
…erge, r=GuillaumeGomez

rustdoc: Fix handling of doc_auto_cfg feature for cfg attributes on glob reexport

This is a follow-up of rust-lang#120501 and a part of rust-lang#120487.

r? `@notriddle`
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Feb 13, 2024
@rust-timer
Unrolled build for rust-lang#120548
dac37af 
Rollup merge of rust-lang#120548 - GuillaumeGomez:glob-reexport-cfg-merge, r=GuillaumeGomez

rustdoc: Fix handling of doc_auto_cfg feature for cfg attributes on glob reexport

This is a follow-up of rust-lang#120501 and a part of rust-lang#120487.

r? `@notriddle`
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees

@notriddle notriddle

Labels
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
Milestone
1.77.0
Development

Successfully merging this pull request may close these issues.

Docs feature banner will not show on top level docs when using glob export
4 participants
@GuillaumeGomez @notriddle @bors @rustbot