From 61d8848b3112a5a08cf9da46b0cbbac1ca86826d Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Fri, 19 Nov 2021 15:44:19 +0100
Subject: [PATCH] Make `BlockMap::sync` private

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
---
 crates/editor/src/display_map.rs           | 8 ++++----
 crates/editor/src/display_map/block_map.rs | 2 +-
 crates/editor/src/lib.rs                   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/crates/editor/src/display_map.rs b/crates/editor/src/display_map.rs
index d671773d25..e0c11cafe9 100644
--- a/crates/editor/src/display_map.rs
+++ b/crates/editor/src/display_map.rs
@@ -85,13 +85,13 @@ impl DisplayMap {
         let (snapshot, edits) = self
             .wrap_map
             .update(cx, |map, cx| map.sync(snapshot, edits, cx));
-        self.block_map.sync(&snapshot, edits, cx);
+        self.block_map.read(snapshot, edits, cx);
         let (snapshot, edits) = fold_map.fold(ranges, cx);
         let (snapshot, edits) = self.tab_map.sync(snapshot, edits);
         let (snapshot, edits) = self
             .wrap_map
             .update(cx, |map, cx| map.sync(snapshot, edits, cx));
-        self.block_map.sync(&snapshot, edits, cx);
+        self.block_map.read(snapshot, edits, cx);
     }
 
     pub fn unfold<T: ToOffset>(
@@ -104,13 +104,13 @@ impl DisplayMap {
         let (snapshot, edits) = self
             .wrap_map
             .update(cx, |map, cx| map.sync(snapshot, edits, cx));
-        self.block_map.sync(&snapshot, edits, cx);
+        self.block_map.read(snapshot, edits, cx);
         let (snapshot, edits) = fold_map.unfold(ranges, cx);
         let (snapshot, edits) = self.tab_map.sync(snapshot, edits);
         let (snapshot, edits) = self
             .wrap_map
             .update(cx, |map, cx| map.sync(snapshot, edits, cx));
-        self.block_map.sync(&snapshot, edits, cx);
+        self.block_map.read(snapshot, edits, cx);
     }
 
     pub fn insert_blocks<P, T>(
diff --git a/crates/editor/src/display_map/block_map.rs b/crates/editor/src/display_map/block_map.rs
index 7e7cdc328f..3d40bf74d7 100644
--- a/crates/editor/src/display_map/block_map.rs
+++ b/crates/editor/src/display_map/block_map.rs
@@ -163,7 +163,7 @@ impl BlockMap {
         BlockMapWriter(self)
     }
 
-    pub fn sync(&self, wrap_snapshot: &WrapSnapshot, edits: Vec<WrapEdit>, cx: &AppContext) {
+    fn sync(&self, wrap_snapshot: &WrapSnapshot, edits: Vec<WrapEdit>, cx: &AppContext) {
         if edits.is_empty() {
             return;
         }
diff --git a/crates/editor/src/lib.rs b/crates/editor/src/lib.rs
index 151dffa324..911e83b39b 100644
--- a/crates/editor/src/lib.rs
+++ b/crates/editor/src/lib.rs
@@ -24,7 +24,7 @@ use smol::Timer;
 use std::{
     cell::RefCell,
     cmp::{self, Ordering},
-    collections::{HashMap, HashSet},
+    collections::HashMap,
     iter, mem,
     ops::{Range, RangeInclusive},
     rc::Rc,