Merge #764

bors[bot] · loiclec · web-flow · commit 63af1e9f28e4 · 2023-01-17T10:39:36.000Z
764: Update deserr to latest version r=irevoire a=loiclec

Update deserr to 0.1.5, which changes the `DeserializeFromValue` trait, getting rid of the `default()` method.


Co-authored-by: Loïc Lecrenier &lt;loic.lecrenier@me.com&gt;
diff --git a/milli/Cargo.toml b/milli/Cargo.toml
@@ -12,7 +12,7 @@ byteorder = "1.4.3"
 charabia = { version = "0.7.0", default-features = false }
 concat-arrays = "0.1.2"
 crossbeam-channel = "0.5.6"
-deserr = "0.1.4"
+deserr = "0.1.5"
 either = "1.8.0"
 flatten-serde-json = { path = "../flatten-serde-json" }
 fst = "0.4.7"
diff --git a/milli/src/update/settings.rs b/milli/src/update/settings.rs
@@ -37,9 +37,6 @@ where
             _ => T::deserialize_from_value(value, location).map(Setting::Set),
         }
     }
-    fn default() -> Option<Self> {
-        Some(Self::NotSet)
-    }
 }
 
 impl<T> Default for Setting<T> {

Original file line number	Diff line number	Diff line change
`@@ -37,9 +37,6 @@ where`
`37`	`37`	`_ => T::deserialize_from_value(value, location).map(Setting::Set),`
`38`	`38`	`}`
`39`	`39`	`}`
`40`		`- fn default() -> Option<Self> {`
`41`		`- Some(Self::NotSet)`
`42`		`- }`
`43`	`40`	`}`
`44`	`41`
`45`	`42`	`impl<T> Default for Setting<T> {`