Cargo fmt

8 files changed, 64 insertions, 91 deletions

diff --git a/examples/zot/abconfig.rs b/examples/zot/abconfig.rs
index cc478ef..54d555c 100644
--- a/examples/zot/abconfig.rs
+++ b/examples/zot/abconfig.rs
@@ -21,7 +21,7 @@ pub fn fetch(client: &zotapi::Client) {
     match client.abconfig().fetch() {
         Ok(payload) => {
             println!("{}", payload);
-        },
+        }
         Err(e) => {
             println!("{:?}", e);
         }
diff --git a/examples/zot/abook.rs b/examples/zot/abook.rs
index 7e91981..a16f68c 100644
--- a/examples/zot/abook.rs
+++ b/examples/zot/abook.rs
@@ -20,11 +20,10 @@ pub fn fetch(client: &zotapi::Client, raw: bool) {
         Ok(payload) => {
             if raw {
                 println!("{}", &payload);
-            }
-            else {
+            } else {
                 process(&payload);
             }
-        },
+        }
         Err(e) => {
             println!("{:?}", e);
         }
@@ -36,12 +35,12 @@ fn process(payload: &str) {
     match data {
         serde_json::Value::Array(v) => {
             for contact in v {
-                println!("{} ({}, {})",
-                    contact["xchan_name"],
-                    contact["xchan_addr"],
-                    contact["xchan_network"]);
+                println!(
+                    "{} ({}, {})",
+                    contact["xchan_name"], contact["xchan_addr"], contact["xchan_network"]
+                );
             }
-        },
+        }
         _ => {
             println!("Unexpected data:\n{}", payload);
         }
diff --git a/examples/zot/channel_stream.rs b/examples/zot/channel_stream.rs
index a278244..b50f93f 100644
--- a/examples/zot/channel_stream.rs
+++ b/examples/zot/channel_stream.rs
@@ -25,11 +25,10 @@ pub fn fetch(client: &zotapi::Client, raw: bool) {
         Ok(payload) => {
             if raw {
                 println!("{}", payload);
-            }
-            else {
+            } else {
                 list(&payload);
             }
-        },
+        }
         Err(e) => {
             println!("Error getting channel stream: {:?}", e);
         }
@@ -43,10 +42,8 @@ fn list(payload: &str) {
                 print_item(&item);
                 println!("-----");
             }
-        },
-        Ok(_) => {
-            println!("Wrong type returned, expected an array.")
-        },
+        }
+        Ok(_) => println!("Wrong type returned, expected an array."),
         Err(e) => {
             println!("Error: {}", e);
         }
@@ -76,8 +73,9 @@ fn get_object_type(item: &serde_json::Value) -> &str {
 
 fn get_tags(item: &serde_json::Value) -> String {
     match item["tags"] {
-        serde_json::Value::Array(ref v) => {
-            v.iter().map(|t| {
+        serde_json::Value::Array(ref v) => v
+            .iter()
+            .map(|t| {
                 let prefix = match get_str(&t["type"]) {
                     "hashtag" => "#",
                     "forum" => "!",
@@ -85,14 +83,11 @@ fn get_tags(item: &serde_json::Value) -> String {
                     _ => "",
                 };
                 format!("{}{}", prefix, get_str(&t["tag"]))
-            }).collect::<Vec<_>>().join(", ")
-        },
-        serde_json::Value::Null => {
-            String::new()
-        },
-        _ => {
-            String::from("invalid tags, expected array...")
-        }
+            })
+            .collect::<Vec<_>>()
+            .join(", "),
+        serde_json::Value::Null => String::new(),
+        _ => String::from("invalid tags, expected array..."),
     }
 }
 
diff --git a/examples/zot/group.rs b/examples/zot/group.rs
index e02fb13..9264cdc 100644
--- a/examples/zot/group.rs
+++ b/examples/zot/group.rs
@@ -15,11 +15,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-use serde_json::{Value, from_str};
+use serde_json::{from_str, Value};
 
 pub fn list(data: &str) {
     if let Ok(Value::Array(groups)) = from_str(&data) {
-
         println!("Id  | Group name       | uid | flags | hash");
         println!("----+------------------+-----+-------+-------------------------");
 
@@ -38,34 +37,34 @@ pub fn list(data: &str) {
                 }
             }
 
-            print!("{:>3} | {:16} | {:>3} | {:5} | {}\n",
+            print!(
+                "{:>3} | {:16} | {:>3} | {:5} | {}\n",
                 group["id"].as_u64().unwrap(),
                 group["gname"].as_str().unwrap(),
                 group["uid"].as_u64().unwrap(),
                 flags,
-                group["hash"].as_str().unwrap());
+                group["hash"].as_str().unwrap()
+            );
         }
-    }
-    else {
+    } else {
         eprintln!("Invalid data");
     }
 }
 
-
 pub fn list_members(data: &str) {
     if let Ok(Value::Array(members)) = from_str(&data) {
-
         println!("Id  | Name                          | Address");
         println!("----+-------------------------------+------------------------");
 
         for member in members {
-            println!("{:>3} | {:29} | {}",
+            println!(
+                "{:>3} | {:29} | {}",
                 member["id"].as_u64().unwrap(),
                 member["xchan_name"].as_str().unwrap(),
-                member["xchan_addr"].as_str().unwrap());
+                member["xchan_addr"].as_str().unwrap()
+            );
         }
-    }
-    else {
+    } else {
         eprintln!("Invalid data");
     }
 }
diff --git a/examples/zot/item.rs b/examples/zot/item.rs
index e848af2..dec6c8d 100644
--- a/examples/zot/item.rs
+++ b/examples/zot/item.rs
@@ -39,7 +39,7 @@ pub fn post(client: &zotapi::Client, args: &ArgMatches) {
     match msg.create() {
         Ok(payload) => {
             println!("Raw payload: {}", payload);
-        },
+        }
         Err(e) => {
             println!("Error posting message: {:?}", e);
         }
diff --git a/examples/zot/network_stream.rs b/examples/zot/network_stream.rs
index de3b12f..6dc1a0c 100644
--- a/examples/zot/network_stream.rs
+++ b/examples/zot/network_stream.rs
@@ -25,11 +25,10 @@ pub fn fetch(client: &zotapi::Client, raw: bool) {
         Ok(payload) => {
             if raw {
                 println!("{}", payload);
-            }
-            else {
+            } else {
                 list(&payload);
             }
-        },
+        }
         Err(e) => {
             println!("Error getting channel stream: {:?}", e);
         }
@@ -43,10 +42,8 @@ fn list(payload: &str) {
                 print_item(&item);
                 println!("-----");
             }
-        },
-        Ok(_) => {
-            println!("Wrong type returned, expected an array.")
-        },
+        }
+        Ok(_) => println!("Wrong type returned, expected an array."),
         Err(e) => {
             println!("Error: {}", e);
         }
@@ -76,8 +73,9 @@ fn get_object_type(item: &serde_json::Value) -> &str {
 
 fn get_tags(item: &serde_json::Value) -> String {
     match item["tags"] {
-        serde_json::Value::Array(ref v) => {
-            v.iter().map(|t| {
+        serde_json::Value::Array(ref v) => v
+            .iter()
+            .map(|t| {
                 let prefix = match get_str(&t["type"]) {
                     "hashtag" => "#",
                     "forum" => "!",
@@ -85,14 +83,11 @@ fn get_tags(item: &serde_json::Value) -> String {
                     _ => "",
                 };
                 format!("{}{}", prefix, get_str(&t["tag"]))
-            }).collect::<Vec<_>>().join(", ")
-        },
-        serde_json::Value::Null => {
-            String::new()
-        },
-        _ => {
-            String::from("invalid tags, expected array...")
-        }
+            })
+            .collect::<Vec<_>>()
+            .join(", "),
+        serde_json::Value::Null => String::new(),
+        _ => String::from("invalid tags, expected array..."),
     }
 }
 
diff --git a/examples/zot/xchan.rs b/examples/zot/xchan.rs
index d37328d..d2d73d0 100644
--- a/examples/zot/xchan.rs
+++ b/examples/zot/xchan.rs
@@ -33,7 +33,7 @@ pub fn fetch(client: &zotapi::Client, _raw: bool, t: Type, id: &str) {
     match res {
         Ok(payload) => {
             println!("{}", payload);
-        },
+        }
         Err(e) => {
             println!("{:?}", e);
         }
diff --git a/examples/zotcli.rs b/examples/zotcli.rs
index 2b068e0..14bb9ad 100644
--- a/examples/zotcli.rs
+++ b/examples/zotcli.rs
@@ -15,13 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-use clap::{
-    clap_app,
-    crate_name,
-    crate_version,
-    crate_authors,
-    crate_description,
-};
+use clap::{clap_app, crate_authors, crate_description, crate_name, crate_version};
 use dotenv::dotenv;
 use std::env;
 use std::str::FromStr;
@@ -86,75 +80,66 @@ fn main() {
         ("channel", Some(m)) => {
             let raw = m.is_present("raw");
             zot::channel_stream::fetch(&client, raw);
-        },
+        }
         ("network", Some(m)) => {
             let raw = m.is_present("raw");
             zot::network_stream::fetch(&client, raw);
-        },
+        }
         ("abconfig", _) => {
             zot::abconfig::fetch(&client);
-        },
+        }
         ("abook", Some(m)) => {
             let raw = m.is_present("raw");
             zot::abook::fetch(&client, raw);
-        },
+        }
         ("group", Some(m)) => {
             if let Some(id) = m.value_of("ID") {
                 let res = client
                     .group_members()
                     .by_group_id(u64::from_str(id).unwrap())
-                    .fetch().unwrap();
+                    .fetch()
+                    .unwrap();
 
                 if m.is_present("raw") {
                     println!("{}", res);
-                }
-                else {
+                } else {
                     zot::group::list_members(&res);
                 }
-            }
-            else if let Some(gname) = m.value_of("GNAME") {
-                let res = client
-                    .group_members()
-                    .by_group_name(gname)
-                    .fetch().unwrap();
+            } else if let Some(gname) = m.value_of("GNAME") {
+                let res = client.group_members().by_group_name(gname).fetch().unwrap();
 
                 if m.is_present("raw") {
                     println!("{}", res);
-                }
-                else {
+                } else {
                     zot::group::list_members(&res);
                 }
-            }
-            else {
+            } else {
                 let res = client.group().fetch().unwrap();
 
                 if m.is_present("raw") {
                     println!("{}", res);
-                }
-                else {
+                } else {
                     zot::group::list(&res);
                 }
             }
-        },
+        }
         ("xchan", Some(m)) => {
             let raw = m.is_present("raw");
             let t = if m.is_present("guid") {
                 zot::xchan::Type::GUID
-            }
-            else if m.is_present("hash") {
+            } else if m.is_present("hash") {
                 zot::xchan::Type::Hash
-            }
-            else {
+            } else {
                 zot::xchan::Type::Addr
             };
 
             zot::xchan::fetch(&client, raw, t, m.value_of("ID").unwrap());
-        },
+        }
         ("post", Some(m)) => {
             zot::item::post(&client, m);
-        },
+        }
         _ => {
             println!("{}", matches.usage());
-        },
+        }
     }
 }