diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-09-17 20:45:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-17 20:45:49 +0200 |
| commit | 8b36ecba97051d508fcdcfe33a86db35ed8713b9 (patch) | |
| tree | eef7e9be1aebcb63b1c63b79b6d1e907e7339c63 /compiler | |
| parent | e9e13a68d7271baac458addc056ffff6ddbbe57c (diff) | |
| parent | 5b3bde953ed70df2f22650f77cf5c13a4dc15836 (diff) | |
| download | rust-8b36ecba97051d508fcdcfe33a86db35ed8713b9.tar.gz rust-8b36ecba97051d508fcdcfe33a86db35ed8713b9.zip | |
Rollup merge of #129477 - Xiretza:fix-fluent-diagnostics, r=compiler-errors
Fix fluent diagnostics This line number calculation was both wrong and unnecessary.
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/rustc_fluent_macro/src/fluent.rs | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/compiler/rustc_fluent_macro/src/fluent.rs b/compiler/rustc_fluent_macro/src/fluent.rs index ca8bace28f3..37e610a85a6 100644 --- a/compiler/rustc_fluent_macro/src/fluent.rs +++ b/compiler/rustc_fluent_macro/src/fluent.rs @@ -138,25 +138,8 @@ pub(crate) fn fluent_messages(input: proc_macro::TokenStream) -> proc_macro::Tok // with a lowercase as rustc errors do. err.replace_range(0..1, &err.chars().next().unwrap().to_lowercase().to_string()); - let line_starts: Vec<usize> = std::iter::once(0) - .chain( - this.source() - .char_indices() - .filter_map(|(i, c)| Some(i + 1).filter(|_| c == '\n')), - ) - .collect(); - let line_start = line_starts - .iter() - .enumerate() - .map(|(line, idx)| (line + 1, idx)) - .filter(|(_, idx)| **idx <= pos.start) - .last() - .unwrap() - .0; - let message = annotate_snippets::Level::Error.title(&err).snippet( Snippet::source(this.source()) - .line_start(line_start) .origin(&relative_ftl_path) .fold(true) .annotation(annotate_snippets::Level::Error.span(pos.start..pos.end - 1)), |