Flatten diagnostic slug modules #103345
Flatten diagnostic slug modules #103345
Conversation
rustbot
added
A-query-system
|
Some changes occurred in compiler/rustc_codegen_gcc cc @antoyo
cc @davidtwco, @compiler-errors, @JohnTitor, @estebank, @TaKO8Ki |
rust-highfive
added
the
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
|
☔ The latest upstream changes (presumably #103344) made this pull request unmergeable. Please resolve the merge conflicts. |
Nilstrieb
force-pushed
the
diag-flat
branch
3 times, most recently
from
d077875
to
6703872
Compare
|
☔ The latest upstream changes (presumably #103398) made this pull request unmergeable. Please resolve the merge conflicts. |
|
@bors r+ rollup=never p=2 bitrotty |
|
📌 Commit 20897c6f83ad86de0e006b34de5a00a459b12f94 has been approved by It is now in the queue for this repository. |
bors
added
S-waiting-on-bors
|
⌛ Testing commit 20897c6f83ad86de0e006b34de5a00a459b12f94 with merge 7fd8ed5467e188686e19738bcdecae24304d6981... |
|
💥 Test timed out |
bors
added
S-waiting-on-review
|
@bors delegate+ r=me after rebasing |
|
✌️ @Nilstrieb can now approve this pull request |
This comment has been minimized.
This comment has been minimized.
This will make it easier to grep for fluent message names.
|
Finished benchmarking commit (e64f111): comparison URL. Overall result: no relevant changes - no action needed@rustbot label: -perf-regression Instruction countThis benchmark run did not return any relevant results for this metric. 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. Footnotes |
As implemented in rust-lang/rust#103345
implement binding_shadows migrate till self-in-generic-param-default use braces in fluent message as suggested by @compiler-errors. to fix lock file issue reported by CI migrate 'unreachable label' error run formatter name the variables correctly in fluent file SessionDiagnostic -> Diagnostic test "pattern/pat-tuple-field-count-cross.rs" passed test "resolve/bad-env-capture2.rs" passed test "enum/enum-in-scope.rs" and other depended on "resolve_binding_shadows_something_unacceptable" should be passed now. fix crash errors while running test-suite. there might be more. then_some(..) suits better here. all tests passed convert TraitImpl and InvalidAsm. TraitImpl is buggy yet. will fix after receiving help from Zulip migrate "Ralative-2018" migrate "ancestor only" migrate "expected found" migrate "Indeterminate" migrate "module only" revert to the older implementation for now. since this is failing at the moment. follow the convension for fluent variable order the diag attribute as suggested in review comment fix merge error. migrate trait-impl-duplicate make the changes compatible with "Flatten diagnostic slug modules rust-lang#103345" fix merge remove commented code merge issues fix review comments fix tests
This makes it easier to grep for the slugs in the code.
See https://rust-lang.zulipchat.com/#narrow/stream/131828-t-compiler/topic/Localization.20infra.20interferes.20with.20grepping.20for.20error for more discussion about it.
This was mostly done with a few regexes and a bunch of manual work. This also exposes a pretty annoying inconsistency for the extra labels. Some of the extra labels are defined as additional properties in the fluent message (which makes them not prefixed with the crate name) and some of them are new fluent messages themselves (which makes them prefixed with the crate name). I don't know whether we want to clean this up at some point but it's useful to know.
r? @davidtwco