rust/ripgrep
1
0
Fork 0
mirror of https://github.com/BurntSushi/ripgrep.git synced 2025-03-03 14:32:22 +02:00
Code Issues Releases Activity

searcher: remove variable shadowing

Browse Source 
The previous variable name was the same as one of the method arguments.
This commit is contained in:
Vasili Revelas 2020-12-29 20:48:53 +02:00 committed by Andrew Gallant
parent 35b52d33b9
commit 3f33a83a5f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/searcher/src/searcher/mod.rs
View File

@ -707,14 +707,14 @@ impl Searcher {
self.check_config(&matcher).map_err(S::Error::error_config)?;
let mut decode_buffer = self.decode_buffer.borrow_mut();
let read_from = self
let decoder = self
.decode_builder
.build_with_buffer(read_from, &mut *decode_buffer)
.map_err(S::Error::error_io)?;
if self.multi_line_with_matcher(&matcher) {
trace!("generic reader: reading everything to heap for multiline");
self.fill_multi_line_buffer_from_reader::<_, S>(read_from)?;
self.fill_multi_line_buffer_from_reader::<_, S>(decoder)?;
trace!("generic reader: searching via multiline strategy");
MultiLine::new(
self,
@ -725,7 +725,7 @@ impl Searcher {
.run()
} else {
let mut line_buffer = self.line_buffer.borrow_mut();
let rdr = LineBufferReader::new(read_from, &mut *line_buffer);
let rdr = LineBufferReader::new(decoder, &mut *line_buffer);
trace!("generic reader: searching via roll buffer strategy");
ReadByLine::new(self, matcher, rdr, write_to).run()
}