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

Reduce fluent boilerplate #118158

Merged
merged 5 commits into from
Nov 26, 2023
Merged

Conversation

nnethercote
Copy link
Contributor

Best reviewed one commit at a time.

r? @davidtwco

@rustbot rustbot added A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic 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 Nov 22, 2023
@rustbot
Copy link
Collaborator

rustbot commented Nov 22, 2023

rustc_error_messages was changed

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

Some changes occurred in compiler/rustc_codegen_gcc

cc @antoyo

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@bors
Copy link
Contributor

bors commented Nov 25, 2023

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

It's empty, and it doesn't even make sense, because
`rustc_error_messages` is a lower-level crate than `rustc_errors`.
The `fluent_messages!` macro produces uses of
`crate::{D,Subd}iagnosticMessage`, which means that every crate using
the macro must have this import:
```
use rustc_errors::{DiagnosticMessage, SubdiagnosticMessage};
```

This commit changes the macro to instead use
`rustc_errors::{D,Subd}iagnosticMessage`, which avoids the need for the
imports.
Currently we always do this:
```
use rustc_fluent_macro::fluent_messages;
...
fluent_messages! { "./example.ftl" }
```
But there is no need, we can just do this everywhere:
```
rustc_fluent_macro::fluent_messages! { "./example.ftl" }
```
which is shorter.
@nnethercote
Copy link
Contributor Author

I rebased.

@compiler-errors
Copy link
Member

r? compiler-errors @bors r+

@bors
Copy link
Contributor

bors commented Nov 25, 2023

📌 Commit af3fbb3 has been approved by compiler-errors

It is now in the queue for this repository.

@rustbot rustbot assigned compiler-errors and unassigned davidtwco Nov 25, 2023
@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 Nov 25, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 25, 2023
…mpiler-errors

Rollup of 7 pull requests

Successful merges:

 - rust-lang#117651 (coverage: Simplify building coverage expressions based on sums)
 - rust-lang#117968 (Stabilize `ptr::addr_eq`)
 - rust-lang#118158 (Reduce fluent boilerplate)
 - rust-lang#118201 (Miscellaneous `ObligationCauseCode` cleanups)
 - rust-lang#118288 (Use `is_{some,ok}_and` more in the compiler)
 - rust-lang#118289 (`is_{some,ok}_and` for rustdoc)
 - rust-lang#118290 (Don't ICE when encountering placeholders in implied bounds computation)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 26, 2023
…mpiler-errors

Rollup of 7 pull requests

Successful merges:

 - rust-lang#117651 (coverage: Simplify building coverage expressions based on sums)
 - rust-lang#117968 (Stabilize `ptr::addr_eq`)
 - rust-lang#118158 (Reduce fluent boilerplate)
 - rust-lang#118201 (Miscellaneous `ObligationCauseCode` cleanups)
 - rust-lang#118288 (Use `is_{some,ok}_and` more in the compiler)
 - rust-lang#118289 (`is_{some,ok}_and` for rustdoc)
 - rust-lang#118290 (Don't ICE when encountering placeholders in implied bounds computation)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 3b2f33e into rust-lang:master Nov 26, 2023
11 checks passed
@rustbot rustbot added this to the 1.76.0 milestone Nov 26, 2023
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Nov 26, 2023
Rollup merge of rust-lang#118158 - nnethercote:reduce-fluent-boilerplate, r=compiler-errors

Reduce fluent boilerplate

Best reviewed one commit at a time.

r? `@davidtwco`
@nnethercote nnethercote deleted the reduce-fluent-boilerplate branch November 26, 2023 22:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic 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.

6 participants