From 33d1a63b572312166fa53c7f74442a05dd7b1f8d Mon Sep 17 00:00:00 2001 From: Ed Page Date: Sat, 4 May 2024 23:11:19 +0200 Subject: [PATCH] fix(toml): Remove dashed and hashed frontmatter syntax --- src/cargo/util/toml/embedded.rs | 81 ++------------------------------- tests/testsuite/script.rs | 16 +++---- 2 files changed, 11 insertions(+), 86 deletions(-) diff --git a/src/cargo/util/toml/embedded.rs b/src/cargo/util/toml/embedded.rs index f20ed8d193d8..14c57db45762 100644 --- a/src/cargo/util/toml/embedded.rs +++ b/src/cargo/util/toml/embedded.rs @@ -218,12 +218,7 @@ fn split_source(input: &str) -> CargoResult> { } // Experiment: let us try which char works better - let tick_char = source - .content - .chars() - .filter(|c| ['`', '#', '-'].contains(c)) - .next() - .unwrap_or('`'); + let tick_char = '-'; let tick_end = source .content @@ -235,10 +230,6 @@ fn split_source(input: &str) -> CargoResult> { return Ok(source); } 1 | 2 => { - if tick_char == '#' { - // Attribute - return Ok(source); - } anyhow::bail!("found {tick_end} `{tick_char}` in rust frontmatter, expected at least 3") } _ => source.content.split_at(tick_end), @@ -332,10 +323,10 @@ strip = true [workspace] "#, - si!(r#"```cargo + si!(r#"---cargo [dependencies] time="0.1.25" -``` +--- fn main() {} "#), ); @@ -363,39 +354,6 @@ name = "test-" [profile.release] strip = true -[workspace] -"#, - si!(r#"``` -[dependencies] -time="0.1.25" -``` -fn main() {} -"#), - ); - } - - #[test] - fn test_dash() { - snapbox::assert_matches( - r#"[[bin]] -name = "test-" -path = [..] - -[dependencies] -time = "0.1.25" - -[package] -autobenches = false -autobins = false -autoexamples = false -autotests = false -build = false -edition = "2021" -name = "test-" - -[profile.release] -strip = true - [workspace] "#, si!(r#"--- @@ -403,39 +361,6 @@ strip = true time="0.1.25" --- fn main() {} -"#), - ); - } - - #[test] - fn test_hash() { - snapbox::assert_matches( - r#"[[bin]] -name = "test-" -path = [..] - -[dependencies] -time = "0.1.25" - -[package] -autobenches = false -autobins = false -autoexamples = false -autotests = false -build = false -edition = "2021" -name = "test-" - -[profile.release] -strip = true - -[workspace] -"#, - si!(r#"### -[dependencies] -time="0.1.25" -### -fn main() {} "#), ); } diff --git a/tests/testsuite/script.rs b/tests/testsuite/script.rs index 9f7b13ac98b0..c3abefe455cc 100644 --- a/tests/testsuite/script.rs +++ b/tests/testsuite/script.rs @@ -210,10 +210,10 @@ fn requires_z_flag() { #[cargo_test] fn clean_output_with_edition() { let script = r#"#!/usr/bin/env cargo -```cargo +--- [package] edition = "2018" -``` +--- fn main() { println!("Hello world!"); @@ -241,9 +241,9 @@ fn main() { #[cargo_test] fn warning_without_edition() { let script = r#"#!/usr/bin/env cargo -```cargo +--- [package] -``` +--- fn main() { println!("Hello world!"); @@ -714,10 +714,10 @@ fn did_you_mean_command_stable() { fn test_name_same_as_dependency() { Package::new("script", "1.0.0").publish(); let script = r#"#!/usr/bin/env cargo -```cargo +--- [dependencies] script = "1.0.0" -``` +--- fn main() { println!("Hello world!"); @@ -751,10 +751,10 @@ fn main() { #[cargo_test] fn test_path_dep() { let script = r#"#!/usr/bin/env cargo -```cargo +--- [dependencies] bar.path = "./bar" -``` +--- fn main() { println!("Hello world!");