diff options
| author | 魏曹先生 <1992414357@qq.com> | 2025-09-25 14:23:55 +0800 |
|---|---|---|
| committer | 魏曹先生 <1992414357@qq.com> | 2025-09-25 14:23:55 +0800 |
| commit | e2e29c3934e40cfd4fde6f1b5e7517810c3bf1cd (patch) | |
| tree | 2629abac480a4ca697c8dec09e7f79f690be3b8b /crates/vcs/src/workspace | |
| parent | 300b0eeb68618a2b66469e83b79384a2d612c05d (diff) | |
Fixed by Clippy
Diffstat (limited to 'crates/vcs/src/workspace')
| -rw-r--r-- | crates/vcs/src/workspace/local.rs | 6 | ||||
| -rw-r--r-- | crates/vcs/src/workspace/vault/member.rs | 16 | ||||
| -rw-r--r-- | crates/vcs/src/workspace/vault/virtual_file.rs | 11 |
3 files changed, 15 insertions, 18 deletions
diff --git a/crates/vcs/src/workspace/local.rs b/crates/vcs/src/workspace/local.rs index 0119952..6beb842 100644 --- a/crates/vcs/src/workspace/local.rs +++ b/crates/vcs/src/workspace/local.rs @@ -57,8 +57,7 @@ impl LocalWorkspace { LocalConfig::write_to(&config, local_path.join(CLIENT_FILE_WORKSPACE)).await?; // 2. Setup README.md - let readme_content = format!( - "\ + let readme_content = "\ # JustEnoughVCS Local Workspace This directory is a **Local Workspace** managed by `JustEnoughVCS`. All files and subdirectories within this scope can be version-controlled using the `JustEnoughVCS` CLI or GUI tools, with the following exceptions: @@ -89,8 +88,7 @@ Without these credentials, the server will reject all access requests. ------ *Thank you for using JustEnoughVCS!* -" - ) +".to_string() .trim() .to_string(); fs::write(local_path.join(CLIENT_FILE_README), readme_content).await?; diff --git a/crates/vcs/src/workspace/vault/member.rs b/crates/vcs/src/workspace/vault/member.rs index 793ba2a..2d00081 100644 --- a/crates/vcs/src/workspace/vault/member.rs +++ b/crates/vcs/src/workspace/vault/member.rs @@ -31,7 +31,7 @@ impl Vault { /// Update member info pub async fn update_member(&self, member: Member) -> Result<(), std::io::Error> { // Ensure member exist - if let Some(_) = self.member_cfg(&member.id()) { + if self.member_cfg(&member.id()).is_some() { let member_cfg_path = self.member_cfg_path(&member.id()); Member::write_to(&member, member_cfg_path).await?; return Ok(()); @@ -43,7 +43,7 @@ impl Vault { /// Register a member to vault pub async fn register_member_to_vault(&self, member: Member) -> Result<(), std::io::Error> { // Ensure member not exist - if let Some(_) = self.member_cfg(&member.id()) { + if self.member_cfg(&member.id()).is_some() { return Err(Error::new( ErrorKind::DirectoryNotEmpty, format!("Member `{}` already registered!", member.id()), @@ -89,17 +89,17 @@ impl Vault { /// Get the member's configuration file path, but do not check if the file exists pub fn member_cfg_path(&self, id: &MemberId) -> PathBuf { - let path = self + + self .vault_path - .join(SERVER_FILE_MEMBER_INFO.replace(ID_PARAM, id.to_string().as_str())); - path + .join(SERVER_FILE_MEMBER_INFO.replace(ID_PARAM, id.to_string().as_str())) } /// Get the member's public key file path, but do not check if the file exists pub fn member_key_path(&self, id: &MemberId) -> PathBuf { - let path = self + + self .vault_path - .join(SERVER_FILE_MEMBER_PUB.replace(ID_PARAM, id.to_string().as_str())); - path + .join(SERVER_FILE_MEMBER_PUB.replace(ID_PARAM, id.to_string().as_str())) } } diff --git a/crates/vcs/src/workspace/vault/virtual_file.rs b/crates/vcs/src/workspace/vault/virtual_file.rs index 6e8c28d..95f3d8c 100644 --- a/crates/vcs/src/workspace/vault/virtual_file.rs +++ b/crates/vcs/src/workspace/vault/virtual_file.rs @@ -236,11 +236,10 @@ impl Vault { VirtualFileMeta::write_to(&meta, self.virtual_file_meta_path(&new_id)).await?; // Move temp file to virtual file directory - if let Some(parent) = move_path.parent() { - if !parent.exists() { + if let Some(parent) = move_path.parent() + && !parent.exists() { fs::create_dir_all(parent).await?; } - } fs::rename(receive_path, move_path).await?; Ok(new_id) @@ -251,7 +250,7 @@ impl Vault { fs::remove_file(receive_path).await?; } - Err(Error::new(ErrorKind::Other, e)) + Err(Error::other(e)) } } } @@ -312,7 +311,7 @@ impl Vault { VirtualFileMeta::write_to(&meta, self.virtual_file_meta_path(virtual_file_id)) .await?; - return Ok(()); + Ok(()) } Err(e) => { // Read failed, remove temp file. @@ -320,7 +319,7 @@ impl Vault { fs::remove_file(receive_path).await?; } - return Err(Error::new(ErrorKind::Other, e)); + Err(Error::other(e)) } } } |
