Mirrors/bartib
2
0
Fork 0
mirror of https://github.com/nikolassv/bartib synced 2025-02-26 03:47:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Apply clippy fixes

Browse source
This commit is contained in:
Lukas Dietrich 2022-03-31 22:32:31 +02:00
parent 1c3f3ff495
commit 7c7f3b8883
4 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/controller/list.rs
View file

@ -70,7 +70,7 @@ pub fn check(file_name: &str) -> Result<()> {
println!( println!(
"\n{}\n -> {} (Line: {})", "\n{}\n -> {} (Line: {})",
line.plaintext.as_ref().unwrap(), line.plaintext.as_ref().unwrap(),
e.to_string(), e,
line.line_number.unwrap_or(0) line.line_number.unwrap_or(0)
); );
} }

4
src/data/bartib_file.rs
View file

@ -28,9 +28,7 @@ pub struct Line {
impl Line { impl Line {
// creates a new line struct from plaintext // creates a new line struct from plaintext
pub fn new(plaintext: &str, line_number: usize, preceeding_line: Option<&Line>) -> Line { pub fn new(plaintext: &str, line_number: usize, preceeding_line: Option<&Line>) -> Line {
let preceeding_activity = preceeding_line let preceeding_activity = preceeding_line.and_then(|line| line.activity.as_ref().ok());
.map(|line| line.activity.as_ref().ok())
.flatten();
Line { Line {
plaintext: Some(plaintext.trim().to_string()), plaintext: Some(plaintext.trim().to_string()),

2
src/view/format_util.rs
View file

@ -4,7 +4,7 @@ pub fn format_duration(duration: &Duration) -> String {
let mut duration_string = String::new(); let mut duration_string = String::new();
if duration.num_hours() > 0 { if duration.num_hours() > 0 {
duration_string.push_str(&format!("{}h ", duration.num_hours().to_string())); duration_string.push_str(&format!("{}h ", duration.num_hours()));
} }
if duration.num_minutes() > 0 { if duration.num_minutes() > 0 {

8
src/view/report.rs
View file

@ -157,9 +157,7 @@ fn group_activities_by_description<'a>(activities: &'a [&'a activity::Activity])
fn get_longest_line(project_map: &ProjectMap) -> Option<usize> { fn get_longest_line(project_map: &ProjectMap) -> Option<usize> {
let longest_project_line = project_map.keys().map(|p| p.chars().count()).max(); let longest_project_line = project_map.keys().map(|p| p.chars().count()).max();
let longest_activity_line = project_map.values() let longest_activity_line = project_map.values().flat_map(|(a, _d)| a)
.map(|(a, _d)| a)
.flatten()
.map(|a| a.description.chars().count() + conf::REPORT_INDENTATION).max(); .map(|a| a.description.chars().count() + conf::REPORT_INDENTATION).max();
get_max_option(longest_project_line, longest_activity_line) get_max_option(longest_project_line, longest_activity_line)
} }
@ -169,9 +167,7 @@ fn get_longest_duration_string(report: &Report) -> Option<usize> {
.map(|(_a, d)| format_util::format_duration(d)) .map(|(_a, d)| format_util::format_duration(d))
.map(|s| s.chars().count()) .map(|s| s.chars().count())
.max(); .max();
let longest_activity_duration = report.project_map.values() let longest_activity_duration = report.project_map.values().flat_map(|(a, _d)| a)
.map(|(a, _d)| a)
.flatten()
.map(|a| format_util::format_duration(&a.get_duration())) .map(|a| format_util::format_duration(&a.get_duration()))
.map(|s| s.chars().count()) .map(|s| s.chars().count())
.max(); .max();