From 8b6d9be92e93e7bdbd49d6787123035c5e2bd5d0 Mon Sep 17 00:00:00 2001 From: Abraham Toriz Date: Mon, 13 Dec 2021 14:20:56 -0600 Subject: [PATCH] some clippy lints --- Cargo.toml | 2 +- src/commands/archive.rs | 4 ++-- src/commands/display.rs | 28 ++++++++++++++-------------- src/commands/edit.rs | 6 +++--- src/commands/in.rs | 4 ++-- src/commands/list.rs | 10 +++++----- src/commands/month.rs | 4 ++-- src/commands/now.rs | 10 +++++----- src/commands/out.rs | 2 +- src/commands/resume.rs | 2 +- src/commands/today.rs | 6 +++--- src/commands/week.rs | 6 +++--- src/commands/yesterday.rs | 10 +++++----- src/database.rs | 36 ++++++++++++++++++------------------ src/formatters/text.rs | 2 +- src/tabulate.rs | 2 +- src/timeparse.rs | 6 +++--- 17 files changed, 70 insertions(+), 70 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index e194c1d..273c7db 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,7 @@ path = "src/main.rs" name = "tiempo" repository = "https://gitlab.com/categulario/tiempo-rs" authors = ["Abraham Toriz "] -edition = "2018" +edition = "2021" description = "A command line time tracker" license = "GPL-3.0" documentation = "https://gitlab.com/categulario/tiempo-rs" diff --git a/src/commands/archive.rs b/src/commands/archive.rs index 848c63c..4f2d5f1 100644 --- a/src/commands/archive.rs +++ b/src/commands/archive.rs @@ -29,8 +29,8 @@ impl<'a> TryFrom<&'a ArgMatches<'a>> for Args { fn try_from(matches: &'a ArgMatches) -> Result { Ok(Args { - start: matches.value_of("start").map(|s| parse_time(s)).transpose()?, - end: matches.value_of("end").map(|s| parse_time(s)).transpose()?, + start: matches.value_of("start").map(parse_time).transpose()?, + end: matches.value_of("end").map(parse_time).transpose()?, grep: matches.value_of("grep").map(parse_regex).transpose()?, fake: matches.is_present("fake"), sheet: matches.value_of("sheet").map(|s| s.to_owned()), diff --git a/src/commands/display.rs b/src/commands/display.rs index 0ebf2a4..fa99ddb 100644 --- a/src/commands/display.rs +++ b/src/commands/display.rs @@ -104,8 +104,8 @@ impl<'a> TryFrom<&'a ArgMatches<'a>> for Args { fn try_from(matches: &'a ArgMatches) -> Result { Ok(Args { ids: matches.is_present("ids"), - start: matches.value_of("start").map(|s| parse_time(s)).transpose()?, - end: matches.value_of("end").map(|s| parse_time(s)).transpose()?, + start: matches.value_of("start").map(parse_time).transpose()?, + end: matches.value_of("end").map(parse_time).transpose()?, format: matches.value_of("format").map(|v| v.parse()).transpose()?, grep: matches.value_of("grep").map(parse_regex).transpose()?, sheet: matches.value_of("sheet").map(|s| s.parse()).transpose()?, @@ -185,8 +185,8 @@ mod tests { let mut streams = Streams::fake(b""); let facts = Facts::new(); - streams.db.entry_insert(Utc.ymd(2021, 6, 30).and_hms(10, 0, 0), None, Some("hola".into()), "default".into()).unwrap(); - streams.db.entry_insert(Utc.ymd(2021, 6, 30).and_hms(10, 10, 0), None, Some("hola".into()), "default".into()).unwrap(); + streams.db.entry_insert(Utc.ymd(2021, 6, 30).and_hms(10, 0, 0), None, Some("hola".into()), "default").unwrap(); + streams.db.entry_insert(Utc.ymd(2021, 6, 30).and_hms(10, 10, 0), None, Some("hola".into()), "default").unwrap(); DisplayCommand::handle(args, &mut streams, &facts).unwrap(); @@ -205,8 +205,8 @@ mod tests { let mut streams = Streams::fake(b""); let facts = Facts::new(); - streams.db.entry_insert(Utc.ymd(2021, 6, 30).and_hms(10, 0, 0), None, Some("hola".into()), "default".into()).unwrap(); - streams.db.entry_insert(Utc.ymd(2021, 6, 30).and_hms(10, 10, 0), None, Some("adios".into()), "default".into()).unwrap(); + streams.db.entry_insert(Utc.ymd(2021, 6, 30).and_hms(10, 0, 0), None, Some("hola".into()), "default").unwrap(); + streams.db.entry_insert(Utc.ymd(2021, 6, 30).and_hms(10, 10, 0), None, Some("adios".into()), "default").unwrap(); entries_for_display(None, None, None, &mut streams, Formatter::Csv, true, Some("io".parse().unwrap()), &facts).unwrap(); @@ -230,9 +230,9 @@ mod tests { let facts = Facts::new(); std::env::set_var("TZ", "CST+6"); - streams.db.entry_insert(Utc.ymd(2021, 6, 30).and_hms(10, 0, 0), Some(Utc.ymd(2021, 6, 30).and_hms(11, 0, 0)), None, "sheet1".into()).unwrap(); - streams.db.entry_insert(Utc.ymd(2021, 6, 30).and_hms(11, 0, 0), Some(Utc.ymd(2021, 6, 30).and_hms(12, 0, 0)), None, "sheet2".into()).unwrap(); - streams.db.entry_insert(Utc.ymd(2021, 6, 30).and_hms(12, 0, 0), Some(Utc.ymd(2021, 6, 30).and_hms(13, 0, 0)), None, "sheet1".into()).unwrap(); + streams.db.entry_insert(Utc.ymd(2021, 6, 30).and_hms(10, 0, 0), Some(Utc.ymd(2021, 6, 30).and_hms(11, 0, 0)), None, "sheet1").unwrap(); + streams.db.entry_insert(Utc.ymd(2021, 6, 30).and_hms(11, 0, 0), Some(Utc.ymd(2021, 6, 30).and_hms(12, 0, 0)), None, "sheet2").unwrap(); + streams.db.entry_insert(Utc.ymd(2021, 6, 30).and_hms(12, 0, 0), Some(Utc.ymd(2021, 6, 30).and_hms(13, 0, 0)), None, "sheet1").unwrap(); DisplayCommand::handle(args, &mut streams, &facts).unwrap(); @@ -265,9 +265,9 @@ Timesheet: sheet2 let facts = Facts::new(); std::env::set_var("TZ", "CST+6"); - streams.db.entry_insert(Utc.ymd(2021, 6, 30).and_hms(10, 0, 0), Some(Utc.ymd(2021, 6, 30).and_hms(11, 0, 0)), None, "sheet1".into()).unwrap(); - streams.db.entry_insert(Utc.ymd(2021, 6, 30).and_hms(11, 0, 0), Some(Utc.ymd(2021, 6, 30).and_hms(12, 0, 0)), None, "_sheet2".into()).unwrap(); - streams.db.entry_insert(Utc.ymd(2021, 6, 30).and_hms(12, 0, 0), Some(Utc.ymd(2021, 6, 30).and_hms(13, 0, 0)), None, "sheet1".into()).unwrap(); + streams.db.entry_insert(Utc.ymd(2021, 6, 30).and_hms(10, 0, 0), Some(Utc.ymd(2021, 6, 30).and_hms(11, 0, 0)), None, "sheet1").unwrap(); + streams.db.entry_insert(Utc.ymd(2021, 6, 30).and_hms(11, 0, 0), Some(Utc.ymd(2021, 6, 30).and_hms(12, 0, 0)), None, "_sheet2").unwrap(); + streams.db.entry_insert(Utc.ymd(2021, 6, 30).and_hms(12, 0, 0), Some(Utc.ymd(2021, 6, 30).and_hms(13, 0, 0)), None, "sheet1").unwrap(); DisplayCommand::handle(args, &mut streams, &facts).unwrap(); @@ -333,8 +333,8 @@ Timesheet: sheet1 ..Default::default() }); - streams.db.entry_insert(Utc.ymd(2021, 6, 30).and_hms(10, 0, 0), None, Some("hola".into()), "default".into()).unwrap(); - streams.db.entry_insert(Utc.ymd(2021, 6, 30).and_hms(10, 10, 0), None, Some("hola".into()), "default".into()).unwrap(); + streams.db.entry_insert(Utc.ymd(2021, 6, 30).and_hms(10, 0, 0), None, Some("hola".into()), "default").unwrap(); + streams.db.entry_insert(Utc.ymd(2021, 6, 30).and_hms(10, 10, 0), None, Some("hola".into()), "default").unwrap(); DisplayCommand::handle(args, &mut streams, &facts).unwrap(); diff --git a/src/commands/edit.rs b/src/commands/edit.rs index 9e7d6b0..323b6b8 100644 --- a/src/commands/edit.rs +++ b/src/commands/edit.rs @@ -38,8 +38,8 @@ impl<'a> TryFrom<&'a ArgMatches<'a>> for Args { fn try_from(matches: &'a ArgMatches) -> Result { Ok(Args { id: matches.value_of("id").map(|i| i.parse().unwrap()), - start: matches.value_of("start").map(|s| parse_time(s)).transpose()?, - end: matches.value_of("end").map(|s| parse_time(s)).transpose()?, + start: matches.value_of("start").map(parse_time).transpose()?, + end: matches.value_of("end").map(parse_time).transpose()?, append: matches.is_present("append"), r#move: matches.value_of("move").map(|s| s.into()), note: matches.value_of("note").map(|s| s.into()), @@ -348,7 +348,7 @@ mod tests { SqliteDatabase::from_path(&database_file).unwrap() ); let now = Utc.ymd(2021, 8, 3).and_hms(20, 29, 0); - let new_end = Utc.ymd(2021, 06, 29).and_hms(14, 26, 52); + let new_end = Utc.ymd(2021, 6, 29).and_hms(14, 26, 52); let args = Args { end: Some(new_end), ..Default::default() diff --git a/src/commands/in.rs b/src/commands/in.rs index e3839d9..b0c57c6 100644 --- a/src/commands/in.rs +++ b/src/commands/in.rs @@ -23,7 +23,7 @@ impl<'a> TryFrom<&'a ArgMatches<'a>> for Args { fn try_from(matches: &'a ArgMatches) -> Result { Ok(Args { - at: matches.value_of("at").map(|s| parse_time(s)).transpose()?, + at: matches.value_of("at").map(parse_time).transpose()?, note: matches.value_of("note").map(|s| s.into()), }) } @@ -114,7 +114,7 @@ mod tests { let mut streams = Streams::fake(b""); let facts = Facts::new(); - streams.db.entry_insert(facts.now, None, None, "default".into()).unwrap(); + streams.db.entry_insert(facts.now, None, None, "default").unwrap(); assert_eq!(streams.db.entries_full(None, None).unwrap().len(), 1); diff --git a/src/commands/list.rs b/src/commands/list.rs index dcbd681..4b0c4e1 100644 --- a/src/commands/list.rs +++ b/src/commands/list.rs @@ -172,11 +172,11 @@ mod tests { streams.db.set_current_sheet("sheet2").unwrap(); streams.db.set_last_sheet("sheet4").unwrap(); - streams.db.entry_insert(Utc.ymd(2021, 1, 1).and_hms(0, 0, 0), Some(Utc.ymd(2021, 1, 1).and_hms(1, 0, 0)), None, "_archived".into()).unwrap(); - streams.db.entry_insert(Utc.ymd(2021, 1, 1).and_hms(0, 0, 0), Some(Utc.ymd(2021, 1, 1).and_hms(10,13, 55)), None, "sheet1".into()).unwrap(); - streams.db.entry_insert(Utc.ymd(2021, 1, 1).and_hms(0, 0, 0), Some(Utc.ymd(2021, 1, 1).and_hms(7, 39, 18)), None, "sheet3".into()).unwrap(); - streams.db.entry_insert(Utc.ymd(2021, 1, 1).and_hms(12, 0, 0), Some(Utc.ymd(2021, 1, 1).and_hms(13, 52, 45)), None, "sheet3".into()).unwrap(); - streams.db.entry_insert(Utc.ymd(2021, 1, 1).and_hms(12, 0, 0), None, None, "sheet4".into()).unwrap(); + streams.db.entry_insert(Utc.ymd(2021, 1, 1).and_hms(0, 0, 0), Some(Utc.ymd(2021, 1, 1).and_hms(1, 0, 0)), None, "_archived").unwrap(); + streams.db.entry_insert(Utc.ymd(2021, 1, 1).and_hms(0, 0, 0), Some(Utc.ymd(2021, 1, 1).and_hms(10,13, 55)), None, "sheet1").unwrap(); + streams.db.entry_insert(Utc.ymd(2021, 1, 1).and_hms(0, 0, 0), Some(Utc.ymd(2021, 1, 1).and_hms(7, 39, 18)), None, "sheet3").unwrap(); + streams.db.entry_insert(Utc.ymd(2021, 1, 1).and_hms(12, 0, 0), Some(Utc.ymd(2021, 1, 1).and_hms(13, 52, 45)), None, "sheet3").unwrap(); + streams.db.entry_insert(Utc.ymd(2021, 1, 1).and_hms(12, 0, 0), None, None, "sheet4").unwrap(); let now = Utc.ymd(2021, 1, 1).and_hms(13, 52, 45); let facts = Facts::new().with_now(now); diff --git a/src/commands/month.rs b/src/commands/month.rs index 64abb15..17bdec2 100644 --- a/src/commands/month.rs +++ b/src/commands/month.rs @@ -162,8 +162,8 @@ mod tests { ..Default::default() }).with_now(now); - streams.db.entry_insert(Utc.ymd(2021, 6, 30).and_hms(10, 0, 0), None, Some("hola".into()), "default".into()).unwrap(); - streams.db.entry_insert(Utc.ymd(2021, 6, 30).and_hms(10, 10, 0), None, Some("hola".into()), "default".into()).unwrap(); + streams.db.entry_insert(Utc.ymd(2021, 6, 30).and_hms(10, 0, 0), None, Some("hola".into()), "default").unwrap(); + streams.db.entry_insert(Utc.ymd(2021, 6, 30).and_hms(10, 10, 0), None, Some("hola".into()), "default").unwrap(); MonthCommand::handle(args, &mut streams, &facts).unwrap(); diff --git a/src/commands/now.rs b/src/commands/now.rs index b6f7751..5d94105 100644 --- a/src/commands/now.rs +++ b/src/commands/now.rs @@ -104,11 +104,11 @@ mod tests { streams.db.set_current_sheet("sheet2").unwrap(); streams.db.set_last_sheet("sheet4").unwrap(); - streams.db.entry_insert(Utc.ymd(2021, 1, 1).and_hms(0, 0, 0), Some(Utc.ymd(2021, 1, 1).and_hms(1, 0, 0)), None, "_archived".into()).unwrap(); - streams.db.entry_insert(Utc.ymd(2021, 1, 1).and_hms(0, 0, 0), Some(Utc.ymd(2021, 1, 1).and_hms(10,13, 55)), None, "sheet1".into()).unwrap(); - streams.db.entry_insert(Utc.ymd(2021, 1, 1).and_hms(0, 0, 0), Some(Utc.ymd(2021, 1, 1).and_hms(7, 39, 18)), None, "sheet3".into()).unwrap(); - streams.db.entry_insert(Utc.ymd(2021, 1, 1).and_hms(12, 0, 0), Some(Utc.ymd(2021, 1, 1).and_hms(13, 52, 45)), None, "sheet3".into()).unwrap(); - streams.db.entry_insert(Utc.ymd(2021, 1, 1).and_hms(12, 0, 0), None, Some("some".into()), "sheet4".into()).unwrap(); + streams.db.entry_insert(Utc.ymd(2021, 1, 1).and_hms(0, 0, 0), Some(Utc.ymd(2021, 1, 1).and_hms(1, 0, 0)), None, "_archived").unwrap(); + streams.db.entry_insert(Utc.ymd(2021, 1, 1).and_hms(0, 0, 0), Some(Utc.ymd(2021, 1, 1).and_hms(10,13, 55)), None, "sheet1").unwrap(); + streams.db.entry_insert(Utc.ymd(2021, 1, 1).and_hms(0, 0, 0), Some(Utc.ymd(2021, 1, 1).and_hms(7, 39, 18)), None, "sheet3").unwrap(); + streams.db.entry_insert(Utc.ymd(2021, 1, 1).and_hms(12, 0, 0), Some(Utc.ymd(2021, 1, 1).and_hms(13, 52, 45)), None, "sheet3").unwrap(); + streams.db.entry_insert(Utc.ymd(2021, 1, 1).and_hms(12, 0, 0), None, Some("some".into()), "sheet4").unwrap(); NowCommand::handle(Default::default(), &mut streams, &facts).unwrap(); diff --git a/src/commands/out.rs b/src/commands/out.rs index 9799538..0039bf3 100644 --- a/src/commands/out.rs +++ b/src/commands/out.rs @@ -22,7 +22,7 @@ impl<'a> TryFrom<&'a ArgMatches<'a>> for Args { fn try_from(matches: &'a ArgMatches) -> Result { Ok(Args { - at: matches.value_of("at").map(|s| parse_time(s)).transpose()?, + at: matches.value_of("at").map(parse_time).transpose()?, }) } } diff --git a/src/commands/resume.rs b/src/commands/resume.rs index c9ba47d..52e3757 100644 --- a/src/commands/resume.rs +++ b/src/commands/resume.rs @@ -23,7 +23,7 @@ impl<'a> TryFrom<&'a ArgMatches<'a>> for Args { fn try_from(matches: &'a ArgMatches) -> Result { Ok(Args { - at: matches.value_of("at").map(|s| parse_time(s)).transpose()?, + at: matches.value_of("at").map(parse_time).transpose()?, id: matches.value_of("id").map(|i| i.parse().unwrap()), }) } diff --git a/src/commands/today.rs b/src/commands/today.rs index d663085..c1169fe 100644 --- a/src/commands/today.rs +++ b/src/commands/today.rs @@ -29,7 +29,7 @@ impl<'a> TryFrom<&'a ArgMatches<'a>> for Args { fn try_from(matches: &'a ArgMatches) -> Result { Ok(Args { ids: matches.is_present("ids"), - end: matches.value_of("end").map(|s| parse_time(s)).transpose()?, + end: matches.value_of("end").map(parse_time).transpose()?, format: matches.value_of("format").map(|v| v.parse()).transpose()?, grep: matches.value_of("grep").map(parse_regex).transpose()?, sheet: matches.value_of("sheet").map(|s| s.parse()).transpose()?, @@ -83,8 +83,8 @@ mod tests { ..Default::default() }).with_now(Utc.ymd(2021, 6, 30).and_hms(11, 0, 0)); - streams.db.entry_insert(Utc.ymd(2021, 6, 30).and_hms(10, 0, 0), None, Some("hola".into()), "default".into()).unwrap(); - streams.db.entry_insert(Utc.ymd(2021, 6, 30).and_hms(10, 10, 0), None, Some("hola".into()), "default".into()).unwrap(); + streams.db.entry_insert(Utc.ymd(2021, 6, 30).and_hms(10, 0, 0), None, Some("hola".into()), "default").unwrap(); + streams.db.entry_insert(Utc.ymd(2021, 6, 30).and_hms(10, 10, 0), None, Some("hola".into()), "default").unwrap(); TodayCommand::handle(args, &mut streams, &facts).unwrap(); diff --git a/src/commands/week.rs b/src/commands/week.rs index aded438..8ce4579 100644 --- a/src/commands/week.rs +++ b/src/commands/week.rs @@ -74,7 +74,7 @@ impl<'a> TryFrom<&'a ArgMatches<'a>> for Args { fn try_from(matches: &'a ArgMatches) -> Result { Ok(Args { ids: matches.is_present("ids"), - end: matches.value_of("end").map(|s| parse_time(s)).transpose()?, + end: matches.value_of("end").map(parse_time).transpose()?, format: matches.value_of("format").map(|v| v.parse()).transpose()?, grep: matches.value_of("grep").map(parse_regex).transpose()?, sheet: matches.value_of("sheet").map(|s| s.parse()).transpose()?, @@ -143,8 +143,8 @@ mod tests { ..Default::default() }).with_now(now); - streams.db.entry_insert(Utc.ymd(2021, 6, 30).and_hms(10, 0, 0), None, Some("hola".into()), "default".into()).unwrap(); - streams.db.entry_insert(Utc.ymd(2021, 6, 30).and_hms(10, 10, 0), None, Some("hola".into()), "default".into()).unwrap(); + streams.db.entry_insert(Utc.ymd(2021, 6, 30).and_hms(10, 0, 0), None, Some("hola".into()), "default").unwrap(); + streams.db.entry_insert(Utc.ymd(2021, 6, 30).and_hms(10, 10, 0), None, Some("hola".into()), "default").unwrap(); WeekCommand::handle(args, &mut streams, &facts).unwrap(); diff --git a/src/commands/yesterday.rs b/src/commands/yesterday.rs index 04f6989..3212786 100644 --- a/src/commands/yesterday.rs +++ b/src/commands/yesterday.rs @@ -85,9 +85,9 @@ mod tests { let today = Local::now().date(); let facts = Facts::new(); - streams.db.entry_insert(two_days_ago.and_hms(1, 2, 3).with_timezone(&Utc), None, None, "default".into()).unwrap(); - streams.db.entry_insert(yesterday.and_hms(1, 2, 3).with_timezone(&Utc), None, Some("This!".into()), "default".into()).unwrap(); - streams.db.entry_insert(today.and_hms(1, 2, 3).with_timezone(&Utc), None, None, "default".into()).unwrap(); + streams.db.entry_insert(two_days_ago.and_hms(1, 2, 3).with_timezone(&Utc), None, None, "default").unwrap(); + streams.db.entry_insert(yesterday.and_hms(1, 2, 3).with_timezone(&Utc), None, Some("This!".into()), "default").unwrap(); + streams.db.entry_insert(today.and_hms(1, 2, 3).with_timezone(&Utc), None, None, "default").unwrap(); YesterdayCommand::handle(args, &mut streams, &facts).unwrap(); @@ -113,8 +113,8 @@ mod tests { ..Default::default() }).with_now(now); - streams.db.entry_insert(Utc.ymd(2021, 6, 30).and_hms(10, 0, 0), None, Some("hola".into()), "default".into()).unwrap(); - streams.db.entry_insert(Utc.ymd(2021, 6, 30).and_hms(10, 10, 0), None, Some("hola".into()), "default".into()).unwrap(); + streams.db.entry_insert(Utc.ymd(2021, 6, 30).and_hms(10, 0, 0), None, Some("hola".into()), "default").unwrap(); + streams.db.entry_insert(Utc.ymd(2021, 6, 30).and_hms(10, 10, 0), None, Some("hola".into()), "default").unwrap(); YesterdayCommand::handle(args, &mut streams, &facts).unwrap(); diff --git a/src/database.rs b/src/database.rs index 8eb405d..ef3ee25 100644 --- a/src/database.rs +++ b/src/database.rs @@ -331,12 +331,12 @@ mod tests { let mut db = SqliteDatabase::from_memory().unwrap(); db.init().unwrap(); - db.entry_insert(Utc.ymd(2021, 7, 7).and_hms(1, 0, 0), None, None, "XXX".into()).unwrap(); - db.entry_insert(Utc.ymd(2021, 7, 7).and_hms(1, 0, 0), None, None, "OOO".into()).unwrap(); - db.entry_insert(Utc.ymd(2021, 7, 7).and_hms(2, 0, 0), None, None, "XXX".into()).unwrap(); - db.entry_insert(Utc.ymd(2021, 7, 7).and_hms(2, 0, 0), None, None, "OOO".into()).unwrap(); - db.entry_insert(Utc.ymd(2021, 7, 7).and_hms(3, 0, 0), None, None, "XXX".into()).unwrap(); - db.entry_insert(Utc.ymd(2021, 7, 7).and_hms(3, 0, 0), None, None, "OOO".into()).unwrap(); + db.entry_insert(Utc.ymd(2021, 7, 7).and_hms(1, 0, 0), None, None, "XXX").unwrap(); + db.entry_insert(Utc.ymd(2021, 7, 7).and_hms(1, 0, 0), None, None, "OOO").unwrap(); + db.entry_insert(Utc.ymd(2021, 7, 7).and_hms(2, 0, 0), None, None, "XXX").unwrap(); + db.entry_insert(Utc.ymd(2021, 7, 7).and_hms(2, 0, 0), None, None, "OOO").unwrap(); + db.entry_insert(Utc.ymd(2021, 7, 7).and_hms(3, 0, 0), None, None, "XXX").unwrap(); + db.entry_insert(Utc.ymd(2021, 7, 7).and_hms(3, 0, 0), None, None, "OOO").unwrap(); let start = Utc.ymd(2021, 7, 7).and_hms(1, 30, 0); let end = Utc.ymd(2021, 7, 7).and_hms(2, 30, 0); @@ -383,12 +383,12 @@ mod tests { let mut db = SqliteDatabase::from_memory().unwrap(); db.init().unwrap(); - db.entry_insert(Utc.ymd(2021, 7, 7).and_hms(1, 0, 0), None, None, "XXX".into()).unwrap(); - db.entry_insert(Utc.ymd(2021, 7, 7).and_hms(1, 0, 0), None, None, "_OO".into()).unwrap(); - db.entry_insert(Utc.ymd(2021, 7, 7).and_hms(2, 0, 0), None, None, "XXX".into()).unwrap(); - db.entry_insert(Utc.ymd(2021, 7, 7).and_hms(2, 0, 0), None, None, "_OO".into()).unwrap(); - db.entry_insert(Utc.ymd(2021, 7, 7).and_hms(3, 0, 0), None, None, "XXX".into()).unwrap(); - db.entry_insert(Utc.ymd(2021, 7, 7).and_hms(3, 0, 0), None, None, "_OO".into()).unwrap(); + db.entry_insert(Utc.ymd(2021, 7, 7).and_hms(1, 0, 0), None, None, "XXX").unwrap(); + db.entry_insert(Utc.ymd(2021, 7, 7).and_hms(1, 0, 0), None, None, "_OO").unwrap(); + db.entry_insert(Utc.ymd(2021, 7, 7).and_hms(2, 0, 0), None, None, "XXX").unwrap(); + db.entry_insert(Utc.ymd(2021, 7, 7).and_hms(2, 0, 0), None, None, "_OO").unwrap(); + db.entry_insert(Utc.ymd(2021, 7, 7).and_hms(3, 0, 0), None, None, "XXX").unwrap(); + db.entry_insert(Utc.ymd(2021, 7, 7).and_hms(3, 0, 0), None, None, "_OO").unwrap(); let start = Utc.ymd(2021, 7, 7).and_hms(1, 30, 0); let end = Utc.ymd(2021, 7, 7).and_hms(2, 30, 0); @@ -435,12 +435,12 @@ mod tests { let mut db = SqliteDatabase::from_memory().unwrap(); db.init().unwrap(); - db.entry_insert(Utc.ymd(2021, 7, 7).and_hms(1, 0, 0), None, None, "XXX".into()).unwrap(); - db.entry_insert(Utc.ymd(2021, 7, 7).and_hms(1, 0, 0), None, None, "_OO".into()).unwrap(); - db.entry_insert(Utc.ymd(2021, 7, 7).and_hms(2, 0, 0), None, None, "XXX".into()).unwrap(); - db.entry_insert(Utc.ymd(2021, 7, 7).and_hms(2, 0, 0), None, None, "_OO".into()).unwrap(); - db.entry_insert(Utc.ymd(2021, 7, 7).and_hms(3, 0, 0), None, None, "XXX".into()).unwrap(); - db.entry_insert(Utc.ymd(2021, 7, 7).and_hms(3, 0, 0), None, None, "_OO".into()).unwrap(); + db.entry_insert(Utc.ymd(2021, 7, 7).and_hms(1, 0, 0), None, None, "XXX").unwrap(); + db.entry_insert(Utc.ymd(2021, 7, 7).and_hms(1, 0, 0), None, None, "_OO").unwrap(); + db.entry_insert(Utc.ymd(2021, 7, 7).and_hms(2, 0, 0), None, None, "XXX").unwrap(); + db.entry_insert(Utc.ymd(2021, 7, 7).and_hms(2, 0, 0), None, None, "_OO").unwrap(); + db.entry_insert(Utc.ymd(2021, 7, 7).and_hms(3, 0, 0), None, None, "XXX").unwrap(); + db.entry_insert(Utc.ymd(2021, 7, 7).and_hms(3, 0, 0), None, None, "_OO").unwrap(); let start = Utc.ymd(2021, 7, 7).and_hms(1, 30, 0); let end = Utc.ymd(2021, 7, 7).and_hms(2, 30, 0); diff --git a/src/formatters/text.rs b/src/formatters/text.rs index 54e67ab..f87bb65 100644 --- a/src/formatters/text.rs +++ b/src/formatters/text.rs @@ -135,7 +135,7 @@ mod tests { use super::*; - const LONG_NOTE: &'static str = "chatting with bob about upcoming task, district sharing of images, how the user settings currently works etc. Discussing the fingerprinting / cache busting issue with CKEDITOR, suggesting perhaps looking into forking the rubygem and seeing if we can work in our own changes, however hard that might be."; + const LONG_NOTE: &str = "chatting with bob about upcoming task, district sharing of images, how the user settings currently works etc. Discussing the fingerprinting / cache busting issue with CKEDITOR, suggesting perhaps looking into forking the rubygem and seeing if we can work in our own changes, however hard that might be."; #[test] fn test_text_output() { diff --git a/src/tabulate.rs b/src/tabulate.rs index 1c60753..51cdc21 100644 --- a/src/tabulate.rs +++ b/src/tabulate.rs @@ -196,7 +196,7 @@ mod tests { use super::*; - const LONG_NOTE: &'static str = "chatting with bob about upcoming task, district sharing of images, how the user settings currently works etc. Discussing the fingerprinting / cache busting issue with CKEDITOR, suggesting perhaps looking into forking the rubygem and seeing if we can work in our own changes, however hard that might be."; + const LONG_NOTE: &str = "chatting with bob about upcoming task, district sharing of images, how the user settings currently works etc. Discussing the fingerprinting / cache busting issue with CKEDITOR, suggesting perhaps looking into forking the rubygem and seeing if we can work in our own changes, however hard that might be."; #[test] fn test_constrained_lines_long_text() { diff --git a/src/timeparse.rs b/src/timeparse.rs index bcfc792..abcdfdb 100644 --- a/src/timeparse.rs +++ b/src/timeparse.rs @@ -236,15 +236,15 @@ mod tests { // mixed time_diff(parse_time("an hour 10 minutes ago").unwrap(), Local::now() - Duration::minutes(70)); time_diff(parse_time("2 hours five minutes ago").unwrap(), Local::now() - Duration::minutes(125)); - time_diff(parse_time("an hour 12 minutes ago").unwrap(), Local::now() - Duration::minutes(1 * 60 + 12)); + time_diff(parse_time("an hour 12 minutes ago").unwrap(), Local::now() - Duration::minutes(60 + 12)); // abbreviated time_diff(parse_time("2hrs ago").unwrap(), Local::now() - Duration::hours(2)); time_diff(parse_time("10min ago").unwrap(), Local::now() - Duration::minutes(10)); time_diff(parse_time("1hr ago").unwrap(), Local::now() - Duration::hours(1)); time_diff(parse_time("1h ago").unwrap(), Local::now() - Duration::hours(1)); - time_diff(parse_time("1h 5m ago").unwrap(), Local::now() - Duration::minutes(1 * 60 + 5)); - time_diff(parse_time("1h5m ago").unwrap(), Local::now() - Duration::minutes(1 * 60 + 5)); + time_diff(parse_time("1h 5m ago").unwrap(), Local::now() - Duration::minutes(60 + 5)); + time_diff(parse_time("1h5m ago").unwrap(), Local::now() - Duration::minutes(60 + 5)); time_diff(parse_time("a m ago").unwrap(), Local::now() - Duration::minutes(1)); time_diff(parse_time("an hr ago").unwrap(), Local::now() - Duration::hours(1)); time_diff(parse_time("a min ago").unwrap(), Local::now() - Duration::minutes(1));