cjw/Oxicloud
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #341 from EdouardVanbelle/style/clippy-warning-fix

Browse Source 
style(server): correct clippy warnings
This commit is contained in:
Dionisio Pozo
2026-05-04 18:52:01 +02:00
committed by GitHub
parent 97ea87efc2 6e1c435098
commit ff18a2f085
4 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/application/adapters/webdav_adapter.rs
+2 -6
View File
@@ -752,11 +752,9 @@ impl WebDavAdapter {
_ => (), _ => (),
} }
} }
Ok(Event::Text(e)) => { Ok(Event::Text(e)) if current_prop.is_some() => {
if current_prop.is_some() {
current_text.push_str(&e.decode().unwrap_or_default()); current_text.push_str(&e.decode().unwrap_or_default());
} }
}
Ok(Event::End(ref e)) => { Ok(Event::End(ref e)) => {
let name = e.name(); let name = e.name();
let name_str = std::str::from_utf8(name.as_ref()).unwrap_or(""); let name_str = std::str::from_utf8(name.as_ref()).unwrap_or("");
@@ -961,11 +959,9 @@ impl WebDavAdapter {
_ => (), _ => (),
} }
} }
Ok(Event::Text(e)) => { Ok(Event::Text(e)) if in_owner => {
if in_owner {
owner_text.push_str(&e.decode().unwrap_or_default()); owner_text.push_str(&e.decode().unwrap_or_default());
} }
}
Ok(Event::End(ref e)) => { Ok(Event::End(ref e)) => {
let name = e.name(); let name = e.name();
let name_str = std::str::from_utf8(name.as_ref()).unwrap_or(""); let name_str = std::str::from_utf8(name.as_ref()).unwrap_or("");
src/application/services/search_service.rs
+7 -7
View File
@@ -253,7 +253,7 @@ impl SearchService {
} }
// Merge files + folders by relevance and truncate to the final limit // Merge files + folders by relevance and truncate to the final limit
suggestions.sort_by(|a, b| b.relevance_score.cmp(&a.relevance_score)); suggestions.sort_by_key(|f| Reverse(f.relevance_score));
suggestions.truncate(limit); suggestions.truncate(limit);
let elapsed = start.elapsed().as_millis() as u64; let elapsed = start.elapsed().as_millis() as u64;
@@ -346,13 +346,13 @@ impl SearchUseCase for SearchService {
enriched_folders.sort_by_cached_key(|f| Reverse(f.name.to_lowercase())); enriched_folders.sort_by_cached_key(|f| Reverse(f.name.to_lowercase()));
} }
"date" => { "date" => {
enriched_folders.sort_by(|a, b| a.modified_at.cmp(&b.modified_at)); enriched_folders.sort_by_key(|f| f.modified_at);
} }
"date_desc" => { "date_desc" => {
enriched_folders.sort_by(|a, b| b.modified_at.cmp(&a.modified_at)); enriched_folders.sort_by_key(|f| Reverse(f.modified_at));
} }
_ => { _ => {
enriched_folders.sort_by(|a, b| b.relevance_score.cmp(&a.relevance_score)); enriched_folders.sort_by_key(|f| Reverse(f.relevance_score));
} }
} }
@@ -432,13 +432,13 @@ impl SearchUseCase for SearchService {
enriched_folders.sort_by_cached_key(|f| Reverse(f.name.to_lowercase())); enriched_folders.sort_by_cached_key(|f| Reverse(f.name.to_lowercase()));
} }
"date" => { "date" => {
enriched_folders.sort_by(|a, b| a.modified_at.cmp(&b.modified_at)); enriched_folders.sort_by_key(|f| f.modified_at);
} }
"date_desc" => { "date_desc" => {
enriched_folders.sort_by(|a, b| b.modified_at.cmp(&a.modified_at)); enriched_folders.sort_by_key(|f| Reverse(f.modified_at));
} }
_ => { _ => {
enriched_folders.sort_by(|a, b| b.relevance_score.cmp(&a.relevance_score)); enriched_folders.sort_by_key(|f| Reverse(f.relevance_score));
} }
} }
src/interfaces/api/handlers/carddav_handler.rs
-1
View File
@@ -150,7 +150,6 @@ fn strip_username_prefix(path: &str) -> &str {
} }
} }
// ─── Helper: extract user from request ─────────────────────────────── // ─── Helper: extract user from request ───────────────────────────────
fn extract_user(req: &Request<Body>) -> Result<AuthUser, AppError> { fn extract_user(req: &Request<Body>) -> Result<AuthUser, AppError> {
src/interfaces/nextcloud/webdav_handler.rs
+1 -3
View File
@@ -495,11 +495,9 @@ fn parse_proppatch_favorite(body: &str) -> Option<u8> {
let text = e.decode().ok()?; let text = e.decode().ok()?;
return text.trim().parse::<u8>().ok(); return text.trim().parse::<u8>().ok();
} }
Ok(Event::End(ref e)) => { Ok(Event::End(ref e)) if e.local_name().as_ref() == b"favorite" => {
if e.local_name().as_ref() == b"favorite" {
inside_favorite = false; inside_favorite = false;
} }
}
Ok(Event::Eof) => break, Ok(Event::Eof) => break,
Err(_) => break, Err(_) => break,
_ => {} _ => {}