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

make custom mir ICE a bit nicer #113039

Merged
merged 1 commit into from
Jun 27, 2023
Merged

make custom mir ICE a bit nicer #113039

merged 1 commit into from
Jun 27, 2023

Conversation

matthiaskrgr
Copy link
Member

No description provided.

@rustbot
Copy link
Collaborator

rustbot commented Jun 25, 2023

r? @b-naber

(rustbot has picked a reviewer for you, use r? to override)

@rustbot 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 Jun 25, 2023
compiler-errors
compiler-errors reviewed Jun 25, 2023
View reviewed changes
compiler/rustc_mir_build/src/build/custom/mod.rs Outdated
@@ -118,7 +118,7 @@ fn parse_attribute(attr: &Attribute) -> MirPhase {
phase = Some(value);
}
other => {
panic!("Unexpected key {}", other);
bug!("Unexpected key while parsing custom_mir attribute: '{}'", other);
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
bug!("Unexpected key while parsing custom_mir attribute: '{}'", other);
span_bug!(nested.span, "Unexpected key while parsing custom_mir attribute: '{}'", other);

I think this works?

Copy link
Member Author

Choose a reason for hiding this comment

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

ah, neat! :)
mir_ice

compiler-errors
compiler-errors approved these changes Jun 25, 2023
View reviewed changes
Copy link
Member

@compiler-errors compiler-errors left a comment

Choose a reason for hiding this comment

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

r=me preferably with change. i think there's some span you can use here.

@compiler-errors compiler-errors 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-review Status: Awaiting review from the assignee but also interested parties. labels Jun 26, 2023
@matthiaskrgr
Copy link
Member Author

@bors rollup=always r=compiler-errors

@bors
Copy link
Contributor

bors commented Jun 26, 2023

📌 Commit c6e6ceb has been approved by compiler-errors

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 Jun 26, 2023
@matthiaskrgr matthiaskrgr mentioned this pull request Jun 27, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 27, 2023
@bors
Auto merge of rust-lang#113083 - matthiaskrgr:rollup-anbqpij, r=matth…
95978b3 
…iaskrgr

Rollup of 3 pull requests

Successful merges:

 - rust-lang#113039 (make custom mir ICE a bit nicer)
 - rust-lang#113058 (Add/improve code comments)
 - rust-lang#113063 (Update books)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit a144272 into rust-lang:master Jun 27, 2023
@rustbot rustbot added this to the 1.72.0 milestone Jun 27, 2023
@bors
Copy link
Contributor

bors commented Jun 27, 2023

⌛ Testing commit c6e6ceb with merge 95978b3...

@matthiaskrgr
Copy link
Member Author

o.O

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@compiler-errors compiler-errors compiler-errors approved these changes

Assignees

@compiler-errors compiler-errors

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.72.0
Development

Successfully merging this pull request may close these issues.
5 participants
@matthiaskrgr @rustbot @bors @compiler-errors @b-naber