From cc083e335ebf57e2427d0076d6284a1287069612 Mon Sep 17 00:00:00 2001
From: Paul Woolcock <paul@woolcock.us>
Date: Wed, 22 Aug 2018 06:23:56 -0400
Subject: [PATCH] Change `Mastodon::from_data` to just `Mastodon::from`

---
 README.md                 |  2 +-
 examples/register.rs      |  5 +++--
 src/entities/itemsiter.rs |  2 +-
 src/lib.rs                | 24 +++++++++++++-----------
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index 16817c7..53f736b 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ fn main() {
             let mut config = String::new();
             file.read_to_string(&mut config).unwrap();
             let data: Data = toml::from_str(&config).unwrap();
-            Mastodon::from_data(data)
+            Mastodon::from(data)
         },
         Err(_) => register(),
     };
diff --git a/examples/register.rs b/examples/register.rs
index e3b6179..7f6b058 100644
--- a/examples/register.rs
+++ b/examples/register.rs
@@ -1,7 +1,7 @@
 extern crate elefren;
 extern crate toml;
 
-pub use self::elefren::MastodonClient;
+pub use self::elefren::{Data, MastodonClient};
 
 use std::{
     error::Error,
@@ -28,7 +28,8 @@ fn main() -> Result<(), Box<Error>> {
 #[allow(dead_code)]
 pub fn get_mastodon_data() -> Result<Mastodon, Box<Error>> {
     if let Ok(config) = fs::read_to_string("mastodon-data.toml") {
-        Ok(Mastodon::from_data(toml::from_str(&config)?))
+        let data: Data = toml::from_str(&config)?;
+        Ok(Mastodon::from(data))
     } else {
         register()
     }
diff --git a/src/entities/itemsiter.rs b/src/entities/itemsiter.rs
index dbf8f03..d688be9 100644
--- a/src/entities/itemsiter.rs
+++ b/src/entities/itemsiter.rs
@@ -15,7 +15,7 @@ use serde::Deserialize;
 /// #   redirect: "".into(),
 /// #   token: "".into(),
 /// # };
-/// let client = Mastodon::from_data(data);
+/// let client = Mastodon::from(data);
 /// let statuses = client.statuses("user-id", None)?;
 /// for status in statuses.items_iter() {
 ///   // do something with `status`
diff --git a/src/lib.rs b/src/lib.rs
index 3e2cad6..0842824 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -438,8 +438,18 @@ impl Mastodon {
             }
         }
 
+    methods![get, post, delete,];
+
+    fn route(&self, url: &str) -> String {
+        let mut s = (*self.base).to_owned();
+        s += url;
+        s
+    }
+}
+
+impl From<Data> for Mastodon {
     /// Creates a mastodon instance from the data struct.
-    pub fn from_data(data: Data) -> Self {
+    fn from(data: Data) -> Mastodon {
         let mut headers = Headers::new();
         headers.set(Authorization(Bearer { token: (*data.token).to_owned() }));
 
@@ -449,14 +459,6 @@ impl Mastodon {
             data: data,
         }
     }
-
-    methods![get, post, delete,];
-
-    fn route(&self, url: &str) -> String {
-        let mut s = (*self.base).to_owned();
-        s += url;
-        s
-    }
 }
 
 impl MastodonClient for Mastodon {
@@ -586,7 +588,7 @@ impl MastodonClient for Mastodon {
     /// #   redirect: "".into(),
     /// #   token: "".into(),
     /// # };
-    /// let client = Mastodon::from_data(data);
+    /// let client = Mastodon::from(data);
     /// let statuses = client.statuses("user-id", None)?;
     /// # Ok(())
     /// # }
@@ -604,7 +606,7 @@ impl MastodonClient for Mastodon {
     /// #   redirect: "".into(),
     /// #   token: "".into(),
     /// # };
-    /// let client = Mastodon::from_data(data);
+    /// let client = Mastodon::from(data);
     /// let request = StatusesRequest::default()
     ///                               .only_media();
     /// let statuses = client.statuses("user-id", request)?;