From 4145e7e86b89bcf94ff6134e15cad51e4958e9d3 Mon Sep 17 00:00:00 2001 From: MedzikUserBot Date: Sat, 22 Jan 2022 21:14:26 +0000 Subject: [PATCH] rustfmt --- src/api/configuration.rs | 4 ++-- src/api/delete_image.rs | 4 +++- src/api/mod.rs | 4 ++-- src/api/rate_limit.rs | 4 +++- src/api/upload_image.rs | 4 +++- src/cli/cli.rs | 19 ++++++------------- src/cli/credits.rs | 4 ++-- src/cli/delete_image.rs | 4 ++-- src/cli/mod.rs | 2 +- src/cli/upload_image.rs | 8 ++++---- src/config/toml.rs | 8 ++++---- src/main.rs | 2 +- 12 files changed, 33 insertions(+), 34 deletions(-) diff --git a/src/api/configuration.rs b/src/api/configuration.rs index 360290a..3588e94 100644 --- a/src/api/configuration.rs +++ b/src/api/configuration.rs @@ -1,5 +1,5 @@ -use std::fmt; use reqwest::Client; +use std::fmt; macro_rules! api_url ( ($path: expr) => ( @@ -25,7 +25,7 @@ impl ImgurHandle { let client = Client::new(); ImgurHandle { client_id: client_id, - client: client + client: client, } } } diff --git a/src/api/delete_image.rs b/src/api/delete_image.rs index 1648eea..4219199 100644 --- a/src/api/delete_image.rs +++ b/src/api/delete_image.rs @@ -19,7 +19,9 @@ pub async fn delete_image(c: ImgurHandle, delete_hash: String) -> Result Result { if status.is_client_error() || status.is_server_error() { let body = res.text().await.map_err(|err| err.to_string())?; - Err(format!("server returned non-successful status code = {status}. body = {body}")) + Err(format!( + "server returned non-successful status code = {status}. body = {body}" + )) } else { let content: RateLimitInfo = res.json().await.map_err(|err| err.to_string())?; Ok(content) diff --git a/src/api/upload_image.rs b/src/api/upload_image.rs index 15e6c9d..7aa1aec 100644 --- a/src/api/upload_image.rs +++ b/src/api/upload_image.rs @@ -51,7 +51,9 @@ pub async fn upload_image(c: ImgurHandle, image: &str) -> Result { - credits::credits(client) - .await; + credits::credits(client).await; } Commands::Upload { path } => { - upload_image::upload_image(client, path) - .await; + upload_image::upload_image(client, path).await; } Commands::Delete { delete_hash } => { - delete_image::delete_image(client, delete_hash.to_string()) - .await; + delete_image::delete_image(client, delete_hash.to_string()).await; } } } diff --git a/src/cli/credits.rs b/src/cli/credits.rs index 757af65..a27c42e 100644 --- a/src/cli/credits.rs +++ b/src/cli/credits.rs @@ -1,11 +1,11 @@ use imgurs::api::configuration::ImgurHandle; use imgurs::api::rate_limit::*; -use log::{info, error}; +use log::{error, info}; use chrono::prelude::DateTime; use chrono::Utc; -use std::time::{UNIX_EPOCH, Duration}; +use std::time::{Duration, UNIX_EPOCH}; pub async fn credits(client: ImgurHandle) { match rate_limit(client).await { diff --git a/src/cli/delete_image.rs b/src/cli/delete_image.rs index 26078f7..966a0b5 100644 --- a/src/cli/delete_image.rs +++ b/src/cli/delete_image.rs @@ -1,7 +1,7 @@ -use imgurs::api::configuration::ImgurHandle; use imgurs::api; +use imgurs::api::configuration::ImgurHandle; -use log::{info, error}; +use log::{error, info}; pub async fn delete_image(client: ImgurHandle, delete_hash: String) { match api::delete_image::delete_image(client, delete_hash).await { diff --git a/src/cli/mod.rs b/src/cli/mod.rs index 49e5d36..71a5956 100644 --- a/src/cli/mod.rs +++ b/src/cli/mod.rs @@ -1,4 +1,4 @@ pub mod cli; pub mod credits; -pub mod upload_image; pub mod delete_image; +pub mod upload_image; diff --git a/src/cli/upload_image.rs b/src/cli/upload_image.rs index 008b60a..80be27b 100644 --- a/src/cli/upload_image.rs +++ b/src/cli/upload_image.rs @@ -1,13 +1,13 @@ use imgurs::api::configuration::ImgurHandle; -use log::{info, error}; -use std::path::Path; -use std::fs; use base64; +use log::{error, info}; +use std::fs; +use std::path::Path; use chrono::prelude::DateTime; use chrono::Utc; -use std::time::{UNIX_EPOCH, Duration}; +use std::time::{Duration, UNIX_EPOCH}; pub async fn upload_image(client: ImgurHandle, path: &str) { let image: String; diff --git a/src/config/toml.rs b/src/config/toml.rs index b1cbeb2..ca9e922 100644 --- a/src/config/toml.rs +++ b/src/config/toml.rs @@ -1,16 +1,16 @@ -use toml::from_str; -use serde_derive::Deserialize; use dirs::config_dir; +use serde_derive::Deserialize; use std::fs::read_to_string; +use toml::from_str; #[derive(Debug, Deserialize)] pub struct Config { - pub imgur: ConfigImgur, + pub imgur: ConfigImgur, } #[derive(Debug, Deserialize)] pub struct ConfigImgur { - pub id: String, + pub id: String, } pub fn parse() -> Result { diff --git a/src/main.rs b/src/main.rs index efcd239..d34b548 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,5 +1,5 @@ -mod config; mod cli; +mod config; use cli::cli::parse;