summaryrefslogtreecommitdiff
path: root/crates/vcs/src
diff options
context:
space:
mode:
author魏曹先生 <1992414357@qq.com>2025-09-25 15:41:17 +0800
committer魏曹先生 <1992414357@qq.com>2025-09-25 15:41:17 +0800
commit2865206dda1d57df1c95dd8e49d5599db89407ae (patch)
tree1e6e2198dacc7cd5f56335b20268856af8bf8a70 /crates/vcs/src
parent17233e0c83c1b25a32c641eb32eb1fba3061cdfd (diff)
Fix clippy warnings and optimize code
- Rename from_str to from_address_str in tcp_connection to avoid trait conflict - Use ? operator instead of let...else patterns in local and vault initialization - Replace manual string slicing with strip_prefix in virtual_file.rs - All tests continue to pass after optimizations
Diffstat (limited to 'crates/vcs/src')
-rw-r--r--crates/vcs/src/workspace/local.rs8
-rw-r--r--crates/vcs/src/workspace/vault.rs8
-rw-r--r--crates/vcs/src/workspace/vault/virtual_file.rs11
3 files changed, 10 insertions, 17 deletions
diff --git a/crates/vcs/src/workspace/local.rs b/crates/vcs/src/workspace/local.rs
index 6beb842..8399b6d 100644
--- a/crates/vcs/src/workspace/local.rs
+++ b/crates/vcs/src/workspace/local.rs
@@ -24,17 +24,13 @@ impl LocalWorkspace {
/// Initialize local workspace.
pub fn init(config: LocalConfig, local_path: impl Into<PathBuf>) -> Option<Self> {
- let Some(local_path) = find_local_path(local_path) else {
- return None;
- };
+ let local_path = find_local_path(local_path)?;
Some(Self { config, local_path })
}
/// Initialize local workspace in the current directory.
pub fn init_current_dir(config: LocalConfig) -> Option<Self> {
- let Some(local_path) = current_local_path() else {
- return None;
- };
+ let local_path = current_local_path()?;
Some(Self { config, local_path })
}
diff --git a/crates/vcs/src/workspace/vault.rs b/crates/vcs/src/workspace/vault.rs
index 912c6e2..7f52c9c 100644
--- a/crates/vcs/src/workspace/vault.rs
+++ b/crates/vcs/src/workspace/vault.rs
@@ -34,17 +34,13 @@ impl Vault {
/// Initialize vault
pub fn init(config: VaultConfig, vault_path: impl Into<PathBuf>) -> Option<Self> {
- let Some(vault_path) = find_vault_path(vault_path) else {
- return None;
- };
+ let vault_path = find_vault_path(vault_path)?;
Some(Self { config, vault_path })
}
/// Initialize vault
pub fn init_current_dir(config: VaultConfig) -> Option<Self> {
- let Some(vault_path) = current_vault_path() else {
- return None;
- };
+ let vault_path = current_vault_path()?;
Some(Self { config, vault_path })
}
diff --git a/crates/vcs/src/workspace/vault/virtual_file.rs b/crates/vcs/src/workspace/vault/virtual_file.rs
index 95f3d8c..c83f700 100644
--- a/crates/vcs/src/workspace/vault/virtual_file.rs
+++ b/crates/vcs/src/workspace/vault/virtual_file.rs
@@ -95,8 +95,8 @@ impl Vault {
// Generate index path of virtual file
fn vf_index(id: &VirtualFileId) -> Result<String, std::io::Error> {
// Remove VF_PREFIX if present
- let id_str = if id.starts_with(VF_PREFIX) {
- &id[VF_PREFIX.len()..]
+ let id_str = if let Some(stripped) = id.strip_prefix(VF_PREFIX) {
+ stripped
} else {
id
};
@@ -237,9 +237,10 @@ impl Vault {
// Move temp file to virtual file directory
if let Some(parent) = move_path.parent()
- && !parent.exists() {
- fs::create_dir_all(parent).await?;
- }
+ && !parent.exists()
+ {
+ fs::create_dir_all(parent).await?;
+ }
fs::rename(receive_path, move_path).await?;
Ok(new_id)