Implement `#[cfg]` in `where` clauses #132388

frank-king · 2024-10-31T06:11:52Z

This PR implements #115590, which supports #[cfg] attributes in where clauses.

The biggest change is, that it adds AttrsVec and NodeId to the ast::WherePredicate and HirId to the hir::WherePredicate.

rustbot · 2024-10-31T06:12:01Z

r? @cjgillot

rustbot has assigned @cjgillot.
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

rustbot · 2024-10-31T06:12:03Z

HIR ty lowering was modified

cc @fmease

Changes to the size of AST and/or HIR nodes.

cc @nnethercote

rustbot · 2024-10-31T09:17:11Z

Some changes occurred in src/tools/rustfmt

cc @rust-lang/rustfmt

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

src/tools/rustfmt/src/types.rs

cjgillot

Thanks @frank-king for the work. I haven't looked deeply into the parser code yet, I need to familiarize myself with it first.

compiler/rustc_ast/src/ast.rs

compiler/rustc_ast/src/mut_visit.rs

compiler/rustc_ast/src/visit.rs

compiler/rustc_ast_lowering/src/index.rs

compiler/rustc_expand/src/expand.rs

compiler/rustc_hir/src/hir.rs

compiler/rustc_hir/src/intravisit.rs

compiler/rustc_resolve/src/late.rs

compiler/rustc_expand/src/expand.rs

src/tools/rustfmt/tests/target/cfg_attribute_in_where.rs

compiler/rustc_expand/src/expand.rs

petrochenkov · 2024-11-16T18:42:17Z

I've opened #132894 for that refactoring.

Blocked on #132894.
@rustbot blocked

…=<try> Refactor `where` predicates, and reserve for attributes support Refactor `WherePredicate` to `WherePredicateKind`, and reserve for attributes support in `where` predicates. This is a part of rust-lang#115590 and is split from rust-lang#132388. r? petrochenkov

compiler/rustc_expand/src/expand.rs

petrochenkov · 2025-03-01T12:56:48Z

This looks ready to me now, r=me after pruning the tests #132388 (comment).

tests/ui/where-clauses/cfg_attribute.rs

tests/ui/where-clauses/unsupported_attribute.rs

frank-king · 2025-03-02T14:46:39Z

@rustbot ready

petrochenkov · 2025-03-02T14:56:49Z

Thanks!
@bors r+

bors · 2025-03-02T14:56:52Z

📌 Commit 42f51d4 has been approved by petrochenkov

It is now in the queue for this repository.

…trochenkov Implement `#[cfg]` in `where` clauses This PR implements rust-lang#115590, which supports `#[cfg]` attributes in `where` clauses. The biggest change is, that it adds `AttrsVec` and `NodeId` to the `ast::WherePredicate` and `HirId` to the `hir::WherePredicate`.

…iaskrgr Rollup of 10 pull requests Successful merges: - rust-lang#132388 (Implement `#[cfg]` in `where` clauses) - rust-lang#134900 (Fix parsing of ranges after unary operators) - rust-lang#136938 (Remove `:` from `stack-protector-heuristics-effect.rs` Filecheck Pattern) - rust-lang#137054 (Make phantom variance markers transparent) - rust-lang#137525 (Simplify parallelization in test-float-parse) - rust-lang#137618 (Skip `tidy` in pre-push hook if the user is deleting a remote branch) - rust-lang#137685 (self-contained linker: conservatively default to `-znostart-stop-gc`) - rust-lang#137741 (Stop using `hash_raw_entry` in `CodegenCx::const_str`) - rust-lang#137849 (Revert "Remove Win SDK 10.0.26100.0 from CI") - rust-lang#137862 (ensure we always print all --print options in help) r? `@ghost` `@rustbot` modify labels: rollup

…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#132388 (Implement `#[cfg]` in `where` clauses) - rust-lang#134900 (Fix parsing of ranges after unary operators) - rust-lang#136938 (Remove `:` from `stack-protector-heuristics-effect.rs` Filecheck Pattern) - rust-lang#137054 (Make phantom variance markers transparent) - rust-lang#137525 (Simplify parallelization in test-float-parse) - rust-lang#137618 (Skip `tidy` in pre-push hook if the user is deleting a remote branch) - rust-lang#137741 (Stop using `hash_raw_entry` in `CodegenCx::const_str`) - rust-lang#137849 (Revert "Remove Win SDK 10.0.26100.0 from CI") - rust-lang#137862 (ensure we always print all --print options in help) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#132388 - frank-king:feature/where-cfg, r=petrochenkov Implement `#[cfg]` in `where` clauses This PR implements rust-lang#115590, which supports `#[cfg]` attributes in `where` clauses. The biggest change is, that it adds `AttrsVec` and `NodeId` to the `ast::WherePredicate` and `HirId` to the `hir::WherePredicate`.

…trochenkov Implement `#[cfg]` in `where` clauses This PR implements rust-lang#115590, which supports `#[cfg]` attributes in `where` clauses. The biggest change is, that it adds `AttrsVec` and `NodeId` to the `ast::WherePredicate` and `HirId` to the `hir::WherePredicate`.

rustbot assigned cjgillot Oct 31, 2024

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 31, 2024

frank-king force-pushed the feature/where-cfg branch from 6b5f780 to 416f1eb Compare October 31, 2024 06:14

This comment has been minimized.

Sign in to view

frank-king force-pushed the feature/where-cfg branch from 416f1eb to 2aa303c Compare October 31, 2024 09:17

ytmimi reviewed Oct 31, 2024

View reviewed changes

src/tools/rustfmt/src/types.rs Outdated Show resolved Hide resolved

cjgillot reviewed Oct 31, 2024

View reviewed changes

tgross35 changed the title ~~Implment #[cfg] in where clauses~~ Implement #[cfg] in where clauses Oct 31, 2024

frank-king force-pushed the feature/where-cfg branch from 2aa303c to f3192a5 Compare November 1, 2024 06:52

This comment has been minimized.

Sign in to view

ytmimi reviewed Nov 2, 2024

View reviewed changes

src/tools/rustfmt/tests/target/cfg_attribute_in_where.rs Show resolved Hide resolved

This comment was marked as resolved.

Sign in to view

frank-king force-pushed the feature/where-cfg branch from f3192a5 to 1a8208c Compare November 5, 2024 02:46

This comment has been minimized.

Sign in to view

frank-king force-pushed the feature/where-cfg branch from 1a8208c to db4c4fd Compare November 5, 2024 06:20

This comment was marked as resolved.

Sign in to view

frank-king force-pushed the feature/where-cfg branch from db4c4fd to d8db4cf Compare November 9, 2024 01:50

This comment has been minimized.

Sign in to view

petrochenkov reviewed Nov 9, 2024

View reviewed changes

compiler/rustc_expand/src/expand.rs Outdated Show resolved Hide resolved

frank-king mentioned this pull request Nov 11, 2024

Refactor where predicates, and reserve for attributes support #132894

Merged

frank-king force-pushed the feature/where-cfg branch from d8db4cf to d0cdfab Compare November 11, 2024 08:13

rustbot added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 16, 2024

petrochenkov self-assigned this Nov 16, 2024

petrochenkov reviewed Mar 1, 2025

View reviewed changes

compiler/rustc_expand/src/expand.rs Outdated Show resolved Hide resolved

frank-king commented Mar 1, 2025

View reviewed changes

tests/ui/where-clauses/cfg_attribute.rs Show resolved Hide resolved

frank-king commented Mar 1, 2025

View reviewed changes

tests/ui/where-clauses/unsupported_attribute.rs Show resolved Hide resolved

Implment #[cfg] and #[cfg_attr] in where clauses

42f51d4

frank-king force-pushed the feature/where-cfg branch from 27fb18d to 42f51d4 Compare March 1, 2025 14:03

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 Mar 2, 2025

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 2, 2025

matthiaskrgr mentioned this pull request Mar 3, 2025

Rollup of 10 pull requests #137918

Closed

matthiaskrgr mentioned this pull request Mar 3, 2025

Rollup of 9 pull requests #137927

Merged

bors merged commit 2344a34 into rust-lang:master Mar 4, 2025
6 checks passed

rustbot added this to the 1.87.0 milestone Mar 4, 2025

matthiaskrgr mentioned this pull request Mar 4, 2025

ICE: mid > len on leading assoc ty / lazy type alias where clause with attributes #138010

Open

fmease added the F-where_clause_attrs `#![feature(where_clause_attrs)]` label Mar 4, 2025

fmease mentioned this pull request Mar 4, 2025

Tracking Issue for attributes on where-clause bounds #115590

Open

4 tasks

matthiaskrgr mentioned this pull request Mar 15, 2025

ICE: can't get the span of an arbitrary parsed attribute: Parsed(Repr([(ReprEmpty.. #138510

Closed

ytmimi mentioned this pull request Apr 2, 2025

subtree-push nightly-2025-04-02 rust-lang/rustfmt#6531

Merged

matthiaskrgr mentioned this pull request Apr 14, 2025

ICE: failed to process buffered lint here (dummy = false) #139825

Closed

Implement #[cfg] in where clauses #132388

Implement #[cfg] in where clauses #132388

Uh oh!

Conversation

frank-king commented Oct 31, 2024

Uh oh!

rustbot commented Oct 31, 2024

Uh oh!

rustbot commented Oct 31, 2024

Uh oh!

This comment has been minimized.

rustbot commented Oct 31, 2024

Uh oh!

Uh oh!

cjgillot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

This comment has been minimized.

Uh oh!

This comment was marked as resolved.

This comment has been minimized.

This comment was marked as resolved.

This comment has been minimized.

Uh oh!

petrochenkov commented Nov 16, 2024

Uh oh!

Uh oh!

petrochenkov commented Mar 1, 2025

Uh oh!

Uh oh!

Uh oh!

frank-king commented Mar 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

petrochenkov commented Mar 2, 2025

Uh oh!

bors commented Mar 2, 2025

Uh oh!

Uh oh!

Uh oh!

Implement `#[cfg]` in `where` clauses #132388

Implement `#[cfg]` in `where` clauses #132388

frank-king commented Mar 2, 2025 •

edited

Loading