itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-10-01 11:30:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(fontmatter): Specialize the extra frontmatter close for dashes

Browse Source 
For comparison, rustc's message is:

> error: frontmatter close does not match the opening
>   --> $DIR/mismatch-1.rs:1:1
>    |
> LL |   ---cargo
>    |   ^--
>    |   |
>    |  _the opening here has 3 dashes...
>    | |
> LL | |
> LL | | ----
>    | |_---^
>    |   |
>    |   ...while the close has 4 dashes
This commit is contained in:
Ed Page 2025-09-16 10:55:29 -05:00
parent 1b25322d8e
commit 0cbd02f093
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/cargo/util/frontmatter.rs
View File

@ -128,13 +128,26 @@ impl<'s> ScriptSource<'s> {
.unwrap_or_else(|| input.eof_offset()),
);
let content_start = input.current_token_start();
let after_closing_fence = after_closing_fence.trim_matches(is_whitespace);
if !after_closing_fence.is_empty() {
// extra characters beyond the original fence pattern, even if they are extra `-`
let extra_dashes = after_closing_fence
.chars()
.take_while(|b| *b == FENCE_CHAR)
.count();
if 0 < extra_dashes {
let extra_start = close_end;
let extra_end = extra_start + extra_dashes;
return Err(FrontmatterError::new(
format!("unexpected characters after frontmatter close"),
close_end..content_start,
format!("closing code fence has {extra_dashes} more `-` than the opening fence"),
extra_start..extra_end,
));
} else {
let after_closing_fence = after_closing_fence.trim_matches(is_whitespace);
if !after_closing_fence.is_empty() {
// extra characters beyond the original fence pattern
return Err(FrontmatterError::new(
format!("unexpected characters after frontmatter close"),
close_end..content_start,
));
}
}
source.content = content_start..content_end;
@ -584,7 +597,7 @@ content: "\nfn main() {}\n"
fn main() {}
"#,
),
str!["unexpected characters after frontmatter close"],
str!["closing code fence has 2 more `-` than the opening fence"],
);
}
@ -621,7 +634,7 @@ time="0.1.25"
fn main() {}
"#,
),
str!["unexpected characters after frontmatter close"],
str!["closing code fence has 1 more `-` than the opening fence"],
);
}

8
tests/testsuite/script/rustc_fixtures/mismatch-1.stderr
View File

@ -1,7 +1,5 @@
[ERROR] unexpected characters after frontmatter close
[ERROR] closing code fence has 1 more `-` than the opening fence
--> script:3:4
|
3 | ----
| ____^
4 | |
| |_^
3 | ----
| ^