clippy fixes

nix-community · Feb 14, 2025 · b78ec76 · b78ec76
1 parent 6106734
commit b78ec76
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/src/buildlog.rs b/src/buildlog.rs
@@ -20,17 +20,14 @@ async fn query_drv_path(settings: &web::Data<Config>, drv: &str) -> Result<Optio
 
 pub fn get_build_log(store: &Path, drv_path: &Path) -> Option<PathBuf> {
     let drv_name = drv_path.file_name()?.as_bytes();
-    let log_path = match store.parent().map(|p| {
+    let log_path = store.parent().map(|p| {
         p.join("var")
             .join("log")
             .join("nix")
             .join("drvs")
             .join(OsStr::from_bytes(&drv_name[0..2]))
             .join(OsStr::from_bytes(&drv_name[2..]))
-    }) {
-        Some(log_path) => log_path,
-        None => return None,
-    };
+    })?;
     if log_path.exists() {
         return Some(log_path);
     }

diff --git a/src/nar.rs b/src/nar.rs
@@ -452,7 +452,7 @@ pub(crate) async fn get(
             while let Some(Ok(data)) = rx2.recv().await {
                 let len = data.len() as u64;
                 if send + len > offset {
-                    let start = if send < offset { offset - send } else { 0 };
+                    let start = offset.saturating_sub(send);
                     let end = if send + data.len() as u64 > offset + rlength {
                         start + rlength
                     } else {