Skip to content

Commit 121f055

Browse files
committed
Try to fix the tests
1 parent b5e5f65 commit 121f055

2 files changed

Lines changed: 7 additions & 5 deletions

File tree

crate_universe/src/config.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -729,10 +729,12 @@ where
729729
let value: Option<serde_json::Value> = Option::deserialize(deserializer)?;
730730
match value {
731731
None | Some(serde_json::Value::Null) => Ok(None),
732-
Some(serde_json::Value::String(s)) => s
733-
.parse::<toml::Value>()
734-
.map(Some)
735-
.map_err(serde::de::Error::custom),
732+
Some(serde_json::Value::String(s)) => {
733+
let normalized = s.replace("\r\n", "\n");
734+
toml::from_str::<toml::Value>(&normalized)
735+
.map(Some)
736+
.map_err(serde::de::Error::custom)
737+
}
736738
Some(other) => serde_json::from_value(other)
737739
.map(Some)
738740
.map_err(serde::de::Error::custom),

crate_universe/src/test.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ pub(crate) fn test_tempdir(prefix: &str) -> (Option<tempfile::TempDir>, PathBuf)
5050
match std::env::var("TEST_TMPDIR") {
5151
Ok(t) => {
5252
let dir = tempfile::TempDir::with_prefix_in(prefix, t).unwrap();
53-
(None, dir.into_path())
53+
(None, dir.keep())
5454
}
5555
Err(_) => {
5656
let dir = tempfile::TempDir::with_prefix(prefix).unwrap();

0 commit comments

Comments
 (0)