From c26a941541ccd7733f7533372da71f0a5be36ed5 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sun, 14 Mar 2021 09:26:51 +0100
Subject: Rename try_into/try_from

Because of the clash in names with the TryInto and TryFrom traits, we're
renaming the functions here to try_serialize/try_deserialize.

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 src/config.rs |  8 ++++----
 src/ser.rs    |  4 ++--
 src/value.rs  | 14 +++++++-------
 3 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/config.rs b/src/config.rs
index 1019061..99216ad 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -227,20 +227,20 @@ impl Config {
     }
 
     /// Attempt to deserialize the entire configuration into the requested type.
-    pub fn try_into<'de, T: Deserialize<'de>>(self) -> Result<T> {
+    pub fn try_deserialize<'de, T: Deserialize<'de>>(self) -> Result<T> {
         T::deserialize(self)
     }
 
     /// Attempt to serialize the entire configuration from the given type.
-    pub fn try_from<T: Serialize>(from: &T) -> Result<Self> {
+    pub fn try_serialize<T: Serialize>(from: &T) -> Result<Self> {
         let mut serializer = ConfigSerializer::default();
         from.serialize(&mut serializer)?;
         Ok(serializer.output)
     }
 
-    #[deprecated(since = "0.7.0", note = "please use 'try_into' instead")]
+    #[deprecated(since = "0.7.0", note = "please use 'try_deserialize' instead")]
     pub fn deserialize<'de, T: Deserialize<'de>>(self) -> Result<T> {
-        self.try_into()
+        self.try_deserialize()
     }
 }
 
diff --git a/src/ser.rs b/src/ser.rs
index 39c02b9..ce016bf 100644
--- a/src/ser.rs
+++ b/src/ser.rs
@@ -710,9 +710,9 @@ mod test {
             int: 1,
             seq: vec!["a".to_string(), "b".to_string()],
         };
-        let config = Config::try_from(&test).unwrap();
+        let config = Config::try_serialize(&test).unwrap();
 
-        let actual: Test = config.try_into().unwrap();
+        let actual: Test = config.try_deserialize().unwrap();
         assert_eq!(test, actual);
     }
 }
diff --git a/src/value.rs b/src/value.rs
index 177acf7..700279b 100644
--- a/src/value.rs
+++ b/src/value.rs
@@ -151,12 +151,12 @@ impl Value {
     }
 
     /// Attempt to deserialize this value into the requested type.
-    pub fn try_into<'de, T: Deserialize<'de>>(self) -> Result<T> {
+    pub fn try_deserialize<'de, T: Deserialize<'de>>(self) -> Result<T> {
         T::deserialize(self)
     }
 
     /// Returns `self` as a bool, if possible.
-    // FIXME: Should this not be `try_into_*` ?
+    // FIXME: Should this not be `try_deserialize_*` ?
     pub fn into_bool(self) -> Result<bool> {
         match self.kind {
             ValueKind::Boolean(value) => Ok(value),
@@ -197,7 +197,7 @@ impl Value {
     }
 
     /// Returns `self` into an i64, if possible.
-    // FIXME: Should this not be `try_into_*` ?
+    // FIXME: Should this not be `try_deserialize_*` ?
     pub fn into_int(self) -> Result<i64> {
         match self.kind {
             ValueKind::Integer(value) => Ok(value),
@@ -242,7 +242,7 @@ impl Value {
     }
 
     /// Returns `self` into a f64, if possible.
-    // FIXME: Should this not be `try_into_*` ?
+    // FIXME: Should this not be `try_deserialize_*` ?
     pub fn into_float(self) -> Result<f64> {
         match self.kind {
             ValueKind::Float(value) => Ok(value),
@@ -287,7 +287,7 @@ impl Value {
     }
 
     /// Returns `self` into a str, if possible.
-    // FIXME: Should this not be `try_into_*` ?
+    // FIXME: Should this not be `try_deserialize_*` ?
     pub fn into_str(self) -> Result<String> {
         match self.kind {
             ValueKind::String(value) => Ok(value),
@@ -316,7 +316,7 @@ impl Value {
     }
 
     /// Returns `self` into an array, if possible
-    // FIXME: Should this not be `try_into_*` ?
+    // FIXME: Should this not be `try_deserialize_*` ?
     pub fn into_array(self) -> Result<Vec<Value>> {
         match self.kind {
             ValueKind::Array(value) => Ok(value),
@@ -356,7 +356,7 @@ impl Value {
     }
 
     /// If the `Value` is a Table, returns the associated Map.
-    // FIXME: Should this not be `try_into_*` ?
+    // FIXME: Should this not be `try_deserialize_*` ?
     pub fn into_table(self) -> Result<HashMap<String, Value>> {
         match self.kind {
             ValueKind::Table(value) => Ok(value),
-- 
cgit v1.2.3