From 5b33670f96a50ebcdf39d5255d433109651c37f5 Mon Sep 17 00:00:00 2001 From: Daniel Hofstetter Date: Tue, 8 Aug 2023 09:05:53 +0200 Subject: [PATCH 1/2] Bump fundu from 1.2.0 to 2.0.0 --- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 68f28a1c7..6c5f8d556 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -900,18 +900,18 @@ dependencies = [ [[package]] name = "fundu" -version = "1.2.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34804ed59f10b3a630c79822ebf7370b562b7281028369e9baa40547c17f8bdc" +checksum = "6c04cb831a8dccadfe3774b07cba4574a1ec24974d761510e65d8a543c2d7cb4" dependencies = [ "fundu-core", ] [[package]] name = "fundu-core" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71a99190954ca83bade03ba054799b17a158ea948a6855c6bb8121adb6b49d9f" +checksum = "76a889e633afd839fb5b04fe53adfd588cefe518e71ec8d3c929698c6daf2acd" [[package]] name = "futures" diff --git a/Cargo.toml b/Cargo.toml index 2cefec1ea..365b160dd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -280,7 +280,7 @@ filetime = "0.2" fnv = "1.0.7" fs_extra = "1.3.0" fts-sys = "0.2" -fundu = "1.2.0" +fundu = "2.0.0" gcd = "2.3" glob = "0.3.1" half = "2.2" From cef9ab10c38c036994275009636a78c95f483c13 Mon Sep 17 00:00:00 2001 From: Daniel Hofstetter Date: Tue, 8 Aug 2023 09:10:33 +0200 Subject: [PATCH 2/2] sleep: adapt two tests to fundu 2.0.0 --- tests/by-util/test_sleep.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/by-util/test_sleep.rs b/tests/by-util/test_sleep.rs index 13aa882b9..76e98e012 100644 --- a/tests/by-util/test_sleep.rs +++ b/tests/by-util/test_sleep.rs @@ -10,7 +10,7 @@ fn test_invalid_time_interval() { new_ucmd!() .arg("xyz") .fails() - .usage_error("invalid time interval 'xyz': Invalid input: 'xyz' at position 1"); + .usage_error("invalid time interval 'xyz': Invalid input: xyz"); new_ucmd!() .args(&["--", "-1"]) .fails() @@ -211,7 +211,7 @@ fn test_sleep_when_input_has_only_whitespace_then_error(#[case] input: &str) { #[test] fn test_sleep_when_multiple_input_some_with_error_then_shows_all_errors() { - let expected = "invalid time interval 'abc': Invalid input: 'abc' at position 1\n\ + let expected = "invalid time interval 'abc': Invalid input: abc\n\ sleep: invalid time interval '1years': Invalid time unit: 'years' at position 2\n\ sleep: invalid time interval ' ': Found only whitespace in input";