Port `#[custom_mir(..)]` to the new attribute system by scrabsha · Pull Request #145206 · rust-lang/rust

scrabsha · 2025-08-10T08:33:02Z

r? @jdonszelmann

rustbot · 2025-08-10T08:33:07Z

jdonszelmann is currently at their maximum review capacity.
They may take a while to respond.

rustbot · 2025-08-10T08:33:09Z

Some changes occurred in compiler/rustc_attr_parsing

cc @jdonszelmann

Some changes occurred in compiler/rustc_hir/src/attrs

cc @jdonszelmann

Some changes occurred in compiler/rustc_passes/src/check_attr.rs

cc @jdonszelmann

jdonszelmann · 2025-08-10T09:28:23Z

compiler/rustc_attr_parsing/src/attributes/prototype.rs

+    let (dialect, span) = dialect?;
+
+    let dialect = match dialect.as_str() {
+        "analysis" => MirDialect::Analysis,


I think you can match directly on symbols here, so sym::analysis

jdonszelmann · 2025-08-10T09:29:45Z

compiler/rustc_attr_parsing/src/attributes/prototype.rs

+
+    let phase = match phase.as_str().to_ascii_lowercase().as_str() {
+        "initial" => MirPhase::Initial,
+        "post_cleanup" | "post-cleanup" | "postcleanup" => MirPhase::PostCleanup,


Did the original impl have 3 variants? This feels like something that should be specified and then changed to one of these 3

compiler/rustc_middle/src/mir/mod.rs

compiler/rustc_mir_build/src/builder/custom/mod.rs

scrabsha · 2025-08-10T10:22:23Z

compiler/rustc_hir/src/attrs/data_structures.rs

+
+#[derive(Clone, Copy, Decodable, Debug, Encodable, PartialEq)]
+#[derive(HashStable_Generic, PrintAttribute)]
+


How did i end up inserting a newline here?!

jdonszelmann · 2025-08-10T12:04:51Z

compiler/rustc_passes/src/check_attr.rs

+            return;
+        };
+
+        let string_of_dialect = || match dialect {


you could implement a trait that allows these to be used in diagnostics directly. I forgot which, maybe IntoDiagnosticsValue? Something like that. It's from rustc_errors

Inherent method name is usually a simple enough way to do that.

compiler/rustc_middle/src/mir/mod.rs

cjgillot · 2025-08-10T19:08:03Z

compiler/rustc_middle/src/mir/mod.rs


 impl RuntimePhase {
-    pub fn parse(phase: Option<String>) -> Self {
+    pub fn parse(phase: Option<attrs::MirPhase>) -> Self {


Should this method be inlined into its use sites now that it's so simple? Like the other *Phase::parse?

cjgillot · 2025-08-10T19:12:47Z

compiler/rustc_passes/src/check_attr.rs

+            return;
+        };
+
+        let string_of_dialect = || match dialect {


Inherent method name is usually a simple enough way to do that.

jdonszelmann · 2025-08-11T08:18:19Z

@cjgillot yea I told sasha off-github the same yesterday. Let's just collapse all those alternate syntaxes into one and make them symbols. :)

scrabsha · 2025-08-11T13:32:25Z

(i'm kinda busy trying to unbreak the tests, i'll go through all these discussions once i have something that works (i was convinced i ran the tests before opening the PR, but apparently no --'))

scrabsha · 2025-08-11T19:59:30Z

@cjgillot @jdonszelmann I think I addressed everything you raised in this PR :)

jdonszelmann · 2025-08-12T13:04:43Z

awesome, looks good! @bors r+ rollup

bors · 2025-08-12T13:04:47Z

📌 Commit e854013 has been approved by jdonszelmann

It is now in the queue for this repository.

…szelmann Port `#[custom_mir(..)]` to the new attribute system r? `@jdonszelmann`

…szelmann Port `#[custom_mir(..)]` to the new attribute system r? ``@jdonszelmann``

…szelmann Port `#[custom_mir(..)]` to the new attribute system r? ```@jdonszelmann```

jhpratt · 2025-08-12T18:19:17Z

@bors r-

#145317 (comment)

Rollup of 11 pull requests Successful merges: - #139345 (Extend `QueryStability` to handle `IntoIterator` implementations) - #144838 (Fix outdated doc comment) - #145206 (Port `#[custom_mir(..)]` to the new attribute system) - #145208 (Implement declarative (`macro_rules!`) derive macros (RFC 3698)) - #145309 (Fix `-Zregparm` for LLVM builtins) - #145355 (Add codegen test for issue 122734) - #145420 (cg_llvm: Use LLVM-C bindings for `LLVMSetTailCallKind`, `LLVMGetTypeKind`) - #145451 (Add static glibc to the nix dev shell) - #145460 (Speedup `copy_src_dirs` in bootstrap) - #145476 (Fix typo in doc for library/std/src/fs.rs#set_permissions) - #145485 (Fix deprecation attributes on foreign statics) r? `@ghost` `@rustbot` modify labels: rollup

…szelmann Port `#[custom_mir(..)]` to the new attribute system r? ``@jdonszelmann``

Rollup of 10 pull requests Successful merges: - #140794 (Add information about group a lint belongs to) - #144476 (rustdoc-search: search backend with partitioned suffix tree) - #144838 (Fix outdated doc comment) - #145206 (Port `#[custom_mir(..)]` to the new attribute system) - #145208 (Implement declarative (`macro_rules!`) derive macros (RFC 3698)) - #145420 (cg_llvm: Use LLVM-C bindings for `LLVMSetTailCallKind`, `LLVMGetTypeKind`) - #145451 (Add static glibc to the nix dev shell) - #145460 (Speedup `copy_src_dirs` in bootstrap) - #145476 (Fix typo in doc for library/std/src/fs.rs#set_permissions) - #145485 (Fix deprecation attributes on foreign statics) r? `@ghost` `@rustbot` modify labels: rollup

…szelmann Port `#[custom_mir(..)]` to the new attribute system r? ```@jdonszelmann```

…szelmann Port `#[custom_mir(..)]` to the new attribute system r? ````@jdonszelmann````

…szelmann Port `#[custom_mir(..)]` to the new attribute system r? `````@jdonszelmann`````

Rollup of 10 pull requests Successful merges: - #144476 (rustdoc-search: search backend with partitioned suffix tree) - #144838 (Fix outdated doc comment) - #145206 (Port `#[custom_mir(..)]` to the new attribute system) - #145208 (Implement declarative (`macro_rules!`) derive macros (RFC 3698)) - #145420 (cg_llvm: Use LLVM-C bindings for `LLVMSetTailCallKind`, `LLVMGetTypeKind`) - #145451 (Add static glibc to the nix dev shell) - #145460 (Speedup `copy_src_dirs` in bootstrap) - #145476 (Fix typo in doc for library/std/src/fs.rs#set_permissions) - #145485 (Fix deprecation attributes on foreign statics) - #145489 (library: Migrate from `cfg_if` to `cfg_select`) r? `@ghost` `@rustbot` modify labels: rollup

Rollup of 9 pull requests Successful merges: - #144476 (rustdoc-search: search backend with partitioned suffix tree) - #144838 (Fix outdated doc comment) - #145206 (Port `#[custom_mir(..)]` to the new attribute system) - #145208 (Implement declarative (`macro_rules!`) derive macros (RFC 3698)) - #145420 (cg_llvm: Use LLVM-C bindings for `LLVMSetTailCallKind`, `LLVMGetTypeKind`) - #145451 (Add static glibc to the nix dev shell) - #145460 (Speedup `copy_src_dirs` in bootstrap) - #145476 (Fix typo in doc for library/std/src/fs.rs#set_permissions) - #145485 (Fix deprecation attributes on foreign statics) r? `@ghost` `@rustbot` modify labels: rollup

…szelmann Port `#[custom_mir(..)]` to the new attribute system r? ``````@jdonszelmann``````

Rollup of 10 pull requests Successful merges: - #144838 (Fix outdated doc comment) - #145206 (Port `#[custom_mir(..)]` to the new attribute system) - #145208 (Implement declarative (`macro_rules!`) derive macros (RFC 3698)) - #145309 (Fix `-Zregparm` for LLVM builtins) - #145355 (Add codegen test for issue 122734) - #145420 (cg_llvm: Use LLVM-C bindings for `LLVMSetTailCallKind`, `LLVMGetTypeKind`) - #145451 (Add static glibc to the nix dev shell) - #145460 (Speedup `copy_src_dirs` in bootstrap) - #145476 (Fix typo in doc for library/std/src/fs.rs#set_permissions) - #145485 (Fix deprecation attributes on foreign statics) r? `@ghost` `@rustbot` modify labels: rollup

…szelmann Port `#[custom_mir(..)]` to the new attribute system r? ```````@jdonszelmann```````

…szelmann Port `#[custom_mir(..)]` to the new attribute system r? ````````@jdonszelmann````````

…szelmann Port `#[custom_mir(..)]` to the new attribute system r? `````````@jdonszelmann`````````

Rollup of 10 pull requests Successful merges: - #144838 (Fix outdated doc comment) - #145206 (Port `#[custom_mir(..)]` to the new attribute system) - #145208 (Implement declarative (`macro_rules!`) derive macros (RFC 3698)) - #145309 (Fix `-Zregparm` for LLVM builtins) - #145355 (Add codegen test for issue 122734) - #145420 (cg_llvm: Use LLVM-C bindings for `LLVMSetTailCallKind`, `LLVMGetTypeKind`) - #145451 (Add static glibc to the nix dev shell) - #145460 (Speedup `copy_src_dirs` in bootstrap) - #145476 (Fix typo in doc for library/std/src/fs.rs#set_permissions) - #145485 (Fix deprecation attributes on foreign statics) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of #145206 - scrabsha:push-uxovoqzrxnlx, r=jdonszelmann Port `#[custom_mir(..)]` to the new attribute system r? ``````````@jdonszelmann``````````

rustbot assigned jdonszelmann Aug 10, 2025

rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) 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 Aug 10, 2025

This comment has been minimized.

Sign in to view

jdonszelmann reviewed Aug 10, 2025

View reviewed changes

scrabsha commented Aug 10, 2025

View reviewed changes

jdonszelmann reviewed Aug 10, 2025

View reviewed changes

cjgillot reviewed Aug 10, 2025

View reviewed changes

jdonszelmann mentioned this pull request Aug 11, 2025

Tracking issue: Attribute refactor #131229

Open

9 tasks

scrabsha force-pushed the push-uxovoqzrxnlx branch 3 times, most recently from 22677db to 4acaec2 Compare August 11, 2025 19:58

This comment has been minimized.

Sign in to view

scrabsha force-pushed the push-uxovoqzrxnlx branch from 4acaec2 to e854013 Compare August 11, 2025 20:19

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 Aug 12, 2025

Kobzol added a commit to Kobzol/rust that referenced this pull request Aug 12, 2025

Rollup merge of rust-lang#145206 - scrabsha:push-uxovoqzrxnlx, r=jdon…

ca2bc9e

…szelmann Port `#[custom_mir(..)]` to the new attribute system r? `@jdonszelmann`

Kobzol mentioned this pull request Aug 12, 2025

Rollup of 6 pull requests #145315

Closed

jhpratt added a commit to jhpratt/rust that referenced this pull request Aug 12, 2025

Rollup merge of rust-lang#145206 - scrabsha:push-uxovoqzrxnlx, r=jdon…

1c42fe3

…szelmann Port `#[custom_mir(..)]` to the new attribute system r? ``@jdonszelmann``

jhpratt added a commit to jhpratt/rust that referenced this pull request Aug 12, 2025

Rollup merge of rust-lang#145206 - scrabsha:push-uxovoqzrxnlx, r=jdon…

044cdf2

…szelmann Port `#[custom_mir(..)]` to the new attribute system r? ```@jdonszelmann```

jhpratt mentioned this pull request Aug 12, 2025

Rollup of 8 pull requests #145317

Closed

Zalathar mentioned this pull request Aug 16, 2025

Rollup of 11 pull requests #145488

Closed

Zalathar added a commit to Zalathar/rust that referenced this pull request Aug 17, 2025

Rollup merge of rust-lang#145206 - scrabsha:push-uxovoqzrxnlx, r=jdon…

3286569

…szelmann Port `#[custom_mir(..)]` to the new attribute system r? ``@jdonszelmann``

Zalathar mentioned this pull request Aug 17, 2025

Rollup of 10 pull requests #145517

Closed

Zalathar added a commit to Zalathar/rust that referenced this pull request Aug 17, 2025

Rollup merge of rust-lang#145206 - scrabsha:push-uxovoqzrxnlx, r=jdon…

5dfe17f

…szelmann Port `#[custom_mir(..)]` to the new attribute system r? ```@jdonszelmann```

Zalathar mentioned this pull request Aug 17, 2025

Rollup of 9 pull requests #145519

Closed

Zalathar added a commit to Zalathar/rust that referenced this pull request Aug 17, 2025

Rollup merge of rust-lang#145206 - scrabsha:push-uxovoqzrxnlx, r=jdon…

b87c032

…szelmann Port `#[custom_mir(..)]` to the new attribute system r? ````@jdonszelmann````

Zalathar added a commit to Zalathar/rust that referenced this pull request Aug 17, 2025

Rollup merge of rust-lang#145206 - scrabsha:push-uxovoqzrxnlx, r=jdon…

8ce089f

…szelmann Port `#[custom_mir(..)]` to the new attribute system r? `````@jdonszelmann`````

Zalathar mentioned this pull request Aug 17, 2025

Rollup of 10 pull requests #145521

Closed

Zalathar added a commit to Zalathar/rust that referenced this pull request Aug 17, 2025

Rollup merge of rust-lang#145206 - scrabsha:push-uxovoqzrxnlx, r=jdon…

810b77b

…szelmann Port `#[custom_mir(..)]` to the new attribute system r? ``````@jdonszelmann``````

Zalathar mentioned this pull request Aug 17, 2025

Rollup of 10 pull requests #145526

Closed

jhpratt added a commit to jhpratt/rust that referenced this pull request Aug 17, 2025

Rollup merge of rust-lang#145206 - scrabsha:push-uxovoqzrxnlx, r=jdon…

68b92bf

…szelmann Port `#[custom_mir(..)]` to the new attribute system r? ```````@jdonszelmann```````

jhpratt added a commit to jhpratt/rust that referenced this pull request Aug 17, 2025

Rollup merge of rust-lang#145206 - scrabsha:push-uxovoqzrxnlx, r=jdon…

812f0a3

…szelmann Port `#[custom_mir(..)]` to the new attribute system r? ````````@jdonszelmann````````

jhpratt mentioned this pull request Aug 17, 2025

Manual rollup of 19 pull requests #145545

Closed

jhpratt added a commit to jhpratt/rust that referenced this pull request Aug 17, 2025

Rollup merge of rust-lang#145206 - scrabsha:push-uxovoqzrxnlx, r=jdon…

26391a3

…szelmann Port `#[custom_mir(..)]` to the new attribute system r? `````````@jdonszelmann`````````

jhpratt mentioned this pull request Aug 17, 2025

Rollup of 19 pull requests #145546

Closed

Zalathar mentioned this pull request Aug 18, 2025

Rollup of 10 pull requests #145551

Merged

bors merged commit d92e1fe into rust-lang:master Aug 18, 2025
10 checks passed

rustbot added this to the 1.91.0 milestone Aug 18, 2025

rust-timer added a commit that referenced this pull request Aug 18, 2025

Unrolled build for #145206

8be7326

Rollup merge of #145206 - scrabsha:push-uxovoqzrxnlx, r=jdonszelmann Port `#[custom_mir(..)]` to the new attribute system r? ``````````@jdonszelmann``````````

scrabsha deleted the push-uxovoqzrxnlx branch August 28, 2025 19:49

scrabsha mentioned this pull request Sep 1, 2025

Fix message style for "crate-level attr used as outer attr" and "invalid custom_mir" errors #146080

Closed


		#[derive(Clone, Copy, Decodable, Debug, Encodable, PartialEq)]
		#[derive(HashStable_Generic, PrintAttribute)]

Uh oh!

Conversation

scrabsha commented Aug 10, 2025

Uh oh!

rustbot commented Aug 10, 2025

Uh oh!

rustbot commented Aug 10, 2025

Uh oh!

This comment has been minimized.

jdonszelmann Aug 10, 2025

Choose a reason for hiding this comment

Uh oh!

jdonszelmann Aug 10, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

scrabsha Aug 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jdonszelmann Aug 10, 2025

Choose a reason for hiding this comment

Uh oh!

cjgillot Aug 10, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

cjgillot Aug 10, 2025

Choose a reason for hiding this comment

Uh oh!

cjgillot Aug 10, 2025

Choose a reason for hiding this comment

Uh oh!

jdonszelmann commented Aug 11, 2025

Uh oh!

scrabsha commented Aug 11, 2025

Uh oh!

scrabsha commented Aug 11, 2025

Uh oh!

This comment has been minimized.

jdonszelmann commented Aug 12, 2025

Uh oh!

bors commented Aug 12, 2025

Uh oh!

jhpratt commented Aug 12, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

scrabsha Aug 10, 2025 •

edited

Loading