Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(diagnostic): Don't panic on empty spans #13375

Merged
merged 2 commits into from
Jan 31, 2024
Merged

fix(diagnostic): Don't panic on empty spans #13375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift click to select a range
f2a4a3e
test(diagnostic): Show panic
epage Jan 31, 2024
1c05d41
fix(diagnostic): Don't panic on empty spans
epage Jan 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/cargo/util/toml/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 121,7 @@ fn read_manifest_from_str(
.rfind('\n')
.map(|s| s 1)
.unwrap_or(0);
let source_end = contents[span.end - 1..]
let source_end = contents[span.end.saturating_sub(1)..]
.find('\n')
.map(|s| s span.end)
.unwrap_or(contents.len());
Expand Down
30 changes: 30 additions & 0 deletions tests/testsuite/diagnostics.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 1,30 @@
use cargo_test_support::project;

#[cargo_test]
fn dont_panic_on_render() {
let p = project()
.file(
"Cargo.toml",
r#"
[package]
name = "foo"
version = "0.1.0"
edition = "2021"
[[bench.foo]]
"#,
)
.file("src/lib.rs", "")
.build();

p.cargo("check")
.with_status(101)
.with_stderr(
"\
error: invalid type: map, expected a sequence
--> Cargo.toml:1:1
|
|
",
)
.run();
}
1 change: 1 addition & 0 deletions tests/testsuite/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 79,7 @@ mod cross_publish;
mod custom_target;
mod death;
mod dep_info;
mod diagnostics;
mod direct_minimal_versions;
mod directory;
mod doc;
Expand Down