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

Migrate mir_transform to translatable diagnostics #111004

Merged
merged 1 commit into from
May 8, 2023
Merged

Migrate mir_transform to translatable diagnostics #111004

merged 1 commit into from
May 8, 2023

Conversation

clubby789
Copy link
Contributor

cc #100717

@rustbot
Copy link
Collaborator

rustbot commented Apr 30, 2023

r? @petrochenkov

(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 Apr 30, 2023
@rustbot
Copy link
Collaborator

rustbot commented Apr 30, 2023

These commits modify the Cargo.lock file. Random changes to Cargo.lock can be introduced when switching branches and rebasing PRs.
This was probably unintentional and should be reverted before this PR is merged.

If this was intentional then you can ignore this comment.

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

@clubby789 clubby789 mentioned this pull request Apr 30, 2023
Open
84 tasks
@bors
Copy link
Contributor

bors commented Apr 30, 2023

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

@oli-obk
Copy link
Contributor

oli-obk commented May 2, 2023

r? @oli-obk

@rustbot author

@rustbot rustbot assigned oli-obk and unassigned petrochenkov May 2, 2023
@rustbot rustbot 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 May 2, 2023
@clubby789
Copy link
Contributor Author

@rustbot ready

@rustbot 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 May 2, 2023
@oli-obk
Copy link
Contributor

oli-obk commented May 2, 2023

@bors r+

@bors
Copy link
Contributor

bors commented May 2, 2023

📌 Commit d5bc581 has been approved by oli-obk

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-review Status: Awaiting review from the assignee but also interested parties. labels May 2, 2023
Manishearth added a commit to Manishearth/rust that referenced this pull request May 4, 2023
@Manishearth
Rollup merge of rust-lang#111004 - clubby789:migrate-mir-transform, r…
66ad50e 
…=oli-obk

Migrate `mir_transform` to translatable diagnostics

cc rust-lang#100717
@Manishearth Manishearth mentioned this pull request May 4, 2023
Closed
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request May 4, 2023
@matthiaskrgr
Rollup merge of rust-lang#111004 - clubby789:migrate-mir-transform, r…
2ff943d 
…=oli-obk

Migrate `mir_transform` to translatable diagnostics

cc rust-lang#100717
@matthiaskrgr matthiaskrgr mentioned this pull request May 4, 2023
Closed
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request May 5, 2023
@matthiaskrgr
Rollup merge of rust-lang#111004 - clubby789:migrate-mir-transform, r…
3e01276 
…=oli-obk

Migrate `mir_transform` to translatable diagnostics

cc rust-lang#100717
@matthiaskrgr matthiaskrgr mentioned this pull request May 5, 2023
Closed
@compiler-errors
Copy link
Member

@bors rollup

@compiler-errors compiler-errors mentioned this pull request May 8, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request May 8, 2023
@bors
Auto merge of rust-lang#111358 - compiler-errors:rollup-yv27vrp, r=co…
2f2c438 
…mpiler-errors

Rollup of 6 pull requests

Successful merges:

 - rust-lang#104070 (Prevent aborting guard from aborting the process in a forced unwind)
 - rust-lang#109410 (Introduce `AliasKind::Inherent` for inherent associated types)
 - rust-lang#111004 (Migrate `mir_transform` to translatable diagnostics)
 - rust-lang#111118 (Suggest struct when we get colon in fileds in enum)
 - rust-lang#111170 (Diagnostic args are still args if they're documented)
 - rust-lang#111354 (Fix miscompilation when calling default methods on `Future`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 6859414 into rust-lang:master May 8, 2023
@rustbot rustbot added this to the 1.71.0 milestone May 8, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Noratrieb Noratrieb Noratrieb left review comments

@oli-obk oli-obk oli-obk left review comments

Assignees

@oli-obk oli-obk

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.71.0
Development

Successfully merging this pull request may close these issues.
7 participants
@clubby789 @rustbot @bors @oli-obk @compiler-errors @Noratrieb @petrochenkov