Skip to content

merge rustc_attr_data_structures into rustc_hir - #144726

Merged
bors merged 1 commit into
rust-lang:masterfrom
jdonszelmann:move-attr-data-structures
Jul 31, 2025
Merged

merge rustc_attr_data_structures into rustc_hir#144726
bors merged 1 commit into
rust-lang:masterfrom
jdonszelmann:move-attr-data-structures

Conversation

@jdonszelmann

@jdonszelmannjdonszelmann commented Jul 31, 2025

Copy link
Copy Markdown
Contributor

this move was discussed on zulip: #t-compiler > attribute parsing rework @ 💬

Many PRs in the attribute rework depend on this move.

@rustbot

Copy link
Copy Markdown
Collaborator

r? @petrochenkov

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

@rustbotrustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) A-rustdoc-json Area: Rustdoc JSON backend S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-clippy Relevant to the Clippy team. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. labels Jul 31, 2025
@rustbot

Copy link
Copy Markdown
Collaborator

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

Some changes occurred to constck

cc @fee1-dead

Some changes occurred in compiler/rustc_codegen_ssa

cc @WaffleLapkin

Some changes occurred in coverage instrumentation.

cc @Zalathar

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

Some changes occurred to the CTFE machinery

cc @RalfJung, @oli-obk, @lcnr

The Miri subtree was changed

cc @rust-lang/miri

triagebot.toml has been modified, there may have been changes to the review queue.

cc @davidtwco, @wesleywiser

Some changes occurred in compiler/rustc_codegen_gcc

cc @antoyo, @GuillaumeGomez

Some changes occurred in match checking

cc @Nadrieril

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

Comment threadcompiler/rustc_middle/src/hir/map.rs Outdated
Comment threadcompiler/rustc_hir/src/attrs/mod.rs
Comment threadsrc/librustdoc/clean/types.rs Outdated
Comment threadsrc/librustdoc/json/conversions.rs Outdated

@lcnrlcnr left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

not too happy about the autofmt changes in Cargo.toml files. Would be nice if you could remove them again.

apart from that and a few nits, r=me

@petrochenkovpetrochenkov removed their assignment Jul 31, 2025
@jdonszelmann
jdonszelmannforce-pushed the move-attr-data-structures branch from f9fc6ed to e1d3ad8CompareJuly 31, 2025 12:19
@rustbot

Copy link
Copy Markdown
Collaborator

Some changes occurred to constck

cc @fee1-dead

Some changes occurred in compiler/rustc_codegen_gcc

cc @antoyo, @GuillaumeGomez

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

The Miri subtree was changed

cc @rust-lang/miri

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

Some changes occurred in compiler/rustc_codegen_ssa

cc @WaffleLapkin

Some changes occurred in coverage instrumentation.

cc @Zalathar

Some changes occurred in match checking

cc @Nadrieril

Some changes occurred to the CTFE machinery

cc @RalfJung, @oli-obk, @lcnr

triagebot.toml has been modified, there may have been changes to the review queue.

cc @davidtwco, @wesleywiser

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

@jdonszelmann

Copy link
Copy Markdown
ContributorAuthor

@bors r=lcnr rollup=iffy

@bors

bors commented Jul 31, 2025

Copy link
Copy Markdown
Collaborator

📌 Commit e1d3ad8 has been approved by lcnr

It is now in the queue for this repository.

@borsbors 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 Jul 31, 2025
bors added a commit that referenced this pull request Jul 31, 2025
Rollup of 6 pull requests
Successful merges:
- #144688 (Uniform `enter_trace_span!` and add documentation)
- #144702 (stall `ConstArgHasType` in `compute_goal_fast_path`)
- #144711 (Consider operator's span when computing binop expr span)
- #144712 (Deduplicate `IntTy`/`UintTy`/`FloatTy`.)
- #144726 (merge rustc_attr_data_structures into rustc_hir)
- #144733 (fix: Match width of ascii and unicode secondary file start)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 26c28ee into rust-lang:masterJul 31, 2025
10 checks passed
@rustbotrustbot added this to the 1.90.0 milestone Jul 31, 2025
rust-timer added a commit that referenced this pull request Jul 31, 2025
Rollup merge of #144726 - jdonszelmann:move-attr-data-structures, r=lcnr
merge rustc_attr_data_structures into rustc_hir
this move was discussed on zulip: [#t-compiler > attribute parsing rework @ 💬](https://rust-lang.zulipchat.com/#narrow/channel/131828-t-compiler/topic/attribute.20parsing.20rework/near/528530091)
Many PRs in the attribute rework depend on this move.
github-actionsBot pushed a commit to rust-lang/miri that referenced this pull request Aug 1, 2025
Rollup of 6 pull requests
Successful merges:
- rust-lang/rust#144688 (Uniform `enter_trace_span!` and add documentation)
- rust-lang/rust#144702 (stall `ConstArgHasType` in `compute_goal_fast_path`)
- rust-lang/rust#144711 (Consider operator's span when computing binop expr span)
- rust-lang/rust#144712 (Deduplicate `IntTy`/`UintTy`/`FloatTy`.)
- rust-lang/rust#144726 (merge rustc_attr_data_structures into rustc_hir)
- rust-lang/rust#144733 (fix: Match width of ascii and unicode secondary file start)
r? `@ghost`
`@rustbot` modify labels: rollup
flip1995 pushed a commit to flip1995/rust that referenced this pull request Aug 7, 2025
…ures, r=lcnr
merge rustc_attr_data_structures into rustc_hir
this move was discussed on zulip: [#t-compiler > attribute parsing rework @ 💬](https://rust-lang.zulipchat.com/#narrow/channel/131828-t-compiler/topic/attribute.20parsing.20rework/near/528530091)
Many PRs in the attribute rework depend on this move.
rust-cloud-vmsBot pushed a commit to makai410/rustc_public that referenced this pull request Aug 16, 2025
Rollup of 6 pull requests
Successful merges:
- rust-lang/rust#144688 (Uniform `enter_trace_span!` and add documentation)
- rust-lang/rust#144702 (stall `ConstArgHasType` in `compute_goal_fast_path`)
- rust-lang/rust#144711 (Consider operator's span when computing binop expr span)
- rust-lang/rust#144712 (Deduplicate `IntTy`/`UintTy`/`FloatTy`.)
- rust-lang/rust#144726 (merge rustc_attr_data_structures into rustc_hir)
- rust-lang/rust#144733 (fix: Match width of ascii and unicode secondary file start)
r? `@ghost`
`@rustbot` modify labels: rollup
rust-cloud-vmsBot pushed a commit to makai410/rustc_public that referenced this pull request Aug 20, 2025
Rollup of 6 pull requests
Successful merges:
- rust-lang/rust#144688 (Uniform `enter_trace_span!` and add documentation)
- rust-lang/rust#144702 (stall `ConstArgHasType` in `compute_goal_fast_path`)
- rust-lang/rust#144711 (Consider operator's span when computing binop expr span)
- rust-lang/rust#144712 (Deduplicate `IntTy`/`UintTy`/`FloatTy`.)
- rust-lang/rust#144726 (merge rustc_attr_data_structures into rustc_hir)
- rust-lang/rust#144733 (fix: Match width of ascii and unicode secondary file start)
r? `@ghost`
`@rustbot` modify labels: rollup
makai410 pushed a commit to makai410/rust that referenced this pull request Nov 10, 2025
…ures, r=lcnr
merge rustc_attr_data_structures into rustc_hir
this move was discussed on zulip: [#t-compiler > attribute parsing rework @ 💬](https://rust-lang.zulipchat.com/#narrow/channel/131828-t-compiler/topic/attribute.20parsing.20rework/near/528530091)
Many PRs in the attribute rework depend on this move.
makai410 pushed a commit to makai410/rust that referenced this pull request Nov 10, 2025
…zelmann
Rollup of 6 pull requests
Successful merges:
- rust-lang#144688 (Uniform `enter_trace_span!` and add documentation)
- rust-lang#144702 (stall `ConstArgHasType` in `compute_goal_fast_path`)
- rust-lang#144711 (Consider operator's span when computing binop expr span)
- rust-lang#144712 (Deduplicate `IntTy`/`UintTy`/`FloatTy`.)
- rust-lang#144726 (merge rustc_attr_data_structures into rustc_hir)
- rust-lang#144733 (fix: Match width of ascii and unicode secondary file start)
r? `@ghost`
`@rustbot` modify labels: rollup
Kobzol pushed a commit to Kobzol/rustc_codegen_gcc that referenced this pull request Dec 21, 2025
Rollup of 6 pull requests
Successful merges:
- rust-lang/rust#144688 (Uniform `enter_trace_span!` and add documentation)
- rust-lang/rust#144702 (stall `ConstArgHasType` in `compute_goal_fast_path`)
- rust-lang/rust#144711 (Consider operator's span when computing binop expr span)
- rust-lang/rust#144712 (Deduplicate `IntTy`/`UintTy`/`FloatTy`.)
- rust-lang/rust#144726 (merge rustc_attr_data_structures into rustc_hir)
- rust-lang/rust#144733 (fix: Match width of ascii and unicode secondary file start)
r? `@ghost`
`@rustbot` modify labels: rollup
makai410 pushed a commit to makai410/rust that referenced this pull request Aug 31, 2026
…ures, r=lcnr
merge rustc_attr_data_structures into rustc_hir
this move was discussed on zulip: [#t-compiler > attribute parsing rework @ 💬](https://rust-lang.zulipchat.com/#narrow/channel/131828-t-compiler/topic/attribute.20parsing.20rework/near/528530091)
Many PRs in the attribute rework depend on this move.
makai410 pushed a commit to makai410/rust that referenced this pull request Aug 31, 2026
…zelmann
Rollup of 6 pull requests
Successful merges:
- rust-lang#144688 (Uniform `enter_trace_span!` and add documentation)
- rust-lang#144702 (stall `ConstArgHasType` in `compute_goal_fast_path`)
- rust-lang#144711 (Consider operator's span when computing binop expr span)
- rust-lang#144712 (Deduplicate `IntTy`/`UintTy`/`FloatTy`.)
- rust-lang#144726 (merge rustc_attr_data_structures into rustc_hir)
- rust-lang#144733 (fix: Match width of ascii and unicode secondary file start)
r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-attributesArea: Attributes (`#[…]`, `#![…]`)A-LLVMArea: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues.A-metaArea: Issues & PRs about the rust-lang/rust repository itselfA-query-systemArea: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html)A-rustdoc-jsonArea: Rustdoc JSON backendS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-clippyRelevant to the Clippy team.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-rustdocRelevant to the rustdoc team, which will review and decide on the PR/issue.T-rustdoc-frontendRelevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@jdonszelmann@rustbot@bors@lcnr@petrochenkov