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.

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

Make sure to include default en-US ftl resources for rustc_error crate #112973

Merged
merged 1 commit into from
Jun 24, 2023

Conversation

compiler-errors
Copy link
Member

Fixes #112928

@rustbot
Copy link
Collaborator

rustbot commented Jun 23, 2023

r? @TaKO8Ki

(rustbot has picked a reviewer for you, use r? to override)

@rustbot 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. labels Jun 23, 2023
@@ -97,6 +97,7 @@ pub static DEFAULT_LOCALE_RESOURCES: &[&str] = &[
rustc_codegen_ssa::DEFAULT_LOCALE_RESOURCE,
Copy link
Member Author

Choose a reason for hiding this comment

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

Side-note: It really sucks that we have to keep this in sync and that nothing detects when it's missing a crate entry -- cc @davidtwco

Copy link
Member

@chenyukang chenyukang Jun 24, 2023

Choose a reason for hiding this comment

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

Seems except rustc_codegen_gcc/messages.ftl and rustc_codegen_llvm/messages.ftl, all other messages.ftl should be included here.
Maybe we need a tidy check?

Copy link
Member Author

Choose a reason for hiding this comment

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

Copy link
Member Author

Choose a reason for hiding this comment

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

Oops, I misread your message. I guess this could be implemented as a tidy check as a first pass, yeah.

Copy link
Member

@jyn514 jyn514 left a comment

Choose a reason for hiding this comment

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

good catch, ty! r=me with ci passing

@compiler-errors
Copy link
Member Author

@bors r=jyn514

@bors
Copy link
Contributor

bors commented Jun 23, 2023

📌 Commit 0710040 has been approved by jyn514

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 Jun 23, 2023
@compiler-errors compiler-errors assigned jyn514 and unassigned TaKO8Ki Jun 23, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 24, 2023
…mpiler-errors

Rollup of 8 pull requests

Successful merges:

 - rust-lang#111087 (Implement `Sync` for `mpsc::Sender`)
 - rust-lang#112763 (Bump compiler_builtins)
 - rust-lang#112963 (Stop bubbling out hidden types from the eval obligation queries)
 - rust-lang#112965 (Don't emit same goal as input during `wf::unnormalized_obligations`)
 - rust-lang#112973 (Make sure to include default en-US ftl resources for `rustc_error` crate)
 - rust-lang#112981 (Fix return type notation errors with -Zlower-impl-trait-in-trait-to-assoc-ty)
 - rust-lang#112983 (Fix return type notation associated type suggestion when -Zlower-impl-trait-in-trait-to-assoc-ty)
 - rust-lang#112986 (Update cargo)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 3148bcf into rust-lang:master Jun 24, 2023
@rustbot rustbot added this to the 1.72.0 milestone Jun 24, 2023
@compiler-errors compiler-errors deleted the oops-forgot-ftl branch August 11, 2023 20:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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
Development

Successfully merging this pull request may close these issues.

Compiler ICE with custom target - string translation missing?
6 participants