From a591d427f37122d64ecd7cae972b2929b3f43cb9 Mon Sep 17 00:00:00 2001 From: MedzikUser Date: Mon, 28 Feb 2022 23:26:35 +0100 Subject: [PATCH] chore: rename anyhow_err to anyhow::Error --- src/api/delete_image.rs | 8 +++----- src/api/get_image.rs | 8 +++----- src/api/rate_limit.rs | 10 ++++------ src/cli/clipboard.rs | 2 +- 4 files changed, 11 insertions(+), 17 deletions(-) diff --git a/src/api/delete_image.rs b/src/api/delete_image.rs index 1cb41cb..3e21de1 100644 --- a/src/api/delete_image.rs +++ b/src/api/delete_image.rs @@ -1,25 +1,23 @@ use crate::api::configuration::{api_url, ImgurClient}; - use super::send_api_request; -use anyhow::Error as anyhow_err; use reqwest::Method; use std::io::{Error, ErrorKind}; -pub async fn delete_image(c: ImgurClient, delete_hash: String) -> Result { +pub async fn delete_image(c: ImgurClient, delete_hash: String) -> Result { let uri = api_url!(format!("image/{delete_hash}")); let res = send_api_request(&c, Method::DELETE, uri, None).await?; let status = res.status(); if status.is_client_error() || status.is_server_error() { - let body = res.text().await.map_err(anyhow_err::new)?; + let body = res.text().await.map_err(anyhow::Error::new)?; let err = Error::new( ErrorKind::Other, format!("server returned non-successful status code = {status}, body = {body}"), ); - Err(anyhow_err::from(err)) + Err(anyhow::Error::from(err)) } else { Ok("If the delete hash was correct the image was deleted!".to_string()) } diff --git a/src/api/get_image.rs b/src/api/get_image.rs index 781bb3b..3c5a7fe 100644 --- a/src/api/get_image.rs +++ b/src/api/get_image.rs @@ -1,13 +1,11 @@ use crate::api::configuration::{api_url, ImgurClient}; use crate::api::ImageInfo; - use super::send_api_request; -use anyhow::Error as anyhow_err; use reqwest::Method; use std::io::{Error, ErrorKind}; -pub async fn get_image(c: ImgurClient, image: &str) -> Result { +pub async fn get_image(c: ImgurClient, image: &str) -> Result { let uri = api_url!(format!("image/{image}")); let res = send_api_request(&c, Method::GET, uri, None).await?; @@ -19,9 +17,9 @@ pub async fn get_image(c: ImgurClient, image: &str) -> Result Result { +pub async fn rate_limit(c: ImgurClient) -> Result { let uri = api_url!("credits"); let res = send_api_request(&c, Method::GET, uri, None).await?; let status = res.status(); if status.is_client_error() || status.is_server_error() { - let body = res.text().await.map_err(anyhow_err::new)?; + let body = res.text().await.map_err(anyhow::Error::new)?; let err = Error::new( ErrorKind::Other, format!("server returned non-successful status code = {status}, body = {body}"), ); - Err(anyhow_err::from(err)) + Err(anyhow::Error::from(err)) } else { - let content: RateLimitInfo = res.json().await.map_err(anyhow_err::new)?; + let content: RateLimitInfo = res.json().await.map_err(anyhow::Error::new)?; Ok(content) } } diff --git a/src/cli/clipboard.rs b/src/cli/clipboard.rs index c58aa06..ada5e82 100644 --- a/src/cli/clipboard.rs +++ b/src/cli/clipboard.rs @@ -9,7 +9,7 @@ fn is_program_in_path(program: &str) -> bool { for p in path.split(":") { let p_str = format!("{}/{}", p, program); if fs::metadata(p_str).is_ok() { - return true; + return true } } }