Simplify message paths #108682
Merged
Simplify message paths #108682
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
A-query-system
|
Some changes occurred in compiler/rustc_codegen_gcc cc @antoyo
|
|
☔ The latest upstream changes (presumably #108707) made this pull request unmergeable. Please resolve the merge conflicts. |
|
☔ The latest upstream changes (presumably #108877) made this pull request unmergeable. Please resolve the merge conflicts. |
|
@bors delegate=est31 Feel free to approve this after you rebase, it's likely to be a bit conflict prone. |
|
✌️ @est31 can now approve this pull request |
|
It's strange that github/bors shows this as a merge conflict as local rebasing works well without requiring merge conflict resolution... |
|
Yeah, sometimes that happens. I think bors's merge conflict resolution is a bit pessimistic? |
|
@bors r=davidtwco p=1 (conflict prone) |
|
📌 Commit 03cc5131e56062d177a32695334fd3a818b6381d has been approved by It is now in the queue for this repository. |
bors
added
S-waiting-on-bors
|
☔ The latest upstream changes (presumably #108919) made this pull request unmergeable. Please resolve the merge conflicts. |
bors
added
S-waiting-on-author
|
Hmm yeah getting this merged is a bit difficult, like #103042 was. outside of splitting it up or p=10 above rollups, the only chance is to wait until the stars line up so that no rollup PR is in the queue (usually those do change ftl files), and a PR is currently being tried that doesn't modify ftl files. Then one would rebase right at that moment, and and approve the pr. I will spend the next week looking for opportunities to merge this. If there is still none, I will just set p=10. |
|
I would wait until the queue is calmed down, then land it with p=10. |
This makes it easier to open the messages file while developing on features. The commit was the result of automatted changes: for p in compiler/rustc_*; do mv $p/locales/en-US.ftl $p/messages.ftl; rmdir $p/locales; done for p in compiler/rustc_*; do sed -i "s#\.\./locales/en-US.ftl#../messages.ftl#" $p/src/lib.rs; done
|
Okay, I'd say it's calmed down now, only 26 PRs waiting for admittance now. @bors r=davidtwco |
bors
removed
the
S-waiting-on-author
|
💔 Test failed - checks-actions |
bors
added
S-waiting-on-review
bors
added
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
This was referenced Mar 12, 2023
Closed
Merged
|
Finished benchmarking commit (501ad02): comparison URL. Overall result: ❌ regressions - no action needed@rustbot label: -perf-regression Instruction countThis is a highly reliable metric that was used to determine the overall result at the top of this comment.
Max RSS (memory usage)ResultsThis is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.
CyclesThis benchmark run did not return any relevant results for this metric. |
|
The job Click to see the possible cause of the failure (guessed by this bot) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This makes it easier to open the messages file. Right now I have to first click on the
localesdir to open it, and then on theen-US.ftlfile.Cargo.tomlandbuild.rsfiles are also in the top level, and I think there should not be more than one file, so a directory isn't really needed. The chosen strategy for pontoon adoption is out of tree. Even if this descision is changed in the future, themessages.ftlapproach is also compatible with non-english translations living in-tree, as long as the non-english translations don't live in thecompiler/rustc_foo/directories but in different ones. That would also be helpful for grepability purposes.The commit was the result of automated changes:
r? @davidtwco