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(encode): Correct encoding for key with mixed quotes #757

Merged
merged 12 commits into from
Jul 17, 2024
Merged

fix(encode): Correct encoding for key with mixed quotes #757

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2392d9b
perf(fuzz): Remove prints from success case
epage Jul 17, 2024
afbb4f5
test(edit): Clarify assert
epage Jul 17, 2024
1da5102
test(edit): Make test name more specific
epage Jul 17, 2024
d5212d0
test(edit): Move repr-less tests here
epage Jul 17, 2024
c8c42a8
test(edit): Verify Key roundtripping
epage Jul 17, 2024
00fb5ee
test(edit): Add more roundtrip testing
epage Jul 17, 2024
330b590
refactor(encode): Extract all str repr inferring
epage Jul 17, 2024
82c0195
refactor(encode): Make str repr inferring clearer
epage Jul 17, 2024
0b268f2
fix(encode): Correct encoding for key with mixed quotes
epage Jul 17, 2024
fbb0ac2
test(encode): Add property-based tests for keys/strings
epage Jul 17, 2024
e1bc1c3
refactor(encode): Pull out literal inference
epage Jul 17, 2024
3d8852b
fix(encode): Be extra sure it can be a literal
epage Jul 17, 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
193 changes: 190 additions & 3 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

66 changes: 0 additions & 66 deletions crates/toml/tests/testsuite/display.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
use serde::Deserialize;
use snapbox::assert_data_eq;
use snapbox::prelude::*;
use snapbox::str;
use toml::map::Map;
use toml::Value;
use toml::Value::{Array, Boolean, Float, Integer, String, Table};

macro_rules! map( ($($k:expr => $v:expr),*) => ({
Expand Down Expand Up @@ -119,64 +114,3 @@ fn table() {
test2 = 2\n"
);
}

#[test]
fn string_roundtrip() {
assert_string_round_trip(r#""""#, str![[r#""""#]]);
assert_string_round_trip(r#""a""#, str![[r#""a""#]]);

assert_string_round_trip(r#""tab \t tab""#, str![[r#""tab /t tab""#]]);
assert_string_round_trip(
r#""lf \n lf""#,
str![[r#"
"""
lf
lf"""
"#]],
);
assert_string_round_trip(
r#""crlf \r\n crlf""#,
str![[r#"
"""
crlf /r
crlf"""
"#]],
);
assert_string_round_trip(r#""bell \b bell""#, str![[r#""bell /b bell""#]]);
assert_string_round_trip(r#""feed \f feed""#, str![[r#""feed /f feed""#]]);
assert_string_round_trip(
r#""backslash \\ backslash""#,
str!["'backslash / backslash'"],
);

assert_string_round_trip(r#""squote ' squote""#, str![[r#""squote ' squote""#]]);
assert_string_round_trip(
r#""triple squote ''' triple squote""#,
str![[r#""triple squote ''' triple squote""#]],
);
assert_string_round_trip(r#""end squote '""#, str![[r#""end squote '""#]]);

assert_string_round_trip(r#""quote \" quote""#, str![[r#"'quote " quote'"#]]);
assert_string_round_trip(
r#""triple quote \"\"\" triple quote""#,
str![[r#"'triple quote """ triple quote'"#]],
);
assert_string_round_trip(r#""end quote \"""#, str![[r#"'end quote "'"#]]);
}

#[track_caller]
fn assert_string_round_trip(input: &str, expected: impl IntoData) {
let value = Value::deserialize(toml::de::ValueDeserializer::new(input)).unwrap();
let actual = value.to_string();
let _ = Value::deserialize(toml::de::ValueDeserializer::new(input)).unwrap_or_else(|_err| {
panic!(
"invalid value:
```
{actual}
```
"
)
});
let expected = expected.into_data();
assert_data_eq!(actual, expected);
}
1 change: 1 addition & 0 deletions crates/toml_edit/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ toml-test-harness = "0.4.8"
toml-test-data = "1.11.0"
libtest-mimic = "0.7.2"
snapbox = "0.6.0"
proptest = "1.5.0"

[[test]]
name = "testsuite"
Expand Down
Loading
Loading