Improve error names

Author: sergey-borovkov

.idea/codeStyles/codeStyleConfig.xml

@@ -13,19 +13,19 @@ pub struct Config {
 #[derive(Error, Debug)]
 pub enum AuthenticationError {
     #[error("wrong credentials error")]
-    WrongCredentialsError,
+    WrongCredentials,
     #[error("no credentials error")]
-    NoCredentialsError,
+    NoCredentials,
     #[error("request error")]
-    RequestError(#[from] reqwest::Error),
+    Request(#[from] reqwest::Error),
     #[error("i/o error")]
-    IoError(#[from] std::io::Error),
+    Io(#[from] std::io::Error),
     #[error("env error")]
-    EnvError(#[from] env::VarError),
+    Env(#[from] env::VarError),
     #[error("missing home dir error")]
-    MissingHomeDirError(),
+    MissingHomeDir(),
     #[error("invalid header error")]
-    InvalidHeaderError(#[from] InvalidHeaderValue),
+    InvalidHeader(#[from] InvalidHeaderValue),
     #[error("unknown error")]
     Unknown,
 }
@@ -61,9 +61,9 @@ impl Authentication {
 
         match dirs::home_dir() {
             Some(path) => {
-                fs::read_to_string(path.join(".screenly")).map_err(AuthenticationError::IoError)
+                fs::read_to_string(path.join(".screenly")).map_err(AuthenticationError::Io)
             }
-            None => Err(AuthenticationError::NoCredentialsError),
+            None => Err(AuthenticationError::NoCredentials),
         }
     }
 
@@ -80,7 +80,7 @@ impl Authentication {
                 fs::write(home.join(".screenly"), token)?;
                 Ok(())
             }
-            None => Err(AuthenticationError::MissingHomeDirError()),
+            None => Err(AuthenticationError::MissingHomeDir()),
         }
     }
 
@@ -96,7 +96,7 @@ impl Authentication {
             .send()?;
 
         match res.status().as_u16() {
-            401 => Err(AuthenticationError::WrongCredentialsError),
+            401 => Err(AuthenticationError::WrongCredentials),
             404 => Ok(()),
             _ => Err(AuthenticationError::Unknown),
         }
@@ -115,7 +115,7 @@ impl Authentication {
         reqwest::blocking::Client::builder()
             .default_headers(default_headers)
             .build()
-            .map_err(AuthenticationError::RequestError)
+            .map_err(AuthenticationError::Request)
     }
 }
 
@@ -184,7 +184,7 @@ mod tests {
     }
 
     #[test]
-    fn test_read_token_when_token_is_overriden_with_env_variable_correct_token_is_returned() {
+    fn test_read_token_when_token_is_overridden_with_env_variable_correct_token_is_returned() {
         let tmp_dir = TempDir::new("test").unwrap();
         let _lock = lock_test();
         let _token = set_env(OsString::from("API_TOKEN"), "env_token");

.idea/sonarlint/issuestore/6/8/68bbba69fbc9469ed10568ad6d2fda4fa93abffb

@@ -23,17 +23,17 @@ pub trait Formatter {
 #[derive(Error, Debug)]
 pub enum CommandError {
     #[error("auth error")]
-    AuthenticationError(#[from] AuthenticationError),
+    Authentication(#[from] AuthenticationError),
     #[error("request error")]
-    RequestError(#[from] reqwest::Error),
+    Request(#[from] reqwest::Error),
     #[error("parse error")]
-    ParseError(#[from] serde_json::Error),
+    Parse(#[from] serde_json::Error),
     #[error("unknown error #[0]")]
     WrongResponseStatus(u16),
     #[error("Required field is missing in the response")]
     MissingField,
     #[error("I/O error #[0]")]
-    IoError(#[from] std::io::Error),
+    Io(#[from] std::io::Error),
     #[error("Invalid header value")]
     InvalidHeaderValue(#[from] InvalidHeaderValue),
 }

src/authentication.rs

@@ -108,7 +108,7 @@ enum AssetCommands {
     },
 }
 
-fn handle_command_execution_result<T: commands::Formatter>(
+fn handle_command_execution_result<T: Formatter>(
     result: anyhow::Result<T, CommandError>,
     json: &Option<bool>,
 ) {
@@ -123,7 +123,7 @@ fn handle_command_execution_result<T: commands::Formatter>(
         }
         Err(e) => {
             match e {
-                CommandError::AuthenticationError(_) => {
+                CommandError::Authentication(_) => {
                     error!(
                         "Authentication error occurred. Please use login command to authenticate."
                     )
@@ -196,7 +196,7 @@ fn main() {
             }
 
             Err(e) => match e {
-                AuthenticationError::WrongCredentialsError => {
+                AuthenticationError::WrongCredentials => {
                     error!("Token verification failed.");
                     std::process::exit(1);
                 }