chore: lint

Author: linux-china

src/command_utils.rs

@@ -1,6 +1,6 @@
 use crate::errors::KeeperError;
 use colored::Colorize;
-use error_stack::{IntoReport, Result, ResultExt};
+use error_stack::{IntoReport, Report, ResultExt};
 use std::collections::HashMap;
 use std::io;
 use std::io::{Read, Write};
@@ -39,11 +39,11 @@ pub fn run_command(
     command_name: &str,
     args: &[&str],
     verbose: bool,
-) -> Result<CommandOutput, KeeperError> {
+) -> Result<CommandOutput, Report<KeeperError>> {
     run_command_with_env_vars(command_name, args, &None, &None, verbose)
 }
 
-pub fn run_command_line(command_line: &str, verbose: bool) -> Result<CommandOutput, KeeperError> {
+pub fn run_command_line(command_line: &str, verbose: bool) -> Result<CommandOutput, Report<KeeperError>> {
     let command_and_args = shlex::split(command_line).unwrap();
     // command line contains pipe or not
     if command_and_args
@@ -66,17 +66,15 @@ pub fn run_command_line(command_line: &str, verbose: bool) -> Result<CommandOutp
             .bold()
             .red()
         );
-        Err(KeeperError::CommandNotFound(
-            command_name.to_string()
-        ).into_report())
+        Err(KeeperError::CommandNotFound(command_name.to_string()).into_report())
     }
 }
 
 pub fn run_command_line_from_stdin(
     command_line: &str,
     input: &str,
     verbose: bool,
-) -> Result<CommandOutput, KeeperError> {
+) -> Result<CommandOutput, Report<KeeperError>> {
     let command_and_args = shlex::split(command_line).unwrap();
     let command_name = &command_and_args[0];
     let args: Vec<&str> = if command_and_args.len() > 1 {
@@ -117,9 +115,7 @@ pub fn run_command_line_from_stdin(
             .bold()
             .red()
         );
-        Err(KeeperError::CommandNotFound(
-            command_name.to_string()
-        ).into_report())
+        Err(KeeperError::CommandNotFound(command_name.to_string()).into_report())
     }
 }
 
@@ -129,7 +125,7 @@ pub fn run_command_with_env_vars(
     working_dir: &Option<String>,
     env_vars: &Option<HashMap<String, String>>,
     verbose: bool,
-) -> Result<CommandOutput, KeeperError> {
+) -> Result<CommandOutput, Report<KeeperError>> {
     let mut command = Command::new(command_name);
     command.envs(std::env::vars());
     if args.len() > 0 {
@@ -161,7 +157,7 @@ pub fn run_command_with_env_vars(
 pub fn run_command_by_shell(
     command_line: &str,
     verbose: bool,
-) -> Result<CommandOutput, KeeperError> {
+) -> Result<CommandOutput, Report<KeeperError>> {
     let mut command = if cfg!(target_os = "windows") {
         Command::new("cmd")
     } else {
@@ -186,7 +182,7 @@ pub fn run_command_by_shell(
         .change_context(KeeperError::FailedToRunTasks(format!("{:?}", command)))
 }
 
-pub fn intercept_output(command: &mut Command) -> Result<CommandOutput, KeeperError> {
+pub fn intercept_output(command: &mut Command) -> Result<CommandOutput, Report<KeeperError>> {
     let mut child = command
         .stdin(Stdio::inherit())
         .stdout(Stdio::piped())
@@ -244,7 +240,7 @@ pub fn intercept_output(command: &mut Command) -> Result<CommandOutput, KeeperEr
     })
 }
 
-pub fn capture_command_output(command_name: &str, args: &[&str]) -> Result<Output, KeeperError> {
+pub fn capture_command_output(command_name: &str, args: &[&str]) -> Result<Output, Report<KeeperError>> {
     let mut command = Command::new(command_name);
     if args.len() > 0 {
         command.args(args);

src/common/mod.rs

@@ -1,8 +1,8 @@
-pub mod pyproject;
 pub mod notification;
+pub mod pyproject;
 
 use crate::errors::KeeperError;
-use error_stack::{Result, ResultExt};
+use error_stack::{Report, ResultExt};
 use serde::{Deserialize, Serialize};
 use std::{collections::HashMap, fs};
 
@@ -14,7 +14,7 @@ pub struct PackageJson {
     pub package_manager: Option<String>,
 }
 
-pub fn parse_package_json() -> Result<PackageJson, KeeperError> {
+pub fn parse_package_json() -> core::result::Result<PackageJson, Report<KeeperError>> {
     let content = fs::read_to_string(
         &std::env::current_dir()
             .expect("Failed to get current directory")

src/keeper.rs

@@ -4,7 +4,7 @@ use crate::models::Task;
 use crate::runners::RUNNERS;
 use crate::{managers, runners};
 use colored::Colorize;
-use error_stack::Result;
+use error_stack::{Report};
 use std::collections::HashMap;
 
 pub fn run_tasks(
@@ -13,7 +13,7 @@ pub fn run_tasks(
     task_args: &[&str],
     global_args: &[&str],
     verbose: bool,
-) -> Result<i32, KeeperError> {
+) -> core::result::Result<i32, Report<KeeperError>> {
     let mut task_count = 0;
     let all_tasks = list_all_runner_tasks(true);
     if let Ok(tasks_hashmap) = all_tasks {
@@ -106,7 +106,7 @@ pub fn run_manager_task(
     task_args: &[&str],
     global_args: &[&str],
     verbose: bool,
-) -> Result<(), KeeperError> {
+) -> Result<(), Report<KeeperError>> {
     managers::run_task(runner, task_name, task_args, global_args, verbose)
 }
 

src/managers/amper.rs

@@ -1,6 +1,6 @@
 use crate::command_utils::{run_command_line, CommandOutput};
 use crate::errors::KeeperError;
-use error_stack::{IntoReport, Result};
+use error_stack::{IntoReport, Report};
 use std::collections::HashMap;
 use which::which;
 
@@ -38,7 +38,7 @@ pub fn run_task(
     _task_args: &[&str],
     _global_args: &[&str],
     verbose: bool,
-) -> Result<CommandOutput, KeeperError> {
+) -> Result<CommandOutput, Report<KeeperError>> {
     if let Some(command_line) = get_task_command_map().get(task) {
         run_command_line(command_line, verbose)
     } else {

src/managers/bazel.rs

@@ -1,6 +1,6 @@
 use crate::command_utils::{run_command_line, CommandOutput};
 use crate::errors::KeeperError;
-use error_stack::{IntoReport, Result};
+use error_stack::{IntoReport, Report};
 use std::collections::HashMap;
 use which::which;
 
@@ -32,7 +32,7 @@ pub fn run_task(
     _task_args: &[&str],
     _global_args: &[&str],
     verbose: bool,
-) -> Result<CommandOutput, KeeperError> {
+) -> Result<CommandOutput, Report<KeeperError>> {
     if let Some(command_line) = get_task_command_map().get(task) {
         run_command_line(command_line, verbose)
     } else {

src/managers/bld.rs

@@ -1,6 +1,6 @@
 use crate::command_utils::{run_command_line, CommandOutput};
 use crate::errors::KeeperError;
-use error_stack::{IntoReport, Result};
+use error_stack::{IntoReport, Report};
 use std::collections::HashMap;
 use which::which;
 
@@ -33,7 +33,7 @@ pub fn run_task(
     _task_args: &[&str],
     _global_args: &[&str],
     verbose: bool,
-) -> Result<CommandOutput, KeeperError> {
+) -> Result<CommandOutput, Report<KeeperError>> {
     if let Some(command_line) = get_task_command_map().get(task) {
         run_command_line(command_line, verbose)
     } else {

src/managers/bundler.rs

@@ -1,6 +1,6 @@
 use crate::command_utils::{run_command_line, CommandOutput};
 use crate::errors::KeeperError;
-use error_stack::{IntoReport, Result};
+use error_stack::{IntoReport, Report};
 use std::collections::HashMap;
 use which::which;
 
@@ -31,7 +31,7 @@ pub fn run_task(
     _task_args: &[&str],
     _global_args: &[&str],
     verbose: bool,
-) -> Result<CommandOutput, KeeperError> {
+) -> Result<CommandOutput, Report<KeeperError>> {
     if let Some(command_line) = get_task_command_map().get(task) {
         run_command_line(command_line, verbose)
     } else {

src/managers/cargo.rs

@@ -1,6 +1,6 @@
 use crate::command_utils::{run_command_line, CommandOutput};
 use crate::errors::KeeperError;
-use error_stack::{IntoReport, Result};
+use error_stack::{IntoReport, Report};
 use std::collections::HashMap;
 use which::which;
 
@@ -40,7 +40,7 @@ pub fn run_task(
     _task_args: &[&str],
     _global_args: &[&str],
     verbose: bool,
-) -> Result<CommandOutput, KeeperError> {
+) -> Result<CommandOutput, Report<KeeperError>> {
     if let Some(command_line) = get_task_command_map().get(task) {
         run_command_line(command_line, verbose)
     } else {

src/managers/cmakeconan.rs

@@ -1,6 +1,6 @@
 use crate::command_utils::{run_command_line, CommandOutput};
 use crate::errors::KeeperError;
-use error_stack::{IntoReport, Result};
+use error_stack::{IntoReport, Report};
 use std::collections::HashMap;
 use which::which;
 
@@ -57,7 +57,7 @@ pub fn run_task(
     _task_args: &[&str],
     _global_args: &[&str],
     verbose: bool,
-) -> Result<CommandOutput, KeeperError> {
+) -> Result<CommandOutput, Report<KeeperError>> {
     if task == "build" {
         if !std::env::current_dir()
             .map(|dir| dir.join("cmake-build-debug").exists())

src/managers/composer.rs

@@ -1,6 +1,6 @@
 use crate::command_utils::{run_command_line, CommandOutput};
 use crate::errors::KeeperError;
-use error_stack::{IntoReport, Result};
+use error_stack::{IntoReport, Report};
 use std::collections::HashMap;
 use std::env::current_dir;
 use which::which;
@@ -52,7 +52,7 @@ pub fn run_task(
     _task_args: &[&str],
     _global_args: &[&str],
     verbose: bool,
-) -> Result<CommandOutput, KeeperError> {
+) -> Result<CommandOutput, Report<KeeperError>> {
     if let Some(command_line) = get_task_command_map().get(task) {
         run_command_line(command_line, verbose)
     } else {