Skip to content

Commit 5b3bde9

Browse files
committed
fluent_macro: fix diagnostics for fluent parse failures
This line number calculation was both wrong and unnecessary.
1 parent 0a25324 commit 5b3bde9

File tree

2 files changed

+5
-22
lines changed

2 files changed

+5
-22
lines changed

Diff for: compiler/rustc_fluent_macro/src/fluent.rs

-17
Original file line numberDiff line numberDiff line change
@@ -138,25 +138,8 @@ pub(crate) fn fluent_messages(input: proc_macro::TokenStream) -> proc_macro::Tok
138138
// with a lowercase as rustc errors do.
139139
err.replace_range(0..1, &err.chars().next().unwrap().to_lowercase().to_string());
140140

141-
let line_starts: Vec<usize> = std::iter::once(0)
142-
.chain(
143-
this.source()
144-
.char_indices()
145-
.filter_map(|(i, c)| Some(i + 1).filter(|_| c == '\n')),
146-
)
147-
.collect();
148-
let line_start = line_starts
149-
.iter()
150-
.enumerate()
151-
.map(|(line, idx)| (line + 1, idx))
152-
.filter(|(_, idx)| **idx <= pos.start)
153-
.last()
154-
.unwrap()
155-
.0;
156-
157141
let message = annotate_snippets::Level::Error.title(&err).snippet(
158142
Snippet::source(this.source())
159-
.line_start(line_start)
160143
.origin(&relative_ftl_path)
161144
.fold(true)
162145
.annotation(annotate_snippets::Level::Error.span(pos.start..pos.end - 1)),

Diff for: tests/ui-fulldeps/fluent-messages/test.stderr

+5-5
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,11 @@ LL | rustc_fluent_macro::fluent_messages! { "./many-lines.ftl" }
112112
= help: see additional errors emitted
113113

114114
error: expected a message field for "no_crate_bar"
115-
--> ./many-lines.ftl:15:1
116-
|
117-
15 | no_crate_bar =
118-
| ^^^^^^^^^^^^^^
119-
|
115+
--> ./many-lines.ftl:8:1
116+
|
117+
8 | no_crate_bar =
118+
| ^^^^^^^^^^^^^^
119+
|
120120

121121
error: aborting due to 14 previous errors
122122

0 commit comments

Comments
 (0)