diff --git a/src/uu/sort/src/ext_sorter/mod.rs b/src/uu/sort/src/ext_sorter/mod.rs index c5d7e59e8..07ae3bb09 100644 --- a/src/uu/sort/src/ext_sorter/mod.rs +++ b/src/uu/sort/src/ext_sorter/mod.rs @@ -75,18 +75,6 @@ impl ExternalSorter { self.parallel = true; self } - - /// Sorts a given iterator, returning a new iterator with items - pub fn sort( - &self, - iterator: I, - ) -> Result Ordering + Send + Sync>, Error> - where - T: Sortable + Ord, - I: Iterator, - { - self.sort_by(iterator, |a, b| a.cmp(b)) - } /// Sorts a given iterator with a comparator function, returning a new iterator with items pub fn sort_by(&self, iterator: I, cmp: F) -> Result, Error> @@ -98,12 +86,10 @@ impl ExternalSorter { let mut tempdir: Option = None; let mut sort_dir: Option = None; - let mut count = 0; let mut segments_file: Vec = Vec::new(); let size_of_items = std::mem::size_of::(); let mut buffer: Vec = Vec::with_capacity(self.segment_size / size_of_items); for next_item in iterator { - count += 1; buffer.push(next_item); if buffer.len() > self.segment_size { let sort_dir = self.lazy_create_dir(&mut tempdir, &mut sort_dir)?; @@ -122,7 +108,7 @@ impl ExternalSorter { Some(VecDeque::from(buffer)) }; - SortedIterator::new(tempdir, pass_through_queue, segments_file, count, cmp) + SortedIterator::new(tempdir, pass_through_queue, segments_file, cmp) } /// We only want to create directory if it's needed (i.e. if the dataset @@ -199,7 +185,6 @@ pub struct SortedIterator { pass_through_queue: Option>, segments_file: Vec>, next_values: Vec>, - count: u64, cmp: F, } @@ -208,7 +193,6 @@ impl Ordering + Send + Sync> SortedIterator tempdir: Option, pass_through_queue: Option>, mut segments_file: Vec, - count: u64, cmp: F, ) -> Result, Error> { for segment in &mut segments_file { @@ -227,7 +211,6 @@ impl Ordering + Send + Sync> SortedIterator pass_through_queue, segments_file: segments_file_buffered, next_values, - count, cmp, }) }