From 8caebe684018e651c1d8b856745ee5f4880fd6b9 Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Fri, 20 Feb 2026 00:18:10 -0500
Subject: [PATCH] git: Replace some unwraps with `expect` (#49683)

Release Notes:

- N/A
---
 crates/editor/src/display_map.rs | 2 +-
 crates/editor/src/split.rs       | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/crates/editor/src/display_map.rs b/crates/editor/src/display_map.rs
index a55650b51d9f70df5fa3e144b7271af256842802..19f1df70efd7030ae8090ea9cb5ce0a3487fa2a7 100644
--- a/crates/editor/src/display_map.rs
+++ b/crates/editor/src/display_map.rs
@@ -551,7 +551,7 @@ impl DisplayMap {
                     .read(cx)
                     .rhs_buffer_to_lhs_buffer
                     .get(my_buffer)
-                    .unwrap();
+                    .expect("unmapped folded buffer");
                 companion_display_map
                     .block_map
                     .folded_buffers
diff --git a/crates/editor/src/split.rs b/crates/editor/src/split.rs
index cfa40235e851f74ac3c5c0a5d9a59a45b737ff7b..633cd8b26f715bc7c2d1d1256beb4a28d36b2de6 100644
--- a/crates/editor/src/split.rs
+++ b/crates/editor/src/split.rs
@@ -199,7 +199,7 @@ where
 
         let diff = source_snapshot
             .diff_for_buffer_id(first.source_buffer.remote_id())
-            .unwrap();
+            .expect("buffer with no diff when creating patches");
         let rhs_buffer = if first.source_buffer.remote_id() == diff.base_text().remote_id() {
             first.target_buffer
         } else {
@@ -281,17 +281,17 @@ fn patch_for_excerpt(
 ) -> CompanionExcerptPatch {
     let source_multibuffer_range = source_snapshot
         .range_for_excerpt(source_excerpt_id)
-        .unwrap();
+        .expect("no excerpt for source id when creating patch");
     let source_excerpt_start_in_multibuffer = source_multibuffer_range.start;
     let source_excerpt_start_in_buffer = source_context_range.start;
     let source_excerpt_end_in_buffer = source_context_range.end;
     let target_multibuffer_range = target_snapshot
         .range_for_excerpt(target_excerpt_id)
-        .unwrap();
+        .expect("no excerpt for target id when creating patch");
     let target_excerpt_start_in_multibuffer = target_multibuffer_range.start;
     let target_context_range = target_snapshot
         .context_range_for_excerpt(target_excerpt_id)
-        .unwrap();
+        .expect("no range for target id when creating patch");
     let target_excerpt_start_in_buffer = target_context_range.start.to_point(&target_buffer);
     let target_excerpt_end_in_buffer = target_context_range.end.to_point(&target_buffer);