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

translation: eager translation #102623

Merged
merged 8 commits into from
Oct 12, 2022
Merged

translation: eager translation #102623

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
febbf71
macros: tidy up lint changes
davidtwco Oct 3, 2022
508d7e6
errors: use `HashMap` to store diagnostic args
davidtwco Oct 3, 2022
b4ac262
errors: `AddToDiagnostic::add_to_diagnostic_with`
davidtwco Oct 3, 2022
540b203
errors: `DiagnosticMessage::Eager`
davidtwco Oct 3, 2022
291a473
macros: `#[subdiagnostic(eager)]`
davidtwco Oct 3, 2022
113e943
query_system: finish migration
davidtwco Oct 3, 2022
7e20929
macros: separate suggestion fmt'ing and emission
davidtwco Oct 3, 2022
fbac1f2
macros: simplify field ordering in diag derive
davidtwco Oct 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions compiler/rustc_error_messages/locales/en-US/query_system.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ query_system_cycle_usage = cycle used when {$usage}

query_system_cycle_stack_single = ...which immediately requires {$stack_bottom} again

query_system_cycle_stack_middle = ...which requires {$desc}...
Copy link
Contributor

Choose a reason for hiding this comment

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

@davidtwco How about those English words inside ($desc}?

- note: ...which requires computing the super traits of B...

Copy link
Member Author

Choose a reason for hiding this comment

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

That's a good point - these will need fixed, they're currently provided by the query system's macro for defining queries, so that will require some future work to address.


query_system_cycle_stack_multiple = ...which again requires {$stack_bottom}, completing the cycle

query_system_cycle_recursive_ty_alias = type aliases cannot be recursive
Expand Down
15 changes: 4 additions & 11 deletions compiler/rustc_query_system/src/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,15 @@
use rustc_errors::{AddToDiagnostic, Diagnostic, SubdiagnosticMessage};
use rustc_macros::{Diagnostic, Subdiagnostic};
use rustc_session::Limit;
use rustc_span::{Span, Symbol};

#[derive(Subdiagnostic)]
#[note(query_system::cycle_stack_middle)]
pub struct CycleStack {
#[primary_span]
pub span: Span,
pub desc: String,
}

impl AddToDiagnostic for CycleStack {
fn add_to_diagnostic_with<F>(self, diag: &mut Diagnostic, _: F)
where
F: Fn(&mut Diagnostic, SubdiagnosticMessage) -> SubdiagnosticMessage,
{
diag.span_note(self.span, &format!("...which requires {}...", self.desc));
}
}

#[derive(Copy, Clone)]
pub enum HandleCycleError {
Error,
Expand Down Expand Up @@ -56,7 +49,7 @@ pub struct Cycle {
#[primary_span]
pub span: Span,
pub stack_bottom: String,
#[subdiagnostic]
#[subdiagnostic(eager)]
pub cycle_stack: Vec<CycleStack>,
#[subdiagnostic]
pub stack_count: StackCount,
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_query_system/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#![feature(min_specialization)]
#![feature(extern_types)]
#![allow(rustc::potential_query_instability)]
// #![deny(rustc::untranslatable_diagnostic)]
#![deny(rustc::untranslatable_diagnostic)]
#![deny(rustc::diagnostic_outside_of_impl)]

#[macro_use]
Expand Down