diff --git a/src/api/release.rs b/src/api/release.rs index 311417d..fa2f8c4 100644 --- a/src/api/release.rs +++ b/src/api/release.rs @@ -1,9 +1,6 @@ - use crate::{ Result, - structs::{ - release::{CreateReleaseOption, Release}, - }, + structs::release::{CreateReleaseOption, Release}, }; pub fn get_release(_id: u64) -> Result { @@ -59,7 +56,7 @@ pub async fn create_release( return Ok(new_release); } else if response.status().is_client_error() { let mesg = crate::decode_client_error(response).await?; - return Err(crate::Error::ApiErrorMessage(mesg)) + return Err(crate::Error::ApiErrorMessage(mesg)); } panic!("Reached end of create_release without matching a return path"); } diff --git a/src/api/release_attachment.rs b/src/api/release_attachment.rs index 706192f..e5b7b61 100644 --- a/src/api/release_attachment.rs +++ b/src/api/release_attachment.rs @@ -22,8 +22,10 @@ pub async fn create_release_attachment( Ok(false) => return Err(crate::Error::NoSuchFile), Err(e) => { eprintln!("Uh oh! The file-exists check couldn't be done: {e}"); - panic!("TODO: Deal with scenario where the file's existence cannot be checked (e.g.: no permission)"); - }, + panic!( + "TODO: Deal with scenario where the file's existence cannot be checked (e.g.: no permission)" + ); + } } println!("Uploading file {}", &file); @@ -44,7 +46,7 @@ pub async fn create_release_attachment( let attachment_desc = response .json::() .await - .map_err( crate::Error::from)?; + .map_err(crate::Error::from)?; return Ok(attachment_desc); } else if response.status().is_client_error() { let mesg = crate::decode_client_error(response).await?; diff --git a/src/lib.rs b/src/lib.rs index 42cac0a..be67790 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -10,13 +10,11 @@ pub struct ApiError { url: String, } -pub (crate) async fn decode_client_error(response: reqwest::Response) -> Result { +pub(crate) async fn decode_client_error(response: reqwest::Response) -> Result { response .json::() .await - .map_err(|reqwest_err| { - crate::Error::WrappedReqwestErr(reqwest_err) - }) + .map_err(|reqwest_err| crate::Error::WrappedReqwestErr(reqwest_err)) } #[derive(Debug)] diff --git a/src/main.rs b/src/main.rs index 04fbbe4..1c98e8b 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,4 +1,3 @@ - use std::path; use gt_tool::cli::Args; @@ -22,10 +21,7 @@ async fn main() -> Result<(), gt_tool::Error> { headers.append("Authorization", token.parse().unwrap()); } let client = reqwest::Client::builder() - .user_agent(format!( - "gt-tools-agent-{}", - env!("CARGO_PKG_VERSION") - )) + .user_agent(format!("gt-tools-agent-{}", env!("CARGO_PKG_VERSION"))) .default_headers(headers) .build()?; @@ -37,14 +33,11 @@ async fn main() -> Result<(), gt_tool::Error> { // user's command prompt. Otherwise the newest item scrolls off the // screen and can't be seen. itertools::Itertools::intersperse( - releases - .iter() - .rev() - .map(|release| release.colorized()), - String::from("") - ) - .map(|release| println!("{}", release)) - .fold((), |_, _| () ); + releases.iter().rev().map(|release| release.colorized()), + String::from(""), + ) + .map(|release| println!("{}", release)) + .fold((), |_, _| ()); } gt_tool::cli::Commands::CreateRelease { name, @@ -61,13 +54,8 @@ async fn main() -> Result<(), gt_tool::Error> { tag_name, target_commitish, }; - gt_tool::api::release::create_release( - &client, - &args.gitea_url, - &args.repo, - submission, - ) - .await?; + gt_tool::api::release::create_release(&client, &args.gitea_url, &args.repo, submission) + .await?; } gt_tool::cli::Commands::UploadRelease { tag_name, @@ -97,8 +85,10 @@ async fn main() -> Result<(), gt_tool::Error> { Ok(false) => return Err(gt_tool::Error::NoSuchFile), Err(e) => { eprintln!("Uh oh! The file-exists check couldn't be done: {e}"); - panic!("TODO: Deal with scenario where the file's existence cannot be checked (e.g.: no permission)"); - }, + panic!( + "TODO: Deal with scenario where the file's existence cannot be checked (e.g.: no permission)" + ); + } } } for file in files { diff --git a/src/structs/release.rs b/src/structs/release.rs index 4888350..9ed537e 100644 --- a/src/structs/release.rs +++ b/src/structs/release.rs @@ -1,4 +1,3 @@ - use colored::Colorize; use serde::{Deserialize, Serialize}; @@ -35,7 +34,7 @@ impl Release { }; format!( -"{tag} {} + "{tag} {} {name} {} {} {published} {} ({created} {})