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

GuillaumeGomez · 2025-03-20T17:24:57Z

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

camelid · 2025-03-20T18:19:35Z

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

GuillaumeGomez · 2025-03-20T18:34:39Z

Awesome, thanks! :)

camelid

Thanks! Nice find.

camelid · 2025-03-23T06:34:29Z

@bors r+ rollup

bors · 2025-03-23T06:34:32Z

📌 Commit 9e6848b has been approved by camelid

It is now in the queue for this repository.

jieyouxu · 2025-03-23T06:46:33Z

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

GuillaumeGomez · 2025-03-23T08:55:11Z

I'll rebase once merged then. ;)

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

…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

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 · 2025-03-24T01:16:07Z

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

GuillaumeGomez · 2025-03-24T21:16:20Z

@bors r=camelid rollup

bors · 2025-03-24T21:16:22Z

📌 Commit d9f250a has been approved by camelid

It is now in the queue for this repository.

… 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`

… 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``

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

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

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```

rustbot assigned camelid Mar 20, 2025

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

This comment has been minimized.

Sign in to view

GuillaumeGomez force-pushed the rm-duplicated-loop branch from 8f8f02d to 9e6848b Compare March 20, 2025 18:33

camelid approved these changes Mar 23, 2025

View reviewed changes

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 mentioned this pull request Mar 23, 2025

Rollup of 9 pull requests #138853

Closed

compiler-errors mentioned this pull request Mar 23, 2025

Rollup of 12 pull requests #138866

Merged

jhpratt mentioned this pull request Mar 24, 2025

Rollup of 10 pull requests #138873

Merged

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

Remove duplicated loop when computing doc cfgs

d9f250a

GuillaumeGomez force-pushed the rm-duplicated-loop branch from 9e6848b to d9f250a Compare March 24, 2025 09:56

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 mentioned this pull request Mar 24, 2025

Implement RFC 3631: add rustdoc doc_cfg features #138907

Open

TaKO8Ki mentioned this pull request Mar 24, 2025

Rollup of 11 pull requests #138909

Closed

TaKO8Ki mentioned this pull request Mar 24, 2025

Rollup of 10 pull requests #138912

Closed

TaKO8Ki mentioned this pull request Mar 25, 2025

Rollup of 9 pull requests #138923

Merged

bors merged commit 07d0963 into rust-lang:master Mar 25, 2025
6 checks passed

rustbot added this to the 1.87.0 milestone Mar 25, 2025

GuillaumeGomez deleted the rm-duplicated-loop branch March 25, 2025 22:33

fmease mentioned this pull request May 20, 2025

doc_auto_cfg no longer applies a cfg badge to certain inlined cross-crate re-exported items with a #[cfg] #141301

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

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

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

Uh oh!

GuillaumeGomez commented Mar 20, 2025

Uh oh!

This comment has been minimized.

camelid commented Mar 20, 2025

Uh oh!

GuillaumeGomez commented Mar 20, 2025

Uh oh!

camelid left a comment

Uh oh!

camelid commented Mar 23, 2025

Uh oh!

bors commented Mar 23, 2025

Uh oh!

jieyouxu commented Mar 23, 2025 •

edited

Loading

Uh oh!

GuillaumeGomez commented Mar 23, 2025

Uh oh!

bors commented Mar 24, 2025

Uh oh!

GuillaumeGomez commented Mar 24, 2025

Uh oh!

bors commented Mar 24, 2025

Uh oh!

Uh oh!

Uh oh!

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

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

Uh oh!

Conversation

GuillaumeGomez commented Mar 20, 2025

Uh oh!

This comment has been minimized.

camelid commented Mar 20, 2025

Uh oh!

GuillaumeGomez commented Mar 20, 2025

Uh oh!

camelid left a comment

Choose a reason for hiding this comment

Uh oh!

camelid commented Mar 23, 2025

Uh oh!

bors commented Mar 23, 2025

Uh oh!

jieyouxu commented Mar 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

GuillaumeGomez commented Mar 23, 2025

Uh oh!

bors commented Mar 24, 2025

Uh oh!

GuillaumeGomez commented Mar 24, 2025

Uh oh!

bors commented Mar 24, 2025

Uh oh!

Uh oh!

Uh oh!

jieyouxu commented Mar 23, 2025 •

edited

Loading