More translatable diagnostics #123822

Xiretza · 2024-04-11T20:24:29Z

rustbot · 2024-04-11T20:24:37Z

rustbot has assigned @pnkfelix.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

pnkfelix · 2024-04-12T14:11:53Z

This looks fine to me from what I understand about it, but I am not an expert on the fluent machinery. The review should perhaps be assigned to @davidtwco or someone else who is more knowledgable there.

In any case, since this is marked as draft PR, I'm going to switch it back to waiting-on-author, to get it out of my review queue while it is in draft.

@rustbot author

Xiretza · 2024-04-14T12:45:54Z

compiler/rustc_session/src/errors.rs

+        f: F,
+    ) {
+        if let Some(issue) = self.issue {
+            issue.add_to_diag_with(diag, |diag, msg| f(diag, msg));


I'm not happy about this, ideally F would be a reference so it can be copied into nested add_to_diag_with() calls instead of being wrappen in another closure.

bors · 2024-04-27T03:13:28Z

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

bors · 2024-05-20T22:53:35Z

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

Dylan-DPC · 2024-08-14T15:16:20Z

@Xiretza can you resolve the latest conflicts? then we can push this further after that :) thanks

rustbot · 2024-08-27T16:40:35Z

rustc_error_messages was changed

cc @davidtwco, @compiler-errors, @TaKO8Ki

bors · 2024-08-27T23:53:29Z

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

apiraino · 2024-08-29T13:22:47Z

r? compiler

bors · 2024-09-11T07:38:32Z

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

Suggesting to remove the entire thing makes no sense, especially not as MachineApplicable.

Using: - icu4x-datagen 1.5.0 - CLDR 45.0.0 - icuexport icu4x/2024-05-16/75.x The "pub use __impliterable*" lines in macros.rs need to be removed manually to avoid unused reexport errors.

Xiretza · 2024-09-13T20:23:09Z

@cjgillot ping

cjgillot · 2024-09-14T00:48:16Z

compiler/rustc_baked_icu_data/src/data/macros.rs

 mod fallback_supplement_co_v1;
 #[doc(inline)]
 pub use __impl_fallback_supplement_co_v1 as impl_fallback_supplement_co_v1;
 #[macro_use]
-#[path = "macros/list_and_v1.data.rs"]
+#[path = "macros/list_and_v1.rs.data"]
 mod list_and_v1;
 #[doc(inline)]
 pub use __impl_list_and_v1 as impl_list_and_v1;


I don't understand this sentence in the commit message:

The "pub use __impliterable*" lines in macros.rs need to be removed manually to avoid unused reexport errors.

Could an #[allow(unused_something)] help?

cjgillot · 2024-09-14T00:53:14Z

compiler/rustc_session/src/parse.rs

-    if sess.psess.unstable_features.is_nightly_build() {
-        if feature_from_cli {
-            err.subdiagnostic(CliFeatureDiagnosticHelp { feature });
+    let (enable_feature, upgrade_compiler) = if sess.psess.unstable_features.is_nightly_build() {


Could you split this in two? That will be more readable. Maybe cache is_nightly_build() as it looks at env vars.

cjgillot · 2024-09-14T00:57:43Z

compiler/rustc_ast_lowering/src/lib.rs

-                            self.dcx().create_err(errors::BadReturnTypeNotation::NeedsDots {
-                                span: data.inputs_span,
-                            })
+                            errors::BadReturnTypeNotation::NeedsDots { span: data.inputs_span }


No subdiagnostic for this one?

cjgillot · 2024-09-14T00:59:06Z

compiler/rustc_hir_analysis/src/errors.rs

@@ -987,6 +988,8 @@ pub(crate) struct MissingTraitItemUnstable {
    pub some_note: bool,
    #[note(hir_analysis_none_note)]
    pub none_note: bool,
+    #[subdiagnostic]
+    pub subdiag: FeatureGateSubdiagnostic,


Could you use a more descriptive name?

cjgillot · 2024-09-14T00:59:13Z

compiler/rustc_ast_lowering/src/errors.rs

@@ -386,12 +387,16 @@ pub(crate) enum BadReturnTypeNotation {
        #[primary_span]
        #[suggestion(code = "()", applicability = "maybe-incorrect")]
        span: Span,
+        #[subdiagnostic]
+        subdiag: Option<FeatureGateSubdiagnostic>,


Could you use a more descriptive name?

cjgillot · 2024-09-14T00:59:18Z

compiler/rustc_ast_lowering/src/errors.rs

    },
    #[diag(ast_lowering_bad_return_type_notation_output)]
    Output {
        #[primary_span]
        #[suggestion(code = "", applicability = "maybe-incorrect")]
        span: Span,
+        #[subdiagnostic]
+        subdiag: Option<FeatureGateSubdiagnostic>,


Could you use a more descriptive name?

cjgillot · 2024-09-14T01:01:13Z

compiler/rustc_errors/src/diagnostic_impls.rs

+        DiagArgValue::Str(Cow::Owned(pprust::tt_to_string(&self)))
+    }
+}
+


Could you put this change in the commit where you actually use it?

cjgillot · 2024-09-14T01:01:46Z

compiler/rustc_errors/src/diagnostic_impls.rs

+        DiagArgValue::Str(Cow::from(self.to_string()))
+    }
+}
+


Could you put this change in the commit where you actually use it?

cjgillot · 2024-09-14T01:03:48Z

compiler/rustc_expand/src/errors.rs

+    #[primary_span]
+    pub span: Span,
+    #[subdiagnostic]
+    pub subdiag: FeatureGateSubdiagnostic,


Could you use a more descriptive name?

cjgillot · 2024-09-14T01:03:53Z

compiler/rustc_expand/src/errors.rs

+    #[primary_span]
+    pub span: Span,
+    #[subdiagnostic]
+    pub subdiag: FeatureGateSubdiagnostic,


Could you use a more descriptive name?

bors · 2024-09-23T04:49:50Z

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

Dylan-DPC · 2024-10-18T15:11:03Z

@Xiretza any updates on this? thanks

Xiretza · 2024-10-26T19:23:58Z

I haven't had the required motivation to work on this, and now that the translation effort seems to have somwhat failed anyway, I doubt I will find it in the future.

rustbot assigned pnkfelix Apr 11, 2024

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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Apr 11, 2024

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 Apr 12, 2024

Xiretza force-pushed the more-translatable-diagnostics branch 2 times, most recently from ca845fe to 6d0b4f2 Compare April 12, 2024 19:55