Reformat project

src-tauri/yaak-git/src/binary.rs

@@ -1,10 +1,10 @@
+use crate::error::Result;
 use std::path::Path;
 use std::process::{Command, Stdio};
-use crate::error::Result;
 
+use crate::error::Error::GitNotFound;
 #[cfg(target_os = "windows")]
 use std::os::windows::process::CommandExt;
-use crate::error::Error::GitNotFound;
 
 #[cfg(target_os = "windows")]
 const CREATE_NO_WINDOW: u32 = 0x0800_0000;

src-tauri/yaak-git/src/lib.rs

@@ -1,4 +1,7 @@
-use crate::commands::{add, add_credential, add_remote, branch, checkout, commit, delete_branch, fetch_all, initialize, log, merge_branch, pull, push, remotes, rm_remote, status, unstage};
+use crate::commands::{
+    add, add_credential, add_remote, branch, checkout, commit, delete_branch, fetch_all,
+    initialize, log, merge_branch, pull, push, remotes, rm_remote, status, unstage,
+};
 use tauri::{
     Runtime, generate_handler,
     plugin::{Builder, TauriPlugin},
@@ -10,6 +13,7 @@ mod branch;
 mod commands;
 mod commit;
 mod credential;
+pub mod error;
 mod fetch;
 mod init;
 mod log;
@@ -21,7 +25,6 @@ mod repository;
 mod status;
 mod unstage;
 mod util;
-pub mod error;
 
 pub fn init<R: Runtime>() -> TauriPlugin<R> {
     Builder::new("yaak-git")

src-tauri/yaak-git/src/pull.rs

@@ -37,10 +37,7 @@ pub(crate) fn git_pull(dir: &Path) -> Result<PullResult> {
     info!("Pulled status={} {combined}", out.status);
 
     if combined.to_lowercase().contains("could not read") {
-        return Ok(PullResult::NeedsCredentials {
-            url: remote_url.to_string(),
-            error: None,
-        });
+        return Ok(PullResult::NeedsCredentials { url: remote_url.to_string(), error: None });
     }
 
     if combined.to_lowercase().contains("unable to access") {
@@ -58,9 +55,7 @@ pub(crate) fn git_pull(dir: &Path) -> Result<PullResult> {
         return Ok(PullResult::UpToDate);
     }
 
-    Ok(PullResult::Success {
-        message: format!("Pulled from {}/{}", remote_name, branch_name),
-    })
+    Ok(PullResult::Success { message: format!("Pulled from {}/{}", remote_name, branch_name) })
 }
 
 // pub(crate) fn git_pull_old(dir: &Path) -> Result<PullResult> {

src-tauri/yaak-git/src/push.rs

@@ -37,10 +37,7 @@ pub(crate) fn git_push(dir: &Path) -> Result<PushResult> {
     info!("Pushed to repo status={} {combined}", out.status);
 
     if combined.to_lowercase().contains("could not read") {
-        return Ok(PushResult::NeedsCredentials {
-            url: remote_url.to_string(),
-            error: None,
-        });
+        return Ok(PushResult::NeedsCredentials { url: remote_url.to_string(), error: None });
     }
 
     if combined.to_lowercase().contains("unable to access") {
@@ -58,7 +55,5 @@ pub(crate) fn git_push(dir: &Path) -> Result<PushResult> {
         return Err(GenericError(format!("Failed to push {combined}")));
     }
 
-    Ok(PushResult::Success {
-        message: format!("Pushed to {}/{}", remote_name, branch_name),
-    })
+    Ok(PushResult::Success { message: format!("Pushed to {}/{}", remote_name, branch_name) })
 }

src-tauri/yaak-git/src/remotes.rs

@@ -28,10 +28,7 @@ pub(crate) fn git_remotes(dir: &Path) -> Result<Vec<GitRemote>> {
                 continue;
             }
         };
-        remotes.push(GitRemote {
-            name: name.to_string(),
-            url: r.url().map(|u| u.to_string()),
-        });
+        remotes.push(GitRemote { name: name.to_string(), url: r.url().map(|u| u.to_string()) });
     }
 
     Ok(remotes)
@@ -40,10 +37,7 @@ pub(crate) fn git_remotes(dir: &Path) -> Result<Vec<GitRemote>> {
 pub(crate) fn git_add_remote(dir: &Path, name: &str, url: &str) -> Result<GitRemote> {
     let repo = open_repo(dir)?;
     repo.remote(name, url)?;
-    Ok(GitRemote {
-        name: name.to_string(),
-        url: Some(url.to_string()),
-    })
+    Ok(GitRemote { name: name.to_string(), url: Some(url.to_string()) })
 }
 
 pub(crate) fn git_rm_remote(dir: &Path, name: &str) -> Result<()> {

src-tauri/yaak-git/src/repository.rs

@@ -1,5 +1,5 @@
-use std::path::Path;
 use crate::error::Error::{GitRepoNotFound, GitUnknown};
+use std::path::Path;
 
 pub(crate) fn open_repo(dir: &Path) -> crate::error::Result<git2::Repository> {
     match git2::Repository::discover(dir) {
@@ -8,4 +8,3 @@ pub(crate) fn open_repo(dir: &Path) -> crate::error::Result<git2::Repository> {
         Err(e) => Err(GitUnknown(e)),
     }
 }
-

src-tauri/yaak-git/src/unstage.rs

@@ -1,6 +1,6 @@
-use std::path::Path;
-use log::info;
 use crate::repository::open_repo;
+use log::info;
+use std::path::Path;
 
 pub(crate) fn git_unstage(dir: &Path, rela_path: &Path) -> crate::error::Result<()> {
     let repo = open_repo(dir)?;
@@ -25,4 +25,3 @@ pub(crate) fn git_unstage(dir: &Path, rela_path: &Path) -> crate::error::Result<
 
     Ok(())
 }
-