Commit 501ad02
committed
Auto merge of rust-lang#108682 - est31:simplify_dirs, r=davidtwco
Simplify message paths
This makes it easier to open the messages file. Right now I have to first click on the `locales` dir to open it, and then on the `en-US.ftl` file. `Cargo.toml` and `build.rs` files 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](https://rust-lang.zulipchat.com/#narrow/stream/336883-i18n/topic/pontoon.20and.20next.20steps) is out of tree. Even if this descision is changed in the future, the `messages.ftl` approach is also compatible with non-english translations living in-tree, as long as the non-english translations don't live in the `compiler/rustc_foo/` directories but in different ones. That would also be helpful for grepability purposes.
The commit was the result of automated 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
```
r? `@davidtwco`File tree
68 files changed
+34
-34
lines changed- compiler
- rustc_ast_lowering
- src
- rustc_ast_passes
- src
- rustc_attr
- src
- rustc_borrowck
- src
- rustc_builtin_macros
- src
- rustc_codegen_gcc
- src
- rustc_codegen_llvm
- src
- rustc_codegen_ssa
- src
- rustc_const_eval
- src
- rustc_driver_impl
- src
- rustc_error_messages
- src
- rustc_errors
- src
- rustc_expand
- src
- rustc_hir_analysis
- src
- rustc_hir_typeck
- src
- rustc_incremental
- src
- rustc_infer
- src
- rustc_interface
- src
- rustc_lint
- src
- rustc_metadata
- src
- rustc_middle
- src
- rustc_mir_build
- src
- rustc_mir_dataflow
- src
- rustc_monomorphize
- src
- rustc_parse
- src
- rustc_passes
- src
- rustc_plugin_impl
- src
- rustc_privacy
- src
- rustc_query_system
- src
- rustc_resolve
- src
- rustc_session
- src
- rustc_symbol_mangling
- src
- rustc_trait_selection
- src
- rustc_ty_utils
- src
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
68 files changed
+34
-34
lines changedFile renamed without changes.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
92 | 92 | | |
93 | 93 | | |
94 | 94 | | |
95 | | - | |
| 95 | + | |
96 | 96 | | |
97 | 97 | | |
98 | 98 | | |
| |||
File renamed without changes.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
24 | | - | |
| 24 | + | |
File renamed without changes.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
26 | 26 | | |
27 | 27 | | |
28 | 28 | | |
29 | | - | |
| 29 | + | |
File renamed without changes.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
100 | 100 | | |
101 | 101 | | |
102 | 102 | | |
103 | | - | |
| 103 | + | |
104 | 104 | | |
105 | 105 | | |
106 | 106 | | |
| |||
File renamed without changes.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
56 | 56 | | |
57 | 57 | | |
58 | 58 | | |
59 | | - | |
| 59 | + | |
60 | 60 | | |
61 | 61 | | |
62 | 62 | | |
| |||
0 commit comments