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>
---
 examples/glob/src/main.rs                 | 6 +++---
 examples/hierarchical-env/src/settings.rs | 2 +-
 examples/simple/src/main.rs               | 2 +-
 examples/watch/src/main.rs                | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'examples')

diff --git a/examples/glob/src/main.rs b/examples/glob/src/main.rs
index e653b77..206ce2e 100644
--- a/examples/glob/src/main.rs
+++ b/examples/glob/src/main.rs
@@ -19,7 +19,7 @@ fn main() {
 
     // Print out our settings (as a HashMap)
     println!("\n{:?} \n\n-----------",
-             settings.try_into::<HashMap<String, String>>().unwrap());
+             settings.try_deserialize::<HashMap<String, String>>().unwrap());
 
     // Option 2
     // --------
@@ -33,7 +33,7 @@ fn main() {
 
     // Print out our settings (as a HashMap)
     println!("\n{:?} \n\n-----------",
-             settings.try_into::<HashMap<String, String>>().unwrap());
+             settings.try_deserialize::<HashMap<String, String>>().unwrap());
 
     // Option 3
     // --------
@@ -48,5 +48,5 @@ fn main() {
 
     // Print out our settings (as a HashMap)
     println!("\n{:?} \n\n-----------",
-             settings.try_into::<HashMap<String, String>>().unwrap());
+             settings.try_deserialize::<HashMap<String, String>>().unwrap());
 }
diff --git a/examples/hierarchical-env/src/settings.rs b/examples/hierarchical-env/src/settings.rs
index a341a21..353053e 100644
--- a/examples/hierarchical-env/src/settings.rs
+++ b/examples/hierarchical-env/src/settings.rs
@@ -65,6 +65,6 @@ impl Settings {
         println!("database: {:?}", s.get::<String>("database.url"));
 
         // You can deserialize (and thus freeze) the entire configuration as
-        s.try_into()
+        s.try_deserialize()
     }
 }
diff --git a/examples/simple/src/main.rs b/examples/simple/src/main.rs
index 1a4fcd4..e4e5475 100644
--- a/examples/simple/src/main.rs
+++ b/examples/simple/src/main.rs
@@ -13,5 +13,5 @@ fn main() {
 
     // Print out our settings (as a HashMap)
     println!("{:?}",
-             settings.try_into::<HashMap<String, String>>().unwrap());
+             settings.try_deserialize::<HashMap<String, String>>().unwrap());
 }
diff --git a/examples/watch/src/main.rs b/examples/watch/src/main.rs
index 91391e0..86f1bc6 100644
--- a/examples/watch/src/main.rs
+++ b/examples/watch/src/main.rs
@@ -26,7 +26,7 @@ fn show() {
                  .read()
                  .unwrap()
                  .clone()
-                 .try_into::<HashMap<String, String>>()
+                 .try_deserialize::<HashMap<String, String>>()
                  .unwrap());
 }
 
-- 
cgit v1.2.3