From 5b3bde953ed70df2f22650f77cf5c13a4dc15836 Mon Sep 17 00:00:00 2001 From: Xiretza Date: Mon, 19 Aug 2024 07:46:17 +0000 Subject: fluent_macro: fix diagnostics for fluent parse failures This line number calculation was both wrong and unnecessary. --- compiler/rustc_fluent_macro/src/fluent.rs | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'compiler/rustc_fluent_macro/src/fluent.rs') 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 = 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)), -- cgit 1.4.1-3-g733a5