From 4ada5e0666c4adab04b9ede19821bb93cf8ffbb0 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Mon, 24 May 2021 15:05:11 +0200
Subject: [PATCH] Rename `rope::ChunksIter` to `rope::Chunks`

This is consistent with how we name the other chunk iterators.
---
 zed/src/editor/buffer/mod.rs           |  6 +++---
 zed/src/editor/buffer/rope.rs          | 12 ++++++------
 zed/src/editor/display_map/fold_map.rs |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/zed/src/editor/buffer/mod.rs b/zed/src/editor/buffer/mod.rs
index 93e803173a..ea3ba66db4 100644
--- a/zed/src/editor/buffer/mod.rs
+++ b/zed/src/editor/buffer/mod.rs
@@ -6,7 +6,7 @@ mod selection;
 pub use anchor::*;
 use parking_lot::Mutex;
 pub use point::*;
-pub use rope::{ChunksIter, Rope, TextSummary};
+pub use rope::{Chunks, Rope, TextSummary};
 use seahash::SeaHasher;
 pub use selection::*;
 use similar::{ChangeTag, TextDiff};
@@ -746,7 +746,7 @@ impl Buffer {
         self.text_for_range(0..self.len()).collect()
     }
 
-    pub fn text_for_range<'a, T: ToOffset>(&'a self, range: Range<T>) -> ChunksIter<'a> {
+    pub fn text_for_range<'a, T: ToOffset>(&'a self, range: Range<T>) -> Chunks<'a> {
         let start = range.start.to_offset(self);
         let end = range.end.to_offset(self);
         self.visible_text.chunks_in_range(start..end)
@@ -2178,7 +2178,7 @@ impl<'a, F: Fn(&FragmentSummary) -> bool> Iterator for Edits<'a, F> {
 }
 
 pub struct HighlightedChunksIter<'a, T: tree_sitter::TextProvider<'a>> {
-    chunks: ChunksIter<'a>,
+    chunks: Chunks<'a>,
     captures: iter::Peekable<tree_sitter::QueryCaptures<'a, 'a, T>>,
     stack: Vec<(usize, usize)>,
     offset: usize,
diff --git a/zed/src/editor/buffer/rope.rs b/zed/src/editor/buffer/rope.rs
index 174210c1a9..98b317c0ed 100644
--- a/zed/src/editor/buffer/rope.rs
+++ b/zed/src/editor/buffer/rope.rs
@@ -118,12 +118,12 @@ impl Rope {
         self.chunks_in_range(start..self.len()).flat_map(str::chars)
     }
 
-    pub fn chunks<'a>(&'a self) -> ChunksIter<'a> {
+    pub fn chunks<'a>(&'a self) -> Chunks<'a> {
         self.chunks_in_range(0..self.len())
     }
 
-    pub fn chunks_in_range<'a>(&'a self, range: Range<usize>) -> ChunksIter<'a> {
-        ChunksIter::new(self, range)
+    pub fn chunks_in_range<'a>(&'a self, range: Range<usize>) -> Chunks<'a> {
+        Chunks::new(self, range)
     }
 
     pub fn to_point(&self, offset: usize) -> Point {
@@ -268,12 +268,12 @@ impl<'a> Cursor<'a> {
     }
 }
 
-pub struct ChunksIter<'a> {
+pub struct Chunks<'a> {
     chunks: sum_tree::Cursor<'a, Chunk, usize, usize>,
     range: Range<usize>,
 }
 
-impl<'a> ChunksIter<'a> {
+impl<'a> Chunks<'a> {
     pub fn new(rope: &'a Rope, range: Range<usize>) -> Self {
         let mut chunks = rope.chunks.cursor();
         chunks.seek(&range.start, SeekBias::Right, &());
@@ -306,7 +306,7 @@ impl<'a> ChunksIter<'a> {
     }
 }
 
-impl<'a> Iterator for ChunksIter<'a> {
+impl<'a> Iterator for Chunks<'a> {
     type Item = &'a str;
 
     fn next(&mut self) -> Option<Self::Item> {
diff --git a/zed/src/editor/display_map/fold_map.rs b/zed/src/editor/display_map/fold_map.rs
index 5615105359..905164612a 100644
--- a/zed/src/editor/display_map/fold_map.rs
+++ b/zed/src/editor/display_map/fold_map.rs
@@ -669,7 +669,7 @@ impl<'a> Iterator for BufferRows<'a> {
 
 pub struct Chunks<'a> {
     transform_cursor: Cursor<'a, Transform, DisplayOffset, TransformSummary>,
-    buffer_chunks: buffer::ChunksIter<'a>,
+    buffer_chunks: buffer::Chunks<'a>,
     buffer_offset: usize,
 }