Appease rustfmt, clippy and cargo check

1 files changed, 26 insertions, 10 deletions

diff --git a/src/bin/kittybox_bulk_import.rs b/src/bin/kittybox_bulk_import.rs
index a5252b7..7e1f6af 100644
--- a/src/bin/kittybox_bulk_import.rs
+++ b/src/bin/kittybox_bulk_import.rs
@@ -1,6 +1,6 @@
-use std::io;
+use anyhow::{anyhow, bail, Context, Result};
 use std::fs::File;
-use anyhow::{anyhow, Context, Result, bail};
+use std::io;
 
 #[async_std::main]
 async fn main() -> Result<()> {
@@ -8,18 +8,22 @@ async fn main() -> Result<()> {
     if args.iter().skip(1).any(|s| s == "--help") {
         println!("Usage: {} <url> [file]", args[0]);
         println!("\nIf launched with no arguments, reads from stdin.");
-        println!("\nUse KITTYBOX_AUTH_TOKEN environment variable to authorize to the Micropub endpoint.");
+        println!(
+            "\nUse KITTYBOX_AUTH_TOKEN environment variable to authorize to the Micropub endpoint."
+        );
         std::process::exit(0);
     }
 
-    let token = std::env::var("KITTYBOX_AUTH_TOKEN").map_err(|_| anyhow!("No auth token found! Use KITTYBOX_AUTH_TOKEN env variable."))?;
+    let token = std::env::var("KITTYBOX_AUTH_TOKEN")
+        .map_err(|_| anyhow!("No auth token found! Use KITTYBOX_AUTH_TOKEN env variable."))?;
     let data: Vec<serde_json::Value> = (if args.len() == 2 || (args.len() == 3 && args[2] == "-") {
         serde_json::from_reader(io::stdin())
     } else if args.len() == 3 {
         serde_json::from_reader(File::open(&args[2]).with_context(|| "Error opening input file")?)
     } else {
         bail!("See `{} --help` for usage.", args[0]);
-    }).with_context(|| "Error while loading the input file")?;
+    })
+    .with_context(|| "Error while loading the input file")?;
 
     let url = surf::Url::parse(&args[1])?;
     let client = surf::Client::new();
@@ -27,13 +31,25 @@ async fn main() -> Result<()> {
     let iter = data.into_iter();
 
     for post in iter {
-        println!("Processing {}...", post["properties"]["url"][0].as_str().or_else(|| post["properties"]["published"][0].as_str().or_else(|| post["properties"]["name"][0].as_str().or(Some("<unidentified post>")))).unwrap());
-        match client.post(&url)
-            .body(surf::http::Body::from_string(
-                serde_json::to_string(&post)?))
+        println!(
+            "Processing {}...",
+            post["properties"]["url"][0]
+                .as_str()
+                .or_else(|| post["properties"]["published"][0]
+                    .as_str()
+                    .or_else(|| post["properties"]["name"][0]
+                        .as_str()
+                        .or(Some("<unidentified post>"))))
+                .unwrap()
+        );
+        match client
+            .post(&url)
+            .body(surf::http::Body::from_string(serde_json::to_string(&post)?))
             .header("Content-Type", "application/json")
             .header("Authorization", format!("Bearer {}", &token))
-            .send().await {
+            .send()
+            .await
+        {
             Ok(mut response) => {
                 if response.status() == 201 || response.status() == 202 {
                     println!("Posted at {}", response.header("location").unwrap().last());