A: Code quality improvements - fix clippy warnings
- Remove unused imports in server.rs (Body, HeaderValue, RwLock) - Remove unused imports in forward_acl.rs (tests still need Ipv4Addr) - Remove unused imports in host_key.rs (Read, Write) - Remove unused imports in kex_exchange.rs (HostKeyType) - Remove unused imports in known_hosts.rs (tests need Ipv4Addr) - Remove unused imports in multiplex.rs (Arc) - Auto-fix other unused imports via clippy --fix Tests: 303 passed, 0 failed (4 new tests added)
This commit is contained in:
@@ -6,7 +6,7 @@ use bytes::{Buf, Bytes};
|
||||
use dav_server::davpath::DavPath;
|
||||
use dav_server::fs::{
|
||||
DavDirEntry, DavFile, DavFileSystem, DavMetaData, DavProp, FsError, FsFuture, FsStream,
|
||||
OpenOptions, ReadDirMeta,
|
||||
OpenOptions,
|
||||
};
|
||||
use dav_server::ls::DavLockSystem;
|
||||
use http::StatusCode;
|
||||
@@ -378,7 +378,7 @@ impl VfsDavFile {
|
||||
}
|
||||
let flags = OpenFlags::new().write().create().truncate().mode(0o644);
|
||||
let vfs_file = vfs.open_file(&path, &flags).ok()
|
||||
.map(|f| std::sync::Mutex::new(f));
|
||||
.map(std::sync::Mutex::new);
|
||||
Self {
|
||||
data: Vec::new(),
|
||||
position: 0,
|
||||
@@ -414,13 +414,10 @@ impl DavFile for VfsDavFile {
|
||||
fn metadata(&'_ mut self) -> FsFuture<'_, Box<dyn DavMetaData>> {
|
||||
if let Some(vfs_file_mutex) = &self.vfs_file {
|
||||
if let Ok(mut vfs_file) = vfs_file_mutex.lock() {
|
||||
match vfs_file.stat() {
|
||||
Ok(stat) => {
|
||||
return Box::pin(std::future::ready(Ok(
|
||||
Box::new(VfsDavMetaData::from_stat(&stat)) as Box<dyn DavMetaData>,
|
||||
)));
|
||||
}
|
||||
Err(_) => {}
|
||||
if let Ok(stat) = vfs_file.stat() {
|
||||
return Box::pin(std::future::ready(Ok(
|
||||
Box::new(VfsDavMetaData::from_stat(&stat)) as Box<dyn DavMetaData>,
|
||||
)));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -484,11 +481,10 @@ impl DavFile for VfsDavFile {
|
||||
if let Ok(mut vfs_file) = vfs_file_mutex.lock() {
|
||||
// Seek to current position if needed
|
||||
let current_pos = vfs_file.seek(std::io::SeekFrom::Current(0)).unwrap_or(self.position);
|
||||
if current_pos != self.position {
|
||||
if vfs_file.seek(std::io::SeekFrom::Start(self.position)).is_err() {
|
||||
if current_pos != self.position
|
||||
&& vfs_file.seek(std::io::SeekFrom::Start(self.position)).is_err() {
|
||||
return Box::pin(std::future::ready(Err(FsError::GeneralFailure)));
|
||||
}
|
||||
}
|
||||
|
||||
// Read larger chunk
|
||||
let read_size = std::cmp::max(count, CHUNK_SIZE);
|
||||
@@ -530,14 +526,11 @@ impl DavFile for VfsDavFile {
|
||||
fn seek(&'_ mut self, pos: std::io::SeekFrom) -> FsFuture<'_, u64> {
|
||||
if let Some(vfs_file_mutex) = &self.vfs_file {
|
||||
if let Ok(mut vfs_file) = vfs_file_mutex.lock() {
|
||||
match vfs_file.seek(pos) {
|
||||
Ok(new_pos) => {
|
||||
self.position = new_pos;
|
||||
self.read_cache.clear(); // Invalidate cache on seek
|
||||
self.read_cache_offset = 0;
|
||||
return Box::pin(std::future::ready(Ok(new_pos)));
|
||||
}
|
||||
Err(_) => {}
|
||||
if let Ok(new_pos) = vfs_file.seek(pos) {
|
||||
self.position = new_pos;
|
||||
self.read_cache.clear(); // Invalidate cache on seek
|
||||
self.read_cache_offset = 0;
|
||||
return Box::pin(std::future::ready(Ok(new_pos)));
|
||||
}
|
||||
}
|
||||
Box::pin(std::future::ready(Err(FsError::NotImplemented)))
|
||||
|
||||
Reference in New Issue
Block a user