Skip to content

pr: remove unused lines_printed variable #10474

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cakebaker merged 1 commit into from
Jan 25, 2026
+5 −7
Merged

pr: remove unused lines_printed variable #10474

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions src/uu/pr/src/pr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -989,7 +989,7 @@ fn print_page(
lines: &[FileLine],
options: &OutputOptions,
page: usize,
) -> Result<usize, std::io::Error> {
) -> Result<(), std::io::Error> {
let line_separator = options.line_separator.as_bytes();
let page_separator = options.page_separator_char.as_bytes();

Expand All @@ -1004,7 +1004,7 @@ fn print_page(
out.write_all(line_separator)?;
}

let lines_written = write_columns(lines, options, &mut out)?;
write_columns(lines, options, &mut out)?;

for (index, x) in trailer_content.iter().enumerate() {
out.write_all(x.as_bytes())?;
Expand All @@ -1014,15 +1014,15 @@ fn print_page(
}
out.write_all(page_separator)?;
out.flush()?;
Ok(lines_written)
Ok(())
}

#[allow(clippy::cognitive_complexity)]
fn write_columns(
lines: &[FileLine],
options: &OutputOptions,
out: &mut impl Write,
) -> Result<usize, std::io::Error> {
) -> Result<(), std::io::Error> {
let line_separator = options.content_line_separator.as_bytes();

let content_lines_per_page = if options.double_space {
Expand All @@ -1035,7 +1035,6 @@ fn write_columns(
.merge_files_print
.unwrap_or_else(|| get_columns(options));
let line_width = options.line_width;
let mut lines_printed = 0;
let feed_line_present = options.form_feed_used;
let mut not_found_break = false;

Expand Down Expand Up @@ -1101,7 +1100,6 @@ fn write_columns(
get_line_for_printing(options, file_line, columns, i, line_width, indexes)
.as_bytes(),
)?;
lines_printed += 1;
}
}
if not_found_break && feed_line_present {
Expand All @@ -1110,7 +1108,7 @@ fn write_columns(
out.write_all(line_separator)?;
}

Ok(lines_printed)
Ok(())
}

fn get_line_for_printing(
Expand Down
Loading