fix(encode): Prefer literals over escaping double-quotes

epage · epage · commit c9e36e7a0fe7 · 2024-06-03T10:59:32.000-05:00
Part of rust-lang/cargo#14002
diff --git a/crates/toml/tests/testsuite/display.rs b/crates/toml/tests/testsuite/display.rs
@@ -75,7 +75,7 @@ fn table() {
         }
         .to_string(),
         "\"foo.bar\" = 2\n\
-         \"foo\\\"bar\" = 2\n"
+         'foo\"bar' = 2\n"
     );
     assert_eq!(
         map! {
diff --git a/crates/toml_edit/src/encode.rs b/crates/toml_edit/src/encode.rs
@@ -439,6 +439,9 @@ fn infer_style(value: &str) -> (StringStyle, bool) {
             }
             match ch {
                 '\t' => {}
+                '"' => {
+                    prefer_literal = true;
+                }
                 '\\' => {
                     prefer_literal = true;
                 }
diff --git a/crates/toml_edit/src/key.rs b/crates/toml_edit/src/key.rs
@@ -289,17 +289,13 @@ fn to_key_repr(key: &str) -> Repr {
             crate::encode::to_string_repr(
                 key,
                 Some(crate::encode::StringStyle::OnelineSingle),
-                Some(false),
+                None,
             )
         }
     }
     #[cfg(not(feature = "parse"))]
     {
-        crate::encode::to_string_repr(
-            key,
-            Some(crate::encode::StringStyle::OnelineSingle),
-            Some(false),
-        )
+        crate::encode::to_string_repr(key, Some(crate::encode::StringStyle::OnelineSingle), None)
     }
 }
 
diff --git a/crates/toml_edit/tests/testsuite/edit.rs b/crates/toml_edit/tests/testsuite/edit.rs
@@ -222,9 +222,9 @@ fn test_insert_key_with_quotes() {
 
         [target]
 
-[target."cfg(target_os = \"linux\")"]
+[target.'cfg(target_os = "linux")']
 
-[target."cfg(target_os = \"linux\")".dependencies]
+[target.'cfg(target_os = "linux")'.dependencies]
 name = "dep"
         
 "#]]);

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ fn table() {`
`75`	`75`	`}`
`76`	`76`	`.to_string(),`
`77`	`77`	`"\"foo.bar\" = 2\n\`
`78`		`- \"foo\\\"bar\" = 2\n"`
	`78`	`+ 'foo\"bar' = 2\n"`
`79`	`79`	`);`
`80`	`80`	`assert_eq!(`
`81`	`81`	`map! {`
Original file line number	Diff line number	Diff line change
`@@ -439,6 +439,9 @@ fn infer_style(value: &str) -> (StringStyle, bool) {`
`439`	`439`	`}`
`440`	`440`	`match ch {`
`441`	`441`	`'\t' => {}`
	`442`	`+ '"' => {`
	`443`	`+ prefer_literal = true;`
	`444`	`+ }`
`442`	`445`	`'\\' => {`
`443`	`446`	`prefer_literal = true;`
`444`	`447`	`}`
Original file line number	Diff line number	Diff line change
`@@ -289,17 +289,13 @@ fn to_key_repr(key: &str) -> Repr {`
`289`	`289`	`crate::encode::to_string_repr(`
`290`	`290`	`key,`
`291`	`291`	`Some(crate::encode::StringStyle::OnelineSingle),`
`292`		`- Some(false),`
	`292`	`+ None,`
`293`	`293`	`)`
`294`	`294`	`}`
`295`	`295`	`}`
`296`	`296`	`#[cfg(not(feature = "parse"))]`
`297`	`297`	`{`
`298`		`- crate::encode::to_string_repr(`
`299`		`- key,`
`300`		`- Some(crate::encode::StringStyle::OnelineSingle),`
`301`		`- Some(false),`
`302`		`- )`
	`298`	`+ crate::encode::to_string_repr(key, Some(crate::encode::StringStyle::OnelineSingle), None)`
`303`	`299`	`}`
`304`	`300`	`}`
`305`	`301`