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

Migrating rustc_infer to session diagnostics (part 3) #101936

Merged
merged 16 commits into from
Jan 8, 2023
Merged

Migrating rustc_infer to session diagnostics (part 3) #101936

merged 16 commits into from
Jan 8, 2023

Conversation

IntQuant
Copy link
Contributor

@rustbot label +A-translation
r? rust-lang/diagnostics
cc #100717

Seems like a part of static_impl_trait.rs emits suggestions in a loop, and note.rs needs to have two instances of the same subdiagnostic, so these will need to wait until we have eager translation/list support.
Other than that, there is only error_reporting/mod.rs left to migrate.

@rustbot rustbot added A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Sep 17, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 17, 2022
@IntQuant IntQuant changed the title Issue 100717 infer 4 Migrating rustc_infer to session diagnostics (part 3) Sep 17, 2022
@IntQuant IntQuant marked this pull request as ready for review September 17, 2022 17:44
@rustbot
Copy link
Collaborator

rustbot commented Sep 17, 2022

rustc_error_messages was changed

cc @davidtwco, @compiler-errors, @JohnTitor, @estebank, @TaKO8Ki

@bors

This comment was marked as resolved.

Sign in to view
@davidtwco davidtwco mentioned this pull request Sep 22, 2022
Open
84 tasks
@IntQuant IntQuant force-pushed the issue-100717-infer-4 branch from 448bf9a to 88997de Compare September 22, 2022 14:35
davidtwco
davidtwco reviewed Sep 22, 2022
View reviewed changes
compiler/rustc_infer/src/errors/mod.rs Outdated Show resolved Hide resolved
compiler/rustc_error_messages/locales/en-US/infer.ftl Outdated Show resolved Hide resolved
compiler/rustc_infer/src/errors/mod.rs Outdated Show resolved Hide resolved
compiler/rustc_infer/src/errors/mod.rs Outdated Show resolved Hide resolved
compiler/rustc_infer/src/errors/mod.rs Show resolved Hide resolved
@compiler-errors
Copy link
Member

r? @davidtwco

@IntQuant IntQuant force-pushed the issue-100717-infer-4 branch from 1a41b5d to 3b691b2 Compare September 29, 2022 14:13
@IntQuant IntQuant force-pushed the issue-100717-infer-4 branch from 3b691b2 to feb9d4f Compare October 14, 2022 18:52
@Noratrieb
Copy link
Member

Hi, I've seen you changed some diagnostic structs in your PR. After #103345, the way we refer to fluent messages changed. They are now in a flat namespace with the same identifier as in the fluent file. For example, parser::cool_thing is now parser_cool_thing and parser::suggestion just suggestion.
You should rebase to the latest master and change your fluent message references as described above. Thanks!

@IntQuant IntQuant force-pushed the issue-100717-infer-4 branch from 96f9f8f to bb9743a Compare October 24, 2022 16:17
davidtwco
davidtwco requested changes Nov 3, 2022
View reviewed changes
Copy link
Member

@davidtwco davidtwco left a comment

Choose a reason for hiding this comment

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

Apologies for the delay in giving this another review.

compiler/rustc_infer/src/infer/error_reporting/nice_region_error/named_anon_conflict.rs Outdated Show resolved Hide resolved
compiler/rustc_infer/src/infer/error_reporting/nice_region_error/placeholder_error.rs Outdated Show resolved Hide resolved
compiler/rustc_infer/src/infer/error_reporting/nice_region_error/placeholder_error.rs Show resolved Hide resolved
compiler/rustc_infer/src/infer/error_reporting/nice_region_error/placeholder_error.rs Outdated Show resolved Hide resolved
compiler/rustc_infer/src/infer/error_reporting/nice_region_error/static_impl_trait.rs Outdated Show resolved Hide resolved
@bors

This comment was marked as resolved.

Sign in to view
@IntQuant IntQuant force-pushed the issue-100717-infer-4 branch from 306ec64 to fc6d506 Compare November 7, 2022 12:12
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors

This comment was marked as resolved.

Sign in to view
@IntQuant IntQuant force-pushed the issue-100717-infer-4 branch 2 times, most recently from 9b1ef24 to 88ac4c0 Compare November 9, 2022 15:21
@bors

This comment was marked as resolved.

Sign in to view
@IntQuant IntQuant force-pushed the issue-100717-infer-4 branch from 88ac4c0 to ef9646e Compare November 10, 2022 11:09
@bors

This comment was marked as resolved.

Sign in to view
@IntQuant IntQuant force-pushed the issue-100717-infer-4 branch from 248c2ac to 0c50e1f Compare December 28, 2022 12:26
@davidtwco
Copy link
Member

Sorry for the delay in getting back to this, thanks to @compiler-errors for picking up the slack.

@bors r=compiler-errors

@bors
Copy link
Contributor

bors commented Jan 7, 2023

📌 Commit 0c50e1f 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-review Status: Awaiting review from the assignee but also interested parties. labels Jan 7, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 7, 2023
@matthiaskrgr
Rollup merge of rust-lang#101936 - IntQuant:issue-100717-infer-4, r=c…
1d3ab79 
…ompiler-errors

Migrating rustc_infer to session diagnostics (part 3)

`@rustbot` label +A-translation
r? rust-lang/diagnostics
cc rust-lang#100717

Seems like a part of static_impl_trait.rs emits suggestions in a loop, and note.rs needs to have two instances of the same subdiagnostic, so these will need to wait until we have eager translation/list support.
Other than that, there is only error_reporting/mod.rs left to migrate.
@matthiaskrgr matthiaskrgr mentioned this pull request Jan 7, 2023
Closed
@matthiaskrgr matthiaskrgr mentioned this pull request Jan 7, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 7, 2023
@bors
Auto merge of rust-lang#106573 - matthiaskrgr:rollup-zkgfsta, r=matth…
e5d46a5 
…iaskrgr

Rollup of 10 pull requests

Successful merges:

 - rust-lang#101936 (Migrating rustc_infer to session diagnostics (part 3))
 - rust-lang#104081 (PhantomData layout guarantees)
 - rust-lang#104543 (Migrate `codegen_ssa` to diagnostics structs - [Part 3])
 - rust-lang#105128 (Add O(1) `Vec -> VecDeque` conversion guarantee)
 - rust-lang#105517 (Fix process-panic-after-fork.rs to pass on newer versions of Android.)
 - rust-lang#105859 (Point out span where we could introduce higher-ranked lifetime)
 - rust-lang#106509 (Detect closures assigned to binding in block)
 - rust-lang#106553 (docs: make `HashSet::retain` doctest more clear)
 - rust-lang#106556 (rustdoc: remove no-op mobile CSS `.content { margin-left: 0 }`)
 - rust-lang#106564 (Change to immutable borrow when cloning element of RepeatN)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 405e48f into rust-lang:master Jan 8, 2023
@rustbot rustbot added this to the 1.68.0 milestone Jan 8, 2023
@Mark-Simulacrum Mark-Simulacrum added the perf-regression Performance regression. label Jan 10, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LeSeulArtichaut LeSeulArtichaut LeSeulArtichaut left review comments

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

@davidtwco davidtwco davidtwco requested changes

Assignees

@compiler-errors compiler-errors

Labels
A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic perf-regression Performance regression. 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.68.0
Development

Successfully merging this pull request may close these issues.