Migrate rustc_resolve to use SessionDiagnostic, part # 1 #101162

rajputrajat · 2022-08-29T17:58:38Z

crate a somewhat on larger size, so plz allow some time to get it finished.

rustbot · 2022-08-29T17:58:42Z

rustc_error_messages was changed

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

rust-highfive · 2022-08-29T17:58:42Z

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @fee1-dead (or someone else) soon.

Please see the contribution instructions for more information.

compiler-errors · 2022-08-29T17:59:41Z

@rajputrajat, can you please remove all of these merge commits? We have a no merge commit policy.

compiler-errors · 2022-08-29T19:58:49Z

@rajputrajat -- I think you need to do something like git pull --rebase $REMOTE master where $REMOTE is the git remote corresponding to upstream, i.e. the rust-lang/rust repo (not your fork).

rajputrajat · 2022-08-30T01:24:35Z

Yes. I will update this as you suggested.
Being a first timer, I did read this comment somewhere on some other PR but didn't understand it then.

Thanks!

fee1-dead · 2022-08-30T04:09:41Z

r? @davidtwco

davidtwco

This is a great start, I've left some comments, you'll need to remove the merge commits as @compiler-errors has noted. :)

compiler/rustc_resolve/src/diagnostics.rs

compiler/rustc_resolve/src/errors.rs

rustbot · 2022-09-03T19:55:17Z

Some changes occurred in src/tools/cargo

cc @ehuss

The Miri submodule was changed

cc @rust-lang/miri

RalfJung · 2022-09-04T12:29:46Z

Looks like something went wrong in the rebase, this contains a bunch of changes it shouldn't (submodules, lockfile).

compiler/rustc_error_messages/locales/en-US/resolve.ftl

davidtwco · 2022-09-22T14:55:05Z

You should run ./x.py test src/test/ui locally and try to resolve the test failures as you go - so that the diagnostics you are migrating continue to work :)

rajputrajat · 2022-11-04T19:23:22Z

This looks good to me, apologies for the delay in reviewing, just one minor comment - would appreciate if you could squash some of the commits too.

Done. Please review.

rajputrajat · 2022-11-04T20:28:49Z

Some changes occurred in src/librustdoc/clean/types.rs

cc @camelid

Hey! It looks like you've submitted a new PR for the library teams!

If this PR contains changes to any rust-lang/rust public library APIs then please comment with @rustbot label +T-libs-api -T-libs to tag it appropriately. If this PR contains changes to any unstable APIs please edit the PR description to add a link to the relevant API Change Proposal or create one if you haven't already. If you're unsure where your change falls no worries, just leave it as is and the reviewer will take a look and make a decision to forward on if necessary.

Examples of T-libs-api changes:

Stabilizing library features

Introducing insta-stable changes such as new implementations of existing stable traits on existing stable types

Introducing new or changing existing unstable library APIs (excluding permanently unstable features / features without a tracking issue)

Changing public documentation in ways that create new stability guarantees

Changing observable runtime behavior of library APIs

Wrong commits were picked while squashing. corrected!

compiler/rustc_resolve/src/diagnostics.rs

davidtwco · 2022-11-08T14:19:16Z

compiler/rustc_resolve/src/diagnostics.rs

+                                Some(errs::UnreachableLabelSubLabel { ident_span: ident.span }),
+                                Some(errs::UnreachableLabelSubSuggestion {
+                                    span,
+                                    ident_name: ident.name,


..likewise here.

this one being used in 'suggestion', so seems like need to leave as is.

davidtwco · 2022-11-08T14:19:58Z

compiler/rustc_resolve/src/diagnostics.rs

-                );
-                err
+                    path_span: path.span,
+                    path_str: pprust::path_to_string(&path),


This might be another case where we can use IntoDiagnosticArg and embed the meaningful type directly in the error.

that string is part of a suggestion, so need to leave as is.

davidtwco · 2022-11-08T14:20:41Z

compiler/rustc_resolve/src/diagnostics.rs

-                    Applicability::MaybeIncorrect,
-                );
-                err
+                    path_span: path.span,


Just a note for myself: we should have a IntoDiagnosticSpan trait and use that for all the various types that contain spans, like paths here or Ident.

compiler/rustc_resolve/src/diagnostics.rs

@compiler-errors

implement binding_shadows migrate till self-in-generic-param-default use braces in fluent message as suggested by @compiler-errors. to fix lock file issue reported by CI migrate 'unreachable label' error run formatter name the variables correctly in fluent file SessionDiagnostic -> Diagnostic test "pattern/pat-tuple-field-count-cross.rs" passed test "resolve/bad-env-capture2.rs" passed test "enum/enum-in-scope.rs" and other depended on "resolve_binding_shadows_something_unacceptable" should be passed now. fix crash errors while running test-suite. there might be more. then_some(..) suits better here. all tests passed convert TraitImpl and InvalidAsm. TraitImpl is buggy yet. will fix after receiving help from Zulip migrate "Ralative-2018" migrate "ancestor only" migrate "expected found" migrate "Indeterminate" migrate "module only" revert to the older implementation for now. since this is failing at the moment. follow the convension for fluent variable order the diag attribute as suggested in review comment fix merge error. migrate trait-impl-duplicate make the changes compatible with "Flatten diagnostic slug modules rust-lang#103345" fix merge remove commented code merge issues fix review comments fix tests

davidtwco · 2022-11-15T10:44:42Z

@bors r+

bors · 2022-11-15T10:44:44Z

📌 Commit 269ce36 has been approved by davidtwco

It is now in the queue for this repository.

Migrate rustc_resolve to use SessionDiagnostic, part # 1 crate a somewhat on larger size, so plz allow some time to get it finished.

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#101162 (Migrate rustc_resolve to use SessionDiagnostic, part # 1) - rust-lang#103386 (Don't allow `CoerceUnsized` into `dyn*` (except for trait upcasting)) - rust-lang#103405 (Detect incorrect chaining of if and if let conditions and recover) - rust-lang#103594 (Fix non-associativity of `Instant` math on `aarch64-apple-darwin` targets) - rust-lang#104006 (Add variant_name function to `LangItem`) - rust-lang#104494 (Migrate GUI test to use functions) - rust-lang#104516 (rustdoc: clean up sidebar width CSS) - rust-lang#104550 (fix a typo) Failed merges: - rust-lang#104554 (Use `ErrorGuaranteed::unchecked_claim_error_was_emitted` less) r? `@ghost` `@rustbot` modify labels: rollup

bors · 2022-11-18T23:46:14Z

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

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#101162 (Migrate rustc_resolve to use SessionDiagnostic, part # 1) - rust-lang#103386 (Don't allow `CoerceUnsized` into `dyn*` (except for trait upcasting)) - rust-lang#103405 (Detect incorrect chaining of if and if let conditions and recover) - rust-lang#103594 (Fix non-associativity of `Instant` math on `aarch64-apple-darwin` targets) - rust-lang#104006 (Add variant_name function to `LangItem`) - rust-lang#104494 (Migrate GUI test to use functions) - rust-lang#104516 (rustdoc: clean up sidebar width CSS) - rust-lang#104550 (fix a typo) Failed merges: - rust-lang#104554 (Use `ErrorGuaranteed::unchecked_claim_error_was_emitted` less) r? `@ghost` `@rustbot` modify labels: rollup

rust-highfive assigned fee1-dead Aug 29, 2022

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 Aug 29, 2022

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 29, 2022

rajputrajat mentioned this pull request Aug 29, 2022

Diagnostic Translation #100717

Open

84 tasks

rajputrajat force-pushed the master branch from 693431c to 6408229 Compare August 29, 2022 18:37

This comment has been minimized.

Sign in to view

rust-highfive assigned davidtwco and unassigned fee1-dead Aug 30, 2022

davidtwco reviewed Aug 30, 2022

View reviewed changes

This comment was marked as resolved.

Sign in to view

rajputrajat force-pushed the master branch from 6408229 to 0cca860 Compare September 3, 2022 19:55

This comment has been minimized.

Sign in to view

rajputrajat force-pushed the master branch from 9d31e96 to 2dc0018 Compare September 5, 2022 05:10

This comment has been minimized.

Sign in to view

rajputrajat force-pushed the master branch 2 times, most recently from 30f6b99 to 2f600ec Compare September 5, 2022 19:43

davidtwco reviewed Sep 6, 2022

View reviewed changes

compiler/rustc_error_messages/locales/en-US/resolve.ftl Outdated Show resolved Hide resolved

rajputrajat force-pushed the master branch from 2f600ec to 1e8af60 Compare September 13, 2022 11:47

rajputrajat force-pushed the master branch from ed4ac18 to 636356e Compare November 4, 2022 20:25

davidtwco requested changes Nov 8, 2022

View reviewed changes

This comment has been minimized.

Sign in to view

rajputrajat force-pushed the master branch 2 times, most recently from 37a7e9d to 269ce36 Compare November 13, 2022 14:19

davidtwco approved these changes Nov 15, 2022

View reviewed changes

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 Nov 15, 2022

Dylan-DPC mentioned this pull request Nov 16, 2022

Rollup of 9 pull requests #104479

Closed

Manishearth mentioned this pull request Nov 16, 2022

Rollup of 6 pull requests #104495

Closed

matthiaskrgr mentioned this pull request Nov 18, 2022

Rollup of 8 pull requests #104573

Merged

bors merged commit 3e59657 into rust-lang:master Nov 18, 2022

rustbot added this to the 1.67.0 milestone Nov 18, 2022

bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 18, 2022

aDotInTheVoid removed the A-rustdoc-json Area: Rustdoc JSON backend label Dec 27, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Migrate rustc_resolve to use SessionDiagnostic, part # 1 #101162

Migrate rustc_resolve to use SessionDiagnostic, part # 1 #101162

rajputrajat commented Aug 29, 2022

rustbot commented Aug 29, 2022

rust-highfive commented Aug 29, 2022

compiler-errors commented Aug 29, 2022

This comment has been minimized.

compiler-errors commented Aug 29, 2022

rajputrajat commented Aug 30, 2022

fee1-dead commented Aug 30, 2022

davidtwco left a comment

This comment was marked as resolved.

rustbot commented Sep 3, 2022

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

RalfJung commented Sep 4, 2022

This comment has been minimized.

davidtwco commented Sep 22, 2022

rajputrajat commented Nov 4, 2022

rajputrajat commented Nov 4, 2022

davidtwco Nov 8, 2022

rajputrajat Nov 13, 2022

davidtwco Nov 8, 2022

rajputrajat Nov 13, 2022

davidtwco Nov 8, 2022

This comment has been minimized.

davidtwco commented Nov 15, 2022

bors commented Nov 15, 2022

bors commented Nov 18, 2022

Migrate rustc_resolve to use SessionDiagnostic, part # 1 #101162

Migrate rustc_resolve to use SessionDiagnostic, part # 1 #101162

Conversation

rajputrajat commented Aug 29, 2022

rustbot commented Aug 29, 2022

rust-highfive commented Aug 29, 2022

compiler-errors commented Aug 29, 2022

This comment has been minimized.

compiler-errors commented Aug 29, 2022

rajputrajat commented Aug 30, 2022

fee1-dead commented Aug 30, 2022

davidtwco left a comment

Choose a reason for hiding this comment

This comment was marked as resolved.

rustbot commented Sep 3, 2022

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

RalfJung commented Sep 4, 2022

This comment has been minimized.

davidtwco commented Sep 22, 2022

rajputrajat commented Nov 4, 2022

rajputrajat commented Nov 4, 2022

davidtwco Nov 8, 2022

Choose a reason for hiding this comment

rajputrajat Nov 13, 2022

Choose a reason for hiding this comment

davidtwco Nov 8, 2022

Choose a reason for hiding this comment

rajputrajat Nov 13, 2022

Choose a reason for hiding this comment

davidtwco Nov 8, 2022

Choose a reason for hiding this comment

This comment has been minimized.

davidtwco commented Nov 15, 2022

bors commented Nov 15, 2022

bors commented Nov 18, 2022