most `borrowck` diagnostic migration #101686

AndyJado · 2022-09-11T12:33:07Z

Covered the simple cases for the whole crate, looking for merge. Then I can focus on the nested ones, rebase is becoming rather slow.

@rustbot label +S-waiting-on-author -S-waiting-on-review

rust-highfive · 2022-09-11T12:33:10Z

r? @petrochenkov

(rust-highfive has picked a reviewer for you, use r? to override)

AndyJado · 2022-09-11T12:34:06Z

r? @davidtwco

rustbot · 2022-09-11T13:25:52Z

rustc_error_messages was changed

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

compiler/rustc_borrowck/src/borrowck_errors.rs

compiler/rustc_borrowck/src/diagnostics/explain_borrow.rs

compiler/rustc_borrowck/src/diagnostics/mutability_errors.rs

compiler/rustc_borrowck/src/diagnostics/outlives_suggestion.rs

compiler/rustc_borrowck/src/diagnostics/region_name.rs

compiler/rustc_borrowck/src/region_infer/opaque_types.rs

davidtwco · 2022-09-12T15:35:58Z

I'd also like it if you could squash some of your commits because these aren't particularly meaningful to anyone reading them later to understand the changes you've made and why.

estebank · 2022-09-19T15:27:25Z

Please run x.py fmt

AndyJado · 2022-09-21T08:17:51Z

compiler/rustc_borrowck/src/diagnostics/explain_borrow.rs

+                            borrow_desc: br_desc,
+                            local_name,
+                            type_desc: &type_desc,
+                            dtor_desc,


Except english words, There are also variables passed in dtor_desc, which would be better:

add a field for the diagnose struct

make dtor_desc a subdiag

some flunet magic I should go check out

Probably a subdiagnostic.

compiler/rustc_borrowck/src/borrowck_errors.rs

davidtwco · 2022-09-22T09:53:14Z

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

@@ -54,7 +54,311 @@ borrowck_returned_lifetime_wrong =
    {$mir_def_name} was supposed to return data with lifetime `{$outlived_fr_name}` but it is returning data with lifetime `{$fr_name}`

 borrowck_returned_lifetime_short =
-    {$category_desc}requires that `{$free_region_name}` must outlive `{$outlived_fr_name}`
+    {$category ->
+        [Assignment] assignment {""}


Is it necessary to end all of these with an empty string? I assume you don't want to just add a space after the selector because then the other case would have two leading spaces? Maybe we could trim translated messages to avoid this, that's probably sensible anyway.

davidtwco · 2022-09-22T09:54:03Z

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

+        [OpaqueType] opaque type {""}
+        [ClosureUpvar] closure capture {""}
+        [Usage] this usage {""}
+        *[other] {""}


How practical do you think it would be to separate these out into variants of a type rather than using string-based dispatching?

davidtwco · 2022-09-22T09:54:42Z

compiler/rustc_borrowck/src/diagnostics/explain_borrow.rs

+                            borrow_desc: br_desc,
+                            local_name,
+                            type_desc: &type_desc,
+                            dtor_desc,


Probably a subdiagnostic.

rust-log-analyzer · 2022-09-26T12:20:58Z

The job x86_64-gnu-llvm-13 failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

Copying stage2 rustc from stage1 (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu / x86_64-unknown-linux-gnu)
Check compiletest suite=ui-fulldeps mode=ui (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)

running 71 tests
Some tests failed in compiletest suite=ui-fulldeps mode=ui host=x86_64-unknown-linux-gnu target=x86_64-unknown-linux-gnu
F....F.................i...............................................

---- [ui] src/test/ui-fulldeps/dropck-tarena-unsound-drop.rs stdout ----
diff of stderr:


7    | -
8    | |
9    | `arena` dropped here while still borrowed
-    | borrow might be used here, when `arena` is dropped and runs the `Drop` code for type `TypedArena`
+    | borrow might be used here, when `arena` is dropped and runs the destructor for type `TypedArena`
12 error: aborting due to previous error
13 



The actual stderr differed from the expected stderr.
Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui-fulldeps/dropck-tarena-unsound-drop/dropck-tarena-unsound-drop.stderr
To update references, rerun the tests and pass the `--bless` flag
To only update this specific test, also pass `--test-args dropck-tarena-unsound-drop.rs`

error: 1 errors occurred comparing output.
status: exit status: 1
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui-fulldeps/dropck-tarena-unsound-drop.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Cstrip=debuginfo" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui-fulldeps/dropck-tarena-unsound-drop" "-A" "unused" "-Crpath" "-Cdebuginfo=0" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui-fulldeps/dropck-tarena-unsound-drop/auxiliary"
stdout: none
--- stderr -------------------------------
error[E0597]: `arena` does not live long enough
   |
   |
LL |     f(&arena);
   |       ^^^^^^ borrowed value does not live long enough
LL | } //~^ ERROR `arena` does not live long enough
   | |
   | |
   | `arena` dropped here while still borrowed
   | borrow might be used here, when `arena` is dropped and runs the destructor for type `TypedArena`
error: aborting due to previous error

For more information about this error, try `rustc --explain E0597`.
------------------------------------------
------------------------------------------


---- [ui] src/test/ui-fulldeps/dropck-tarena-cycle-checked.rs stdout ----
diff of stderr:

7    | -
8    | |
9    | `arena` dropped here while still borrowed
-    | borrow might be used here, when `arena` is dropped and runs the `Drop` code for type `TypedArena`
+    | borrow might be used here, when `arena` is dropped and runs the destructor for type `TypedArena`
12 error: aborting due to previous error
13 



The actual stderr differed from the expected stderr.
Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui-fulldeps/dropck-tarena-cycle-checked/dropck-tarena-cycle-checked.stderr
To update references, rerun the tests and pass the `--bless` flag
To only update this specific test, also pass `--test-args dropck-tarena-cycle-checked.rs`

error: 1 errors occurred comparing output.
status: exit status: 1
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui-fulldeps/dropck-tarena-cycle-checked.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Cstrip=debuginfo" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui-fulldeps/dropck-tarena-cycle-checked" "-A" "unused" "-Crpath" "-Cdebuginfo=0" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui-fulldeps/dropck-tarena-cycle-checked/auxiliary"
stdout: none
--- stderr -------------------------------
error[E0597]: `arena` does not live long enough
   |
   |
LL |     f(&arena);
   |       ^^^^^^ borrowed value does not live long enough
LL | } //~^ ERROR `arena` does not live long enough
   | |
   | |
   | `arena` dropped here while still borrowed
   | borrow might be used here, when `arena` is dropped and runs the destructor for type `TypedArena`
error: aborting due to previous error

For more information about this error, try `rustc --explain E0597`.
------------------------------------------

bors · 2022-10-14T01:37:33Z

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

Noratrieb · 2022-10-23T11:50:38Z

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!

davidtwco

Apologies for the delay in getting back to reviewing this.

davidtwco · 2022-11-03T15:56:15Z

compiler/rustc_borrowck/src/borrowck_errors.rs

+        let case: ClosureConstructLabel;
+        let diff_span: Option<Span>;
        if old_loan_span == new_loan_span {
-            err.span_label(
-                old_loan_span,
-                "closures are constructed here in different iterations of loop",
-            );
+            case = ClosureConstructLabel::Both { old_loan_span };
+            diff_span = None;
        } else {
-            err.span_label(old_loan_span, "first closure is constructed here");
-            err.span_label(new_loan_span, "second closure is constructed here");
+            case = ClosureConstructLabel::First { old_loan_span };
+            diff_span = Some(new_loan_span);
        }


let (case, diff_span) = if /* .. */ { /* .. */ } else { /* .. */ };

I think this would be tidier if it was written this way.

davidtwco · 2022-11-03T15:57:12Z

compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs


                let loop_message = if location == move_out.source || move_site.traversed_back_edge {
-                    ", in previous iteration of loop"
+                    "InLoop"


I think it would be better if we could avoid having strings like these and dispatching on them - it isn't easy for translators to know what possible values there are.

davidtwco · 2022-11-03T15:58:06Z

compiler/rustc_borrowck/src/region_infer/opaque_types.rs

@@ -418,6 +414,7 @@ fn check_opaque_type_parameter_valid(
                .into_iter()
                .map(|i| tcx.def_span(opaque_generics.param_at(i, tcx).def_id))
                .collect();
+            // FIXME(#100717) requires eager translation/list support


We have eager translation now.

davidtwco · 2022-11-03T15:58:58Z

src/test/ui/dropck/dropck-union.stderr

@@ -7,7 +7,7 @@ LL | }
   | -
   | |
   | `v` dropped here while still borrowed
-   | borrow might be used here, when `v` is dropped and runs the `Drop` code for type `Wrap`
+   | borrow might be used here, when `v` is dropped and runs the destructor for type `Wrap`


I don't think there's much advantage to changing the message here.

AndyJado · 2022-11-04T05:09:37Z

I am closing this PR since it relies too much on string base dispatch and out-dated discussion.

I'll try to keep following PR clear and small like this one

rust-highfive assigned petrochenkov Sep 11, 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 Sep 11, 2022

rustbot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Sep 11, 2022

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

rust-highfive assigned davidtwco and unassigned petrochenkov Sep 11, 2022

AndyJado mentioned this pull request Sep 11, 2022

Borrowck: diag migrate #101276

Closed

AndyJado marked this pull request as ready for review September 11, 2022 13:25

davidtwco mentioned this pull request Sep 12, 2022

Diagnostic Translation #100717

Open

84 tasks

davidtwco requested changes Sep 12, 2022

View reviewed changes

This comment was marked as resolved.

Sign in to view

AndyJado force-pushed the local branch from 0565a26 to f94fa92 Compare September 19, 2022 12:56

AndyJado marked this pull request as draft September 19, 2022 13:43

This comment has been minimized.

Sign in to view

AndyJado force-pushed the local branch 3 times, most recently from 55d0619 to e34758c Compare September 21, 2022 06:50

AndyJado commented Sep 21, 2022

View reviewed changes

AndyJado requested a review from davidtwco September 21, 2022 09:02

AndyJado marked this pull request as ready for review September 21, 2022 10:38

davidtwco removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Sep 22, 2022

davidtwco reviewed Sep 22, 2022

View reviewed changes

AndyJado force-pushed the local branch 2 times, most recently from 7fb512b to 3491f33 Compare September 25, 2022 15:02

This comment was marked as resolved.

Sign in to view

AndyJado added 5 commits September 26, 2022 10:54

borrowck some amount of diag migration

b000803

opaque types descr

ea4519e

according PR#10558 derive name changed

0b411c8

why fail?

d536c17

ui-test conflict err

9768960

AndyJado force-pushed the local branch from 3491f33 to 9768960 Compare September 26, 2022 02:55

AndyJado marked this pull request as draft October 18, 2022 01:46

davidtwco requested changes Nov 3, 2022

View reviewed changes

AndyJado closed this Nov 4, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

most `borrowck` diagnostic migration #101686

most `borrowck` diagnostic migration #101686

AndyJado commented Sep 11, 2022

rust-highfive commented Sep 11, 2022

AndyJado commented Sep 11, 2022

rustbot commented Sep 11, 2022

davidtwco commented Sep 12, 2022

This comment was marked as resolved.

This comment has been minimized.

estebank commented Sep 19, 2022

AndyJado Sep 21, 2022

davidtwco Sep 22, 2022

davidtwco Sep 22, 2022

davidtwco Sep 22, 2022

davidtwco Sep 22, 2022

This comment was marked as resolved.

rust-log-analyzer commented Sep 26, 2022

bors commented Oct 14, 2022

Noratrieb commented Oct 23, 2022

davidtwco left a comment

davidtwco Nov 3, 2022

davidtwco Nov 3, 2022

davidtwco Nov 3, 2022

davidtwco Nov 3, 2022

AndyJado commented Nov 4, 2022

most borrowck diagnostic migration #101686

most borrowck diagnostic migration #101686

Conversation

AndyJado commented Sep 11, 2022

rust-highfive commented Sep 11, 2022

AndyJado commented Sep 11, 2022

rustbot commented Sep 11, 2022

davidtwco commented Sep 12, 2022

This comment was marked as resolved.

This comment has been minimized.

estebank commented Sep 19, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

This comment was marked as resolved.

rust-log-analyzer commented Sep 26, 2022

bors commented Oct 14, 2022

Noratrieb commented Oct 23, 2022

davidtwco left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

AndyJado commented Nov 4, 2022

most `borrowck` diagnostic migration #101686

most `borrowck` diagnostic migration #101686