Merge pull request amethyst#25 from milespossing/master

kabergstrom · web-flow · commit 1ff255016143 · 2021-01-12T10:58:29.000+01:00
Fixing reference to serde::__private::from_utf8_lossy
diff --git a/src/difference.rs b/src/difference.rs
@@ -397,7 +397,7 @@ impl<'de> de::Visitor<'de> for DiffCommandFieldVisitor {
             b"RemoveKey" => Ok(DiffCommandField::RemoveKey),
             b"Exit" => Ok(DiffCommandField::Exit),
             _ => {
-                let value = &serde::export::from_utf8_lossy(value);
+                let value = &String::from_utf8_lossy(value);
                 Err(de::Error::unknown_variant(value, VARIANTS))
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -397,7 +397,7 @@ impl<'de> de::Visitor<'de> for DiffCommandFieldVisitor {`
`397`	`397`	`b"RemoveKey" => Ok(DiffCommandField::RemoveKey),`
`398`	`398`	`b"Exit" => Ok(DiffCommandField::Exit),`
`399`	`399`	`_ => {`
`400`		`- let value = &serde::export::from_utf8_lossy(value);`
	`400`	`+ let value = &String::from_utf8_lossy(value);`
`401`	`401`	`Err(de::Error::unknown_variant(value, VARIANTS))`
`402`	`402`	`}`
`403`	`403`	`}`