Merge pull request #2 from levineuwirth/v1.0-rc

Pin toolchain to 1.95.0 + mechanical clippy/rustc fixes

rust-toolchain.toml

@@ -0,0 +1,10 @@
+[toolchain]
+# Pinned so local == CI permanently. The CI workflow installs the
+# `stable` channel via dtolnay/rust-toolchain; this directory override
+# makes every cargo invocation in the repo use the validated version
+# regardless, eliminating the local/CI toolchain-drift class that
+# silently red-lined CI under newer rolling-stable lints. Bump
+# deliberately (its own validated cycle), never implicitly.
+channel = "1.95.0"
+components = ["clippy", "rustfmt"]
+profile = "minimal"

src/attach.rs

@@ -803,8 +803,7 @@ pub(crate) fn run_attach_pair(
                 if matches!(k.kind, KeyEventKind::Press | KeyEventKind::Repeat) {
                     let timestamp_ns = std::time::SystemTime::now()
                         .duration_since(std::time::UNIX_EPOCH)
-                        .map(|d| u64::try_from(d.as_nanos()).unwrap_or(0))
-                        .unwrap_or(0);
+                        .map_or(0, |d| u64::try_from(d.as_nanos()).unwrap_or(0));
                     let pmacs_key = key_from_crossterm(k, assigned_id, timestamp_ns);
 
                     // T M10.10 Day 3 step 5 Path β — determine
@@ -985,8 +984,7 @@ fn forward_event<W: Write>(
             let _ = KeyModifiers::empty(); // import touch: keeps lint happy if unused
             let timestamp_ns = std::time::SystemTime::now()
                 .duration_since(std::time::UNIX_EPOCH)
-                .map(|d| u64::try_from(d.as_nanos()).unwrap_or(0))
-                .unwrap_or(0);
+                .map_or(0, |d| u64::try_from(d.as_nanos()).unwrap_or(0));
             let pmacs_key = key_from_crossterm(k, assigned_id, timestamp_ns);
             write_message(writer, &FrontendEvent::Key(pmacs_key))?;
         }

src/attach_reconnect.rs

@@ -322,11 +322,11 @@ mod tests {
         let mut s = BackoffSchedule::new();
         let expected = [
             Duration::from_millis(500),
-            Duration::from_millis(1000),
-            Duration::from_millis(2000),
-            Duration::from_millis(4000),
-            Duration::from_millis(8000),
-            Duration::from_millis(16000),
+            Duration::from_secs(1),
+            Duration::from_secs(2),
+            Duration::from_secs(4),
+            Duration::from_secs(8),
+            Duration::from_secs(16),
             Duration::from_secs(30),
         ];
         for (i, &want) in expected.iter().enumerate() {
@@ -366,7 +366,7 @@ mod tests {
 
         s.reset();
         assert_eq!(s.next_delay(), Duration::from_millis(500));
-        assert_eq!(s.next_delay(), Duration::from_millis(1000));
+        assert_eq!(s.next_delay(), Duration::from_secs(1));
     }
 
     #[test]

src/buffer.rs

@@ -1050,10 +1050,9 @@ impl Buffer {
         let (lossy_owned, captured_crdt_op): (
             Option<Vec<u8>>,
             Option<Box<crate::rope::CrdtOp>>,
-        ) = if self.crdt.is_some() && !is_no_op_edit(current) {
-            Self::apply_to_crdt_then_normalize_bytes(self.crdt.as_ref().expect("checked"), current)?
-        } else {
-            (None, None)
+        ) = match (&self.crdt, is_no_op_edit(current)) {
+            (Some(crdt), false) => Self::apply_to_crdt_then_normalize_bytes(crdt, current)?,
+            _ => (None, None),
         };
 
         // Stage 2: rope edit. In CRDT mode, the EditOp's byte payload

src/completion_framework.rs

@@ -295,7 +295,7 @@ impl CompletionRegistry {
         // the highest-priority hit.
         let mut order: Vec<&RegisteredProvider> =
             self.providers.iter().filter(|p| p.enabled).collect();
-        order.sort_by(|a, b| b.priority.cmp(&a.priority));
+        order.sort_by_key(|p| std::cmp::Reverse(p.priority));
 
         let mut by_key: HashMap<(String, String), usize> = HashMap::new();
         let mut out: Vec<CompletionCandidate> = Vec::new();

src/daemon.rs

@@ -798,7 +798,6 @@ fn per_attach_thread(
     clippy::needless_pass_by_value,
     clippy::too_many_lines
 )]
-#[allow(clippy::needless_pass_by_value)]
 fn dispatcher_loop(
     dispatcher_rx: mpsc::Receiver<DispatcherEvent>,
     editor: &mut EditorState,

src/daemon_attach.rs

@@ -939,7 +939,7 @@ mod tests {
         let msg = format!("{err}");
         assert!(msg.contains("/usr/local/bin/pmacs"));
         assert!(msg.contains("permission denied"));
-        assert!(msg.contains("PATH"), "should hint at PATH check: {msg}",);
+        assert!(msg.contains("PATH"), "should hint at PATH check: {msg}");
     }
 
     /// F8 reproduction (M10.11 acceptance criterion 1, SSH transport).
@@ -1017,7 +1017,7 @@ mod tests {
             .set_read_timeout(Some(Duration::from_secs(3)))
             .unwrap();
         match output_reader.read_exact(&mut received) {
-            Ok(()) => assert_eq!(received, HELLO_FRAME, "Hello bytes corrupted in transit",),
+            Ok(()) => assert_eq!(received, HELLO_FRAME, "Hello bytes corrupted in transit"),
             Err(e) => panic!(
                 "F8 reproduced: Hello never reached local output ({e}) — \
                  the bridge dropped the daemon→client direction on \

src/editor_core.rs

@@ -323,7 +323,7 @@ impl EditorCore {
     #[must_use]
     pub fn active_buffer_len(&self) -> u64 {
         let id = self.active_buffer_id();
-        self.registry.borrow().get(id).map(Buffer::len).unwrap_or(0)
+        self.registry.borrow().get(id).map_or(0, Buffer::len)
     }
 
     /// Active buffer's name. Returns an owned String to release the

src/file_io.rs

@@ -169,8 +169,7 @@ fn temp_sibling(target: &Path) -> PathBuf {
     // and `create_new` would error if hit.
     let nanos = SystemTime::now()
         .duration_since(SystemTime::UNIX_EPOCH)
-        .map(|d| d.subsec_nanos())
-        .unwrap_or(0);
+        .map_or(0, |d| d.subsec_nanos());
     name.push(format!("{nanos:x}"));
     parent.join(name)
 }

src/overlay_paint.rs

@@ -249,21 +249,19 @@ fn paint_selection_in_window(
             break;
         };
         match (disp.row as usize).checked_sub(window.view_top) {
-            Some(r) if r < inner_rows as usize => {
-                if disp.col < rect.size.cols {
-                    let grid_row = rect.origin.row + r as u32;
-                    let grid_col = rect.origin.col + disp.col;
-                    if grid_row < grid.size.rows && grid_col < grid.size.cols {
-                        let cell = grid.at(CellCoord::new(grid_row, grid_col));
-                        cell.style.underline = UnderlineStyle::Single;
-                        // Use the source's color for the underline; if
-                        // the cell already has a foreground style, the
-                        // underline color comes from the fg. We don't
-                        // override fg to preserve the cell's existing
-                        // glyph appearance.
-                        if cell.style.fg == Color::Default {
-                            cell.style.fg = color;
-                        }
+            Some(r) if r < inner_rows as usize && disp.col < rect.size.cols => {
+                let grid_row = rect.origin.row + r as u32;
+                let grid_col = rect.origin.col + disp.col;
+                if grid_row < grid.size.rows && grid_col < grid.size.cols {
+                    let cell = grid.at(CellCoord::new(grid_row, grid_col));
+                    cell.style.underline = UnderlineStyle::Single;
+                    // Use the source's color for the underline; if
+                    // the cell already has a foreground style, the
+                    // underline color comes from the fg. We don't
+                    // override fg to preserve the cell's existing
+                    // glyph appearance.
+                    if cell.style.fg == Color::Default {
+                        cell.style.fg = color;
                     }
                 }
             }

src/rope.rs

@@ -1073,7 +1073,7 @@ mod tests {
                     let pos = (rng() as usize) % (len + 1);
                     let n = (rng() % 64 + 1) as usize;
                     let bytes: Vec<u8> = (0..n)
-                        .map(|i| ((rng() as u8).wrapping_add(i as u8)))
+                        .map(|i| (rng() as u8).wrapping_add(i as u8))
                         .collect();
                     rope = rope.insert(pos as u64, &bytes).unwrap().new_rope;
                     reference.splice(pos..pos, bytes);

tests/m10_11_acceptance.rs

@@ -252,17 +252,15 @@ impl Observer {
             InstanceMessage::BufferSnapshot {
                 buffer_id,
                 crdt_snapshot,
-            } => {
+            } if !self.replicas.contains_key(&buffer_id) => {
                 // Bootstrap each buffer's replica on first
                 // BufferSnapshot for that BufferId. Later snapshots
                 // for the same buffer are ignored — the established
                 // replica catches up via CrdtOps.
-                if !self.replicas.contains_key(&buffer_id) {
-                    let r = CrdtState::new(self.frontend_id.0).expect("observer CrdtState::new");
-                    r.import_snapshot(&crdt_snapshot)
-                        .expect("observer import_snapshot");
-                    self.replicas.insert(buffer_id, r);
-                }
+                let r = CrdtState::new(self.frontend_id.0).expect("observer CrdtState::new");
+                r.import_snapshot(&crdt_snapshot)
+                    .expect("observer import_snapshot");
+                self.replicas.insert(buffer_id, r);
             }
             InstanceMessage::CrdtOp { buffer_id, op } => {
                 // If we received a CrdtOp for a buffer whose snapshot
@@ -279,10 +277,10 @@ impl Observer {
                     }
                 }
             }
-            InstanceMessage::PresenceUpdate { frontend_id, .. } => {
-                if frontend_id != self.frontend_id {
-                    self.other_frontends.insert(frontend_id);
-                }
+            InstanceMessage::PresenceUpdate { frontend_id, .. }
+                if frontend_id != self.frontend_id =>
+            {
+                self.other_frontends.insert(frontend_id);
             }
             _ => {}
         }

tests/m7_5_acceptance.rs

@@ -246,7 +246,7 @@ fn make_branched_package(name: &str) -> (TempDir, PathBuf, String) {
     ]);
     std::fs::write(
         work.join("init.lua"),
-        format!("return {{ name = '{name}', version = '1.0.0', flavor = 'feature' }}\n",),
+        format!("return {{ name = '{name}', version = '1.0.0', flavor = 'feature' }}\n"),
     )
     .expect("write init.lua feature");
     run_git(&[

tests/m8_1_acceptance.rs

@@ -121,7 +121,7 @@ fn read_dir_returns_one_entry_per_child_with_lstat_metadata() {
     if let Ok(err) = entries.get::<String>("error") {
         panic!("read_dir errored: {err}");
     }
-    let len: usize = entries.len().map(|n| n as usize).unwrap_or(0);
+    let len: usize = entries.len().map_or(0, |n| n as usize);
     assert_eq!(len, 3, "expected 3 entries, got {len}");
 
     // Names are filesystem-iteration-ordered; gather and sort.