Archives/bat
2
0
Fork 0
mirror of https://github.com/sharkdp/bat synced 2024-11-18 15:26:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2502 from Enselic/clippy-1.68

Browse Source 
Fix clippy warnings with Rust 1.68
This commit is contained in:
David Peter 2023-03-15 08:36:28 +01:00 committed by GitHub
commit 231ad86f04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/bat/clap_app.rs
View File

@ -575,7 +575,7 @@ pub fn build_app(interactive_output: bool) -> Command {
) )
.group( .group(
ArgGroup::new("cache-actions") ArgGroup::new("cache-actions")
.args(&["build", "clear"]) .args(["build", "clear"])
.required(true), .required(true),
) )
.arg( .arg(

4
src/diff.rs
View File

@ -17,11 +17,11 @@ pub enum LineChange {
pub type LineChanges = HashMap<u32, LineChange>; pub type LineChanges = HashMap<u32, LineChange>;
pub fn get_git_diff(filename: &Path) -> Option<LineChanges> { pub fn get_git_diff(filename: &Path) -> Option<LineChanges> {
let repo = Repository::discover(&filename).ok()?; let repo = Repository::discover(filename).ok()?;
let repo_path_absolute = fs::canonicalize(repo.workdir()?).ok()?; let repo_path_absolute = fs::canonicalize(repo.workdir()?).ok()?;
let filepath_absolute = fs::canonicalize(&filename).ok()?; let filepath_absolute = fs::canonicalize(filename).ok()?;
let filepath_relative_to_repo = filepath_absolute.strip_prefix(&repo_path_absolute).ok()?; let filepath_relative_to_repo = filepath_absolute.strip_prefix(&repo_path_absolute).ok()?;
let mut diff_options = DiffOptions::new(); let mut diff_options = DiffOptions::new();

2
src/preprocessor.rs
View File

@ -22,7 +22,7 @@ pub fn expand_tabs(line: &str, width: usize, cursor: &mut usize) -> String {
// Add tab. // Add tab.
let spaces = width - (*cursor % width); let spaces = width - (*cursor % width);
*cursor += spaces; *cursor += spaces;
buffer.push_str(&*" ".repeat(spaces)); buffer.push_str(&" ".repeat(spaces));
// Next. // Next.
text = &text[index + 1..text.len()]; text = &text[index + 1..text.len()];

4
src/printer.rs
View File

@ -629,7 +629,7 @@ impl<'a> Printer for InteractivePrinter<'a> {
"{}\n{}", "{}\n{}",
as_terminal_escaped( as_terminal_escaped(
style, style,
&*format!("{}{}", self.ansi_style, line_buf), &format!("{}{}", self.ansi_style, line_buf),
self.config.true_color, self.config.true_color,
self.config.colored_output, self.config.colored_output,
self.config.use_italic_text, self.config.use_italic_text,
@ -655,7 +655,7 @@ impl<'a> Printer for InteractivePrinter<'a> {
"{}", "{}",
as_terminal_escaped( as_terminal_escaped(
style, style,
&*format!("{}{}", self.ansi_style, line_buf), &format!("{}{}", self.ansi_style, line_buf),
self.config.true_color, self.config.true_color,
self.config.colored_output, self.config.colored_output,
self.config.use_italic_text, self.config.use_italic_text,