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.

Sign up for GitHub

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

Jump to bottom

[rustdoc] Remove duplicated loop when computing doc cfgs #138755

Merged
merged 1 commit into from
Mar 25, 2025
Merged

[rustdoc] Remove duplicated loop when computing doc cfgs #138755

merged 1 commit into from
Mar 25, 2025
+21 −38

Conversation

GuillaumeGomez
Copy link
Member

Working on implementing https://github.com/rust-lang/rfcs/blob/master/text/3631-rustdoc-cfgs-handling.md and found this weird case where the first loop was actually not doing anything since we were passing cfg(...) to Cfg::parse instead of cfg(...) items.

Well, that should be a first nice cleanup before the rest comes in.

cc @notriddle
r? @camelid

@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 Mar 20, 2025
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@camelid
Copy link
Member

camelid commented Mar 20, 2025

Thanks! Should be able to take a look this weekend.

@GuillaumeGomez
Copy link
Member Author

Awesome, thanks! :)

camelid
camelid approved these changes Mar 23, 2025
View reviewed changes
Copy link
Member

@camelid camelid left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Nice find.

@camelid
Copy link
Member

camelid commented Mar 23, 2025

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Mar 23, 2025

📌 Commit 9e6848b has been approved by camelid

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 Mar 23, 2025
@jieyouxu jieyouxu mentioned this pull request Mar 23, 2025
Closed
@jieyouxu
Copy link
Member

jieyouxu commented Mar 23, 2025 •
edited
Loading

FYI this probably merge-conflicts with #138293 (noticed in rollup #138853).

@GuillaumeGomez
Copy link
Member Author

I'll rebase once merged then. ;)

bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 23, 2025
@bors
Auto merge of rust-lang#138853 - jieyouxu:rollup-ogjxuq9, r=jieyouxu
ec48f81 
Rollup of 9 pull requests

Successful merges:

 - rust-lang#138236 (uefi: Add OwnedEvent abstraction)
 - rust-lang#138293 (rustdoc: Gate unstable `doc(cfg())` predicates)
 - rust-lang#138509 (Add test to ensure no index out of bounds panic (rust-lang#135474))
 - rust-lang#138602 (Slim `rustc_parse_format` dependencies down)
 - rust-lang#138631 (Update test for SGX now implementing `read_buf`)
 - rust-lang#138641 (Add unstable `--print=supported-crate-types` option)
 - rust-lang#138662 (Implement some basics in UEFI fs)
 - rust-lang#138837 (resolve: Avoid remaining unstable iteration)
 - rust-lang#138849 (doc: rename reference #create-a-configtoml to #create-a-bootstraptoml)

Failed merges:

 - rust-lang#138755 ([rustdoc] Remove duplicated loop when computing doc cfgs)

r? `@ghost`
`@rustbot` modify labels: rollup
@compiler-errors compiler-errors mentioned this pull request Mar 23, 2025
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 23, 2025
@bors
Auto merge of rust-lang#138866 - compiler-errors:rollup-9d8v3mz, r=co…
2120459 
…mpiler-errors

Rollup of 12 pull requests

Successful merges:

 - rust-lang#136040 (Remove unused trait BoundedSize)
 - rust-lang#138236 (uefi: Add OwnedEvent abstraction)
 - rust-lang#138293 (rustdoc: Gate unstable `doc(cfg())` predicates)
 - rust-lang#138509 (Add test to ensure no index out of bounds panic (rust-lang#135474))
 - rust-lang#138545 (Add MIR pre-codegen tests to track rust-lang#138544)
 - rust-lang#138631 (Update test for SGX now implementing `read_buf`)
 - rust-lang#138641 (Add unstable `--print=supported-crate-types` option)
 - rust-lang#138667 (std: uefi: fs: Implement mkdir)
 - rust-lang#138849 (doc: rename reference #create-a-configtoml to #create-a-bootstraptoml)
 - rust-lang#138854 (Fix ICE rust-lang#138415 for invalid extern function body)
 - rust-lang#138858 (Say which test failed the `COMPILETEST_REQUIRE_ALL_LLVM_COMPONENTS` assertion)
 - rust-lang#138861 (Tweak type flags, fix missing flags from coroutine kind ty)

Failed merges:

 - rust-lang#138755 ([rustdoc] Remove duplicated loop when computing doc cfgs)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 23, 2025
@bors
Auto merge of rust-lang#138866 - compiler-errors:rollup-9d8v3mz, r=co…
7290b04 
…mpiler-errors

Rollup of 12 pull requests

Successful merges:

 - rust-lang#136040 (Remove unused trait BoundedSize)
 - rust-lang#138236 (uefi: Add OwnedEvent abstraction)
 - rust-lang#138293 (rustdoc: Gate unstable `doc(cfg())` predicates)
 - rust-lang#138509 (Add test to ensure no index out of bounds panic (rust-lang#135474))
 - rust-lang#138545 (Add MIR pre-codegen tests to track rust-lang#138544)
 - rust-lang#138631 (Update test for SGX now implementing `read_buf`)
 - rust-lang#138641 (Add unstable `--print=supported-crate-types` option)
 - rust-lang#138667 (std: uefi: fs: Implement mkdir)
 - rust-lang#138849 (doc: rename reference #create-a-configtoml to #create-a-bootstraptoml)
 - rust-lang#138854 (Fix ICE rust-lang#138415 for invalid extern function body)
 - rust-lang#138858 (Say which test failed the `COMPILETEST_REQUIRE_ALL_LLVM_COMPONENTS` assertion)
 - rust-lang#138861 (Tweak type flags, fix missing flags from coroutine kind ty)

Failed merges:

 - rust-lang#138755 ([rustdoc] Remove duplicated loop when computing doc cfgs)

r? `@ghost`
`@rustbot` modify labels: rollup
@jhpratt jhpratt mentioned this pull request Mar 24, 2025
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 24, 2025
@bors
Auto merge of rust-lang#138873 - jhpratt:rollup-tggrbxl, r=jhpratt
ae8ab87 
Rollup of 10 pull requests

Successful merges:

 - rust-lang#137593 (fix download-llvm logic for subtree sync branches)
 - rust-lang#137736 (Don't attempt to export compiler-builtins symbols from rust dylibs)
 - rust-lang#138135 (Simplify `PartialOrd` on tuples containing primitives)
 - rust-lang#138321 ([bootstrap] Distribute split debuginfo if present)
 - rust-lang#138574 (rustdoc: be more strict about "Methods from Deref")
 - rust-lang#138606 (Fix missing rustfmt in msi installer - cont)
 - rust-lang#138671 (Fix `FileType` `PartialEq` implementation on Windows)
 - rust-lang#138728 (Update `compiler-builtins` to 0.1.152)
 - rust-lang#138783 (Cache current_dll_path output)
 - rust-lang#138846 (Tweaks to writeback and `Obligation -> Goal` conversion)

Failed merges:

 - rust-lang#138755 ([rustdoc] Remove duplicated loop when computing doc cfgs)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
Copy link
Contributor

bors commented Mar 24, 2025

☔ The latest upstream changes (presumably #138866) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 24, 2025
@GuillaumeGomez
Copy link
Member Author

@bors r=camelid rollup

@bors
Copy link
Contributor

bors commented Mar 24, 2025

📌 Commit d9f250a has been approved by camelid

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 24, 2025
@GuillaumeGomez GuillaumeGomez mentioned this pull request Mar 24, 2025
Draft
TaKO8Ki added a commit to TaKO8Ki/rust that referenced this pull request Mar 24, 2025
@TaKO8Ki
Rollup merge of rust-lang#138755 - GuillaumeGomez:rm-duplicated-loop,…
5922e91 
… r=camelid

[rustdoc] Remove duplicated loop when computing doc cfgs

Working on implementing https://github.com/rust-lang/rfcs/blob/master/text/3631-rustdoc-cfgs-handling.md and found this weird case where the first loop was actually not doing anything since we were passing `cfg(...)` to `Cfg::parse` instead of `cfg(...)` items.

Well, that should be a first nice cleanup before the rest comes in.

cc `@notriddle`
r? `@camelid`
@TaKO8Ki TaKO8Ki mentioned this pull request Mar 24, 2025
Closed
TaKO8Ki added a commit to TaKO8Ki/rust that referenced this pull request Mar 24, 2025
@TaKO8Ki
Rollup merge of rust-lang#138755 - GuillaumeGomez:rm-duplicated-loop,…
ee339f6 
… r=camelid

[rustdoc] Remove duplicated loop when computing doc cfgs

Working on implementing https://github.com/rust-lang/rfcs/blob/master/text/3631-rustdoc-cfgs-handling.md and found this weird case where the first loop was actually not doing anything since we were passing `cfg(...)` to `Cfg::parse` instead of `cfg(...)` items.

Well, that should be a first nice cleanup before the rest comes in.

cc ``@notriddle``
r? ``@camelid``
@TaKO8Ki TaKO8Ki mentioned this pull request Mar 24, 2025
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 25, 2025
@bors
Auto merge of rust-lang#138912 - TaKO8Ki:rollup-optkc3z, r=TaKO8Ki
9e0c777 
Rollup of 10 pull requests

Successful merges:

 - rust-lang#138385 (Keyword tweaks)
 - rust-lang#138580 (resolve: Avoid some unstable iteration 2)
 - rust-lang#138652 (Reintroduce remote-test support in run-make tests)
 - rust-lang#138701 (Make default_codegen_backend serializable)
 - rust-lang#138755 ([rustdoc] Remove duplicated loop when computing doc cfgs)
 - rust-lang#138829 (Slightly reword triagebot ping message for `relnotes-interest-group`)
 - rust-lang#138837 (resolve: Avoid remaining unstable iteration)
 - rust-lang#138838 (Fix/tweak some tests in new solver)
 - rust-lang#138877 (Ignore doctests only in specified targets)
 - rust-lang#138895 (Add a helper for building an owner id in ast lowering)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 25, 2025
@bors
Auto merge of rust-lang#138912 - TaKO8Ki:rollup-optkc3z, r=TaKO8Ki
eacae09 
Rollup of 10 pull requests

Successful merges:

 - rust-lang#138385 (Keyword tweaks)
 - rust-lang#138580 (resolve: Avoid some unstable iteration 2)
 - rust-lang#138652 (Reintroduce remote-test support in run-make tests)
 - rust-lang#138701 (Make default_codegen_backend serializable)
 - rust-lang#138755 ([rustdoc] Remove duplicated loop when computing doc cfgs)
 - rust-lang#138829 (Slightly reword triagebot ping message for `relnotes-interest-group`)
 - rust-lang#138837 (resolve: Avoid remaining unstable iteration)
 - rust-lang#138838 (Fix/tweak some tests in new solver)
 - rust-lang#138877 (Ignore doctests only in specified targets)
 - rust-lang#138895 (Add a helper for building an owner id in ast lowering)

r? `@ghost`
`@rustbot` modify labels: rollup
@TaKO8Ki TaKO8Ki mentioned this pull request Mar 25, 2025
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 25, 2025
@bors
Auto merge of rust-lang#138923 - TaKO8Ki:rollup-f3hkmqj, r=TaKO8Ki
15df8ec 
Rollup of 9 pull requests

Successful merges:

 - rust-lang#138385 (Keyword tweaks)
 - rust-lang#138580 (resolve: Avoid some unstable iteration 2)
 - rust-lang#138652 (Reintroduce remote-test support in run-make tests)
 - rust-lang#138701 (Make default_codegen_backend serializable)
 - rust-lang#138755 ([rustdoc] Remove duplicated loop when computing doc cfgs)
 - rust-lang#138829 (Slightly reword triagebot ping message for `relnotes-interest-group`)
 - rust-lang#138837 (resolve: Avoid remaining unstable iteration)
 - rust-lang#138838 (Fix/tweak some tests in new solver)
 - rust-lang#138895 (Add a helper for building an owner id in ast lowering)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 25, 2025
@bors
Auto merge of rust-lang#138923 - TaKO8Ki:rollup-f3hkmqj, r=TaKO8Ki
48994b1 
Rollup of 9 pull requests

Successful merges:

 - rust-lang#138385 (Keyword tweaks)
 - rust-lang#138580 (resolve: Avoid some unstable iteration 2)
 - rust-lang#138652 (Reintroduce remote-test support in run-make tests)
 - rust-lang#138701 (Make default_codegen_backend serializable)
 - rust-lang#138755 ([rustdoc] Remove duplicated loop when computing doc cfgs)
 - rust-lang#138829 (Slightly reword triagebot ping message for `relnotes-interest-group`)
 - rust-lang#138837 (resolve: Avoid remaining unstable iteration)
 - rust-lang#138838 (Fix/tweak some tests in new solver)
 - rust-lang#138895 (Add a helper for building an owner id in ast lowering)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 07d0963 into rust-lang:master Mar 25, 2025
6 checks passed
@rustbot rustbot added this to the 1.87.0 milestone Mar 25, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Mar 25, 2025
@rust-timer
Unrolled build for rust-lang#138755
53f6741 
Rollup merge of rust-lang#138755 - GuillaumeGomez:rm-duplicated-loop, r=camelid

[rustdoc] Remove duplicated loop when computing doc cfgs

Working on implementing https://github.com/rust-lang/rfcs/blob/master/text/3631-rustdoc-cfgs-handling.md and found this weird case where the first loop was actually not doing anything since we were passing `cfg(...)` to `Cfg::parse` instead of `cfg(...)` items.

Well, that should be a first nice cleanup before the rest comes in.

cc ```@notriddle```
r? ```@camelid```
@GuillaumeGomez GuillaumeGomez deleted the rm-duplicated-loop branch March 25, 2025 22:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@camelid camelid camelid approved these changes

Assignees

@camelid camelid

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.87.0
Development

Successfully merging this pull request may close these issues.
6 participants
@GuillaumeGomez @rust-log-analyzer @camelid @bors @jieyouxu @rustbot