Apply suggestions from code review

Co-authored-by: Matěj Laitl <[email protected]>
Co-authored-by: Jake McGinty <[email protected]>

client/src/main.rs

@@ -754,10 +754,9 @@ fn rename_cidr(
 
         let id = cidrs
             .iter()
-            .filter(|c| c.name == old_name)
-            .map(|c| c.id)
-            .next()
-            .ok_or_else(|| anyhow!("CIDR not found."))?;
+            .find(|c| c.name == old_name)
+            .ok_or_else(|| anyhow!("CIDR not found."))?
+            .id;
 
         api.http_form("PUT", &format!("/admin/cidrs/{id}"), cidr_request)?;
         log::info!("CIDR renamed.");

server/src/db/cidr.rs

@@ -113,6 +113,7 @@ impl DatabaseCidr {
     }
 
     /// Update self with new contents, validating them and updating the backend in the process.
+    /// Currently this only supports updating the name and ignores changes to any other field.
     pub fn update(&mut self, conn: &Connection, contents: CidrContents) -> Result<(), ServerError> {
         let new_contents = CidrContents {
             name: contents.name,

server/src/main.rs

@@ -485,7 +485,7 @@ fn rename_cidr(
             .ok_or_else(|| anyhow!("CIDR not found."))?;
         db::DatabaseCidr::from(db_cidr).update(&conn, cidr_request)?;
     } else {
-        println!("exited without creating CIDR.");
+        println!("exited without renaming CIDR.");
     }
 
     Ok(())