We moved from time to chrono

refresh the fuzz lock
update of the doc
2026-06-10 16:13:15 -07:00 · 2023-06-03 16:39:58 +02:00 · 2023-06-03 16:38:42 +02:00 · 2023-06-03 16:38:21 +02:00 · 2023-06-03 16:34:51 +02:00 · 2023-06-03 16:33:51 +02:00
12 changed files with 955 additions and 114 deletions
@@ -0,0 +1,166 @@
+on: [push, pull_request]
+
+name: Basic CI
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  check:
+    name: cargo check
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macOS-latest, windows-latest]
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          override: true
+      - uses: actions-rs/cargo@v1
+        with:
+          command: check
+
+  test:
+    name: cargo test
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macOS-latest, windows-latest]
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          override: true
+      - uses: actions-rs/cargo@v1
+        with:
+          command: test
+
+  fmt:
+    name: cargo fmt --all -- --check
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          override: true
+      - run: rustup component add rustfmt
+      - uses: actions-rs/cargo@v1
+        with:
+          command: fmt
+          args: --all -- --check
+
+  clippy:
+    name: cargo clippy -- -D warnings
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macOS-latest, windows-latest]
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          override: true
+      - run: rustup component add clippy
+      - uses: actions-rs/cargo@v1
+        with:
+          command: clippy
+          args: -- -D warnings
+
+  coverage:
+    name: Code Coverage
+    runs-on: ${{ matrix.job.os }}
+    strategy:
+      fail-fast: true
+      matrix:
+        job:
+          - { os: ubuntu-latest  , features: unix }
+          - { os: macos-latest   , features: macos }
+          - { os: windows-latest , features: windows }
+    steps:
+    - uses: actions/checkout@v3
+    - name: Initialize workflow variables
+      id: vars
+      shell: bash
+      run: |
+        ## VARs setup
+        outputs() { step_id="vars"; for var in "$@" ; do echo steps.${step_id}.outputs.${var}="${!var}"; echo "${var}=${!var}" >> $GITHUB_OUTPUT; done; }
+        # toolchain
+        TOOLCHAIN="nightly" ## default to "nightly" toolchain (required for certain required unstable compiler flags) ## !maint: refactor when stable channel has needed support
+        # * specify gnu-type TOOLCHAIN for windows; `grcov` requires gnu-style code coverage data files
+        case ${{ matrix.job.os }} in windows-*) TOOLCHAIN="$TOOLCHAIN-x86_64-pc-windows-gnu" ;; esac;
+        # * use requested TOOLCHAIN if specified
+        if [ -n "${{ matrix.job.toolchain }}" ]; then TOOLCHAIN="${{ matrix.job.toolchain }}" ; fi
+        outputs TOOLCHAIN
+        # target-specific options
+        # * CARGO_FEATURES_OPTION
+        CARGO_FEATURES_OPTION='--all -- --check' ;  ## default to '--all-features' for code coverage
+        # * CODECOV_FLAGS
+        CODECOV_FLAGS=$( echo "${{ matrix.job.os }}" | sed 's/[^[:alnum:]]/_/g' )
+        outputs CODECOV_FLAGS
+
+    - name: rust toolchain ~ install
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: ${{ steps.vars.outputs.TOOLCHAIN }}
+        default: true
+        profile: minimal # minimal component installation (ie, no documentation)
+    - name: Test
+      uses: actions-rs/cargo@v1
+      with:
+        command: test
+        args: ${{ steps.vars.outputs.CARGO_FEATURES_OPTION }} --no-fail-fast
+      env:
+        CARGO_INCREMENTAL: "0"
+        RUSTC_WRAPPER: ""
+        RUSTFLAGS: "-Zprofile -Ccodegen-units=1 -Copt-level=0 -Clink-dead-code -Coverflow-checks=off -Zpanic_abort_tests -Cpanic=abort"
+        RUSTDOCFLAGS: "-Cpanic=abort"
+    - name: "`grcov` ~ install"
+      id: build_grcov
+      shell: bash
+      run: |
+        git clone https://github.com/mozilla/grcov.git ~/grcov/
+        cd ~/grcov
+        # Hardcode the version of crossbeam-epoch. See
+        # https://github.com/uutils/coreutils/issues/3680
+        sed -i -e "s|tempfile =|crossbeam-epoch = \"=0.9.8\"\ntempfile =|" Cargo.toml
+        cargo install --path .
+        cd -
+# Uncomment when the upstream issue
+# https://github.com/mozilla/grcov/issues/849 is fixed
+#      uses: actions-rs/install@v0.1
+#      with:
+#        crate: grcov
+#        version: latest
+#        use-tool-cache: false
+    - name: Generate coverage data (via `grcov`)
+      id: coverage
+      shell: bash
+      run: |
+        ## Generate coverage data
+        COVERAGE_REPORT_DIR="target/debug"
+        COVERAGE_REPORT_FILE="${COVERAGE_REPORT_DIR}/lcov.info"
+        mkdir -p "${COVERAGE_REPORT_DIR}"
+        # display coverage files
+        grcov . --output-type files --ignore build.rs --ignore "vendor/*" --ignore "/*" --ignore "[a-zA-Z]:/*" --excl-br-line "^\s*((debug_)?assert(_eq|_ne)?!|#\[derive\()" | sort --unique
+        # generate coverage report
+        grcov . --output-type lcov --output-path "${COVERAGE_REPORT_FILE}" --branch --ignore build.rs --ignore "vendor/*" --ignore "/*" --ignore "[a-zA-Z]:/*" --excl-br-line "^\s*((debug_)?assert(_eq|_ne)?!|#\[derive\()"
+        echo "report=${COVERAGE_REPORT_FILE}" >> $GITHUB_OUTPUT
+    - name: Upload coverage results (to Codecov.io)
+      uses: codecov/codecov-action@v3
+      # if: steps.vars.outputs.HAS_CODECOV_TOKEN
+      with:
+        # token: ${{ secrets.CODECOV_TOKEN }}
+        file: ${{ steps.coverage.outputs.report }}
+        ## flags: IntegrationTests, UnitTests, ${{ steps.vars.outputs.CODECOV_FLAGS }}
+        flags: ${{ steps.vars.outputs.CODECOV_FLAGS }}
+        name: codecov-umbrella
+        fail_ci_if_error: false
@@ -1,22 +0,0 @@
-name: Rust
-
-on:
-  push:
-    branches: [ "main" ]
-  pull_request:
-    branches: [ "main" ]
-
-env:
-  CARGO_TERM_COLOR: always
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Build
-      run: cargo build --verbose
-    - name: Run tests
-      run: cargo test --verbose
@@ -0,0 +1 @@
+target/
@@ -12,19 +12,156 @@ dependencies = [
 ]

 [[package]]
-name = "humantime_to_duration"
-version = "0.1.0"
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
 dependencies = [
- "regex",
- "time",
+ "libc",
 ]

+[[package]]
+name = "autocfg"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+
+[[package]]
+name = "bumpalo"
+version = "3.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
+
+[[package]]
+name = "cc"
+version = "1.0.79"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "chrono"
+version = "0.4.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
+dependencies = [
+ "android-tzdata",
+ "iana-time-zone",
+ "js-sys",
+ "num-traits",
+ "time",
+ "wasm-bindgen",
+ "winapi",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
+
+[[package]]
+name = "humantime_to_duration"
+version = "0.3.0"
+dependencies = [
+ "chrono",
+ "regex",
+]
+
+[[package]]
+name = "iana-time-zone"
+version = "0.1.56"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "windows",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "js-sys"
+version = "0.3.63"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.144"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1"
+
+[[package]]
+name = "log"
+version = "0.4.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de"
+
 [[package]]
 name = "memchr"
 version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"

+[[package]]
+name = "num-traits"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.17.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9670a07f94779e00908f3e686eab508878ebb390ba6e604d3a284c00e8d0487b"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.59"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488"
+dependencies = [
+ "proc-macro2",
+]
+
 [[package]]
 name = "regex"
 version = "1.8.1"
@@ -43,23 +180,177 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c"

 [[package]]
-name = "serde"
-version = "1.0.160"
+name = "syn"
+version = "2.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c"
-
-[[package]]
-name = "time"
-version = "0.3.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890"
+checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e"
 dependencies = [
- "serde",
- "time-core",
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
 ]

 [[package]]
-name = "time-core"
-version = "0.1.0"
+name = "time"
+version = "0.1.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd"
+checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a"
+dependencies = [
+ "libc",
+ "wasi",
+ "winapi",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0"
+
+[[package]]
+name = "wasi"
+version = "0.10.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73"
+dependencies = [
+ "cfg-if",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
@@ -1,11 +1,12 @@
 [package]
 name = "humantime_to_duration"
 description = " parsing human-readable relative time strings and converting them to a Duration"
-version = "0.1.0"
+version = "0.3.0"
 edition = "2021"
 license = "MIT"
 repository = "https://github.com/uutils/humantime_to_duration"
+readme = "README.md"

 [dependencies]
-regex = "1.8.1"
-time = "0.3.20"
+regex = "1.8"
+chrono = "0.4"
@@ -1,6 +1,6 @@
 MIT License

-Copyright (c) 2023 uutils
+Copyright (c) 2023 Sylvestre Ledru and others

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -1,5 +1,9 @@
 # humantime_to_duration

+[![Crates.io](https://img.shields.io/crates/v/humantime_to_duration.svg)](https://crates.io/crates/humantime_to_duration)
+[![License](http://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/uutils/humantime_to_duration/blob/main/LICENSE)
+[![CodeCov](https://codecov.io/gh/uutils/humantime_to_duration/branch/main/graph/badge.svg)](https://codecov.io/gh/uutils/humantime_to_duration)
+
 A Rust crate for parsing human-readable relative time strings and converting them to a `Duration`.

 ## Features
@@ -7,6 +11,8 @@ A Rust crate for parsing human-readable relative time strings and converting the
 - Parses a variety of human-readable time formats.
 - Supports positive and negative durations.
 - Allows for chaining time units (e.g., "1 hour 2 minutes" or "2 days and 2 hours").
+- Calculate durations relative to a specified date.
+- Relies on Chrono

 ## Usage

@@ -14,21 +20,28 @@ Add this to your `Cargo.toml`:

 ```toml
 [dependencies]
-humantime_to_duration = "0.1.0"
+humantime_to_duration = "0.3.0"
 ```

-Then, import the crate and use the from_str function:
+Then, import the crate and use the `from_str` and `from_str_at_date` functions:
 ```
-use humantime_to_duration::from_str;
-use time::Duration;
+use humantime_to_duration::{from_str, from_str_at_date};
+use chrono::Duration;

 let duration = from_str("+3 days");
 assert_eq!(duration.unwrap(), Duration::days(3));
+
+let today = Utc::today().naive_utc();
+let yesterday = today - Duration::days(1);
+assert_eq!(
+    from_str_at_date(yesterday, "2 days").unwrap(),
+    Duration::days(1)
+);
 ```

 ### Supported Formats

-The `from_str` function supports the following formats for relative time:
+The `from_str` and `from_str_at_date` functions support the following formats for relative time:

 - `num` `unit` (e.g., "-1 hour", "+3 days")
 - `unit` (e.g., "hour", "day")
@@ -43,7 +56,7 @@ The `from_str` function supports the following formats for relative time:

 ## Return Values

-The `from_str` function returns:
+The `from_str` and `from_str_at_date` functions return:

 - `Ok(Duration)` - If the input string can be parsed as a relative time
 - `Err(ParseDurationError)` - If the input string cannot be parsed as a relative time
@@ -51,7 +64,7 @@ The `from_str` function returns:
 This function will return `Err(ParseDurationError::InvalidInput)` if the input string
 cannot be parsed as a relative time.

-## Fuzzer
+## Fuzzer

 To run the fuzzer:
 ```
@@ -11,12 +11,39 @@ dependencies = [
 "memchr",
 ]

+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "arbitrary"
 version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e2d098ff73c1ca148721f37baad5ea6a465a13f9573aba8641fbbbae8164a54e"

+[[package]]
+name = "autocfg"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+
+[[package]]
+name = "bumpalo"
+version = "3.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
+
 [[package]]
 name = "cc"
 version = "1.0.79"
@@ -32,15 +59,36 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"

+[[package]]
+name = "chrono"
+version = "0.4.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
+dependencies = [
+ "android-tzdata",
+ "iana-time-zone",
+ "js-sys",
+ "num-traits",
+ "time",
+ "wasm-bindgen",
+ "winapi",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
+
 [[package]]
 name = "fuzz_from_str"
 version = "0.1.0"
 dependencies = [
+ "chrono",
 "humantime_to_duration",
 "libfuzzer-sys",
 "rand",
 "regex",
- "time",
 ]

 [[package]]
@@ -51,15 +99,38 @@ checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4"
 dependencies = [
 "cfg-if",
 "libc",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
 ]

 [[package]]
 name = "humantime_to_duration"
-version = "0.1.0"
+version = "0.3.0"
 dependencies = [
+ "chrono",
 "regex",
- "time",
+]
+
+[[package]]
+name = "iana-time-zone"
+version = "0.1.56"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "windows",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
 ]

 [[package]]
@@ -71,6 +142,15 @@ dependencies = [
 "libc",
 ]

+[[package]]
+name = "js-sys"
+version = "0.3.63"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790"
+dependencies = [
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "libc"
 version = "0.2.142"
@@ -88,12 +168,27 @@ dependencies = [
 "once_cell",
 ]

+[[package]]
+name = "log"
+version = "0.4.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de"
+
 [[package]]
 name = "memchr"
 version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"

+[[package]]
+name = "num-traits"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
+dependencies = [
+ "autocfg",
+]
+
 [[package]]
 name = "once_cell"
 version = "1.17.1"
@@ -106,6 +201,24 @@ version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"

+[[package]]
+name = "proc-macro2"
+version = "1.0.59"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488"
+dependencies = [
+ "proc-macro2",
+]
+
 [[package]]
 name = "rand"
 version = "0.8.5"
@@ -138,9 +251,9 @@ dependencies = [

 [[package]]
 name = "regex"
-version = "1.8.1"
+version = "1.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370"
+checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390"
 dependencies = [
 "aho-corasick",
 "memchr",
@@ -149,34 +262,188 @@ dependencies = [

 [[package]]
 name = "regex-syntax"
-version = "0.7.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c"
+checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"

 [[package]]
-name = "serde"
-version = "1.0.160"
+name = "syn"
+version = "2.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c"
-
-[[package]]
-name = "time"
-version = "0.3.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890"
+checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e"
 dependencies = [
- "serde",
- "time-core",
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
 ]

 [[package]]
-name = "time-core"
-version = "0.1.0"
+name = "time"
+version = "0.1.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd"
+checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a"
+dependencies = [
+ "libc",
+ "wasi 0.10.0+wasi-snapshot-preview1",
+ "winapi",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0"
+
+[[package]]
+name = "wasi"
+version = "0.10.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"

 [[package]]
 name = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73"
+dependencies = [
+ "cfg-if",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
@@ -7,10 +7,10 @@ edition = "2018"
 cargo-fuzz = true

 [dependencies]
-rand = "0.8.4"
+rand = "0.8.5"
 libfuzzer-sys = "0.4"
-regex = "1.8.1"
-time = "0.3.20"
+regex = "1.8.3"
+chrono = "0.4"

 [dependencies.humantime_to_duration]
 path = "../"
@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:base"
+  ]
+}
@@ -1,12 +1,12 @@
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.

+use chrono::{Duration, Local, NaiveDate, Utc};
 use regex::{Error as RegexError, Regex};
 use std::error::Error;
 use std::fmt::{self, Display};
-use time::Duration;

-#[derive(Debug)]
+#[derive(Debug, PartialEq)]
 pub enum ParseDurationError {
    InvalidRegex(RegexError),
    InvalidInput,
@@ -46,7 +46,7 @@ impl From<RegexError> for ParseDurationError {
 /// # Examples
 ///
 /// ```
-/// use time::Duration;
+/// use chrono::Duration;
 /// let duration = humantime_to_duration::from_str("+3 days");
 /// assert_eq!(duration.unwrap(), Duration::days(3));
 /// ```
@@ -62,7 +62,7 @@ impl From<RegexError> for ParseDurationError {
 /// * "tomorrow"
 /// * use "ago" for the past
 ///
-/// [num] can be a positive or negative integer.
+/// `[num]` can be a positive or negative integer.
 /// [unit] can be one of the following: "fortnight", "week", "day", "hour",
 /// "minute", "min", "second", "sec" and their plural forms.
 ///
@@ -77,18 +77,63 @@ impl From<RegexError> for ParseDurationError {
 ///
 /// This function will return `Err(ParseDurationError::InvalidInput)` if the input string
 /// cannot be parsed as a relative time.
+///
+/// # Examples
+///
+/// ```
+/// use chrono::Duration;
+/// use humantime_to_duration::{from_str, ParseDurationError};
+///
+/// assert_eq!(from_str("1 hour, 30 minutes").unwrap(), Duration::minutes(90));
+/// assert_eq!(from_str("tomorrow").unwrap(), Duration::days(1));
+/// assert!(matches!(from_str("invalid"), Err(ParseDurationError::InvalidInput)));
+/// ```
 pub fn from_str(s: &str) -> Result<Duration, ParseDurationError> {
+    from_str_at_date(Utc::now().date_naive(), s)
+}
+
+/// Parses a duration string and returns a `Duration` instance, with the duration
+/// calculated from the specified date.
+///
+/// # Arguments
+///
+/// * `date` - A `Date` instance representing the base date for the calculation
+/// * `s` - A string slice representing the relative time.
+///
+/// # Errors
+///
+/// This function will return `Err(ParseDurationError::InvalidInput)` if the input string
+/// cannot be parsed as a relative time.
+///
+/// # Examples
+///
+/// ```
+/// use chrono::{Duration, NaiveDate, Utc, Local};
+/// use humantime_to_duration::{from_str_at_date, ParseDurationError};
+/// let today = Local::now().date().naive_local();
+/// let yesterday = today - Duration::days(1);
+/// assert_eq!(
+///     from_str_at_date(yesterday, "2 days").unwrap(),
+///     Duration::days(1) // 1 day from the specified date + 1 day from the input string
+/// );
+/// ```
+pub fn from_str_at_date(date: NaiveDate, s: &str) -> Result<Duration, ParseDurationError> {
    let time_pattern: Regex = Regex::new(
        r"(?x)
-            (?P<value>[-+]?\d*)\s*
-            (?P<unit>years?|months?|fortnights?|weeks?|days?|hours?|h|minutes?|mins?|m|seconds?|secs?|s|yesterday|tomorrow|now|today)
-            (\s*(?P<separator>and|,)?\s*)?",
+        (?:(?P<value>[-+]?\d*)\s*)?
+        (?P<unit>years?|months?|fortnights?|weeks?|days?|hours?|h|minutes?|mins?|m|seconds?|secs?|s|yesterday|tomorrow|now|today)
+        (\s*(?P<separator>and|,)?\s*)?
+        (\s*(?P<ago>ago)?)?",
    )?;

-    let mut total_duration = Duration::ZERO;
+    let mut total_duration = Duration::seconds(0);
    let mut is_ago = s.contains(" ago");
+    let mut captures_processed = 0;
+    let mut total_length = 0;

    for capture in time_pattern.captures_iter(s) {
+        captures_processed += 1;
+
        let value_str = capture
            .name("value")
            .ok_or(ParseDurationError::InvalidInput)?
@@ -120,30 +165,43 @@ pub fn from_str(s: &str) -> Result<Duration, ParseDurationError> {
            "seconds" | "second" | "secs" | "sec" | "s" => Duration::seconds(value),
            "yesterday" => Duration::days(-1),
            "tomorrow" => Duration::days(1),
-            "now" | "today" => Duration::ZERO,
+            "now" | "today" => Duration::zero(),
            _ => return Err(ParseDurationError::InvalidInput),
        };
+        let neg_duration = -duration;
+        total_duration =
+            match total_duration.checked_add(if is_ago { &neg_duration } else { &duration }) {
+                Some(duration) => duration,
+                None => return Err(ParseDurationError::InvalidInput),
+            };

-        total_duration = match total_duration.checked_add(if is_ago { -duration } else { duration })
-        {
-            Some(duration) => duration,
-            None => return Err(ParseDurationError::InvalidInput),
-        };
+        // Calculate the total length of the matched substring
+        if let Some(m) = capture.get(0) {
+            total_length += m.end() - m.start();
+        }
    }

-    if total_duration == Duration::ZERO && !time_pattern.is_match(s) {
+    // Check if the entire input string has been captured
+    if total_length != s.len() {
+        return Err(ParseDurationError::InvalidInput);
+    }
+
+    if captures_processed == 0 {
        Err(ParseDurationError::InvalidInput)
    } else {
-        Ok(total_duration)
+        let time_now = Local::now().date_naive();
+        let date_duration = date - time_now;
+
+        Ok(total_duration + date_duration)
    }
 }

 #[cfg(test)]
 mod tests {

-    use super::from_str;
    use super::ParseDurationError;
-    use time::Duration;
+    use super::{from_str, from_str_at_date};
+    use chrono::{Duration, Local, NaiveDate};

    #[test]
    fn test_years() {
@@ -268,16 +326,10 @@ mod tests {
    fn test_invalid_input() {
        let result = from_str("foobar");
        println!("{result:?}");
-        match result {
-            Err(ParseDurationError::InvalidInput) => assert!(true),
-            _ => assert!(false),
-        }
+        assert_eq!(result, Err(ParseDurationError::InvalidInput));

        let result = from_str("invalid 1");
-        match result {
-            Err(ParseDurationError::InvalidInput) => assert!(true),
-            _ => assert!(false),
-        }
+        assert_eq!(result, Err(ParseDurationError::InvalidInput));
        // Fails for now with a panic
        /*        let result = from_str("777777777777777771m");
        match result {
@@ -285,4 +337,30 @@ mod tests {
            _ => assert!(false),
        }*/
    }
+
+    #[test]
+    fn test_from_str_at_date() {
+        let date = NaiveDate::from_ymd_opt(2014, 9, 5).unwrap();
+        let now = Local::now().date_naive();
+        let days_diff = (date - now).num_days();
+
+        assert_eq!(
+            from_str_at_date(date, "1 day").unwrap(),
+            Duration::days(days_diff + 1)
+        );
+
+        assert_eq!(
+            from_str_at_date(date, "2 hours").unwrap(),
+            Duration::days(days_diff) + Duration::hours(2)
+        );
+    }
+
+    #[test]
+    fn test_invalid_input_at_date() {
+        let date = NaiveDate::from_ymd_opt(2014, 9, 5).unwrap();
+        assert!(matches!(
+            from_str_at_date(date, "invalid"),
+            Err(ParseDurationError::InvalidInput)
+        ));
+    }
 }
@@ -1,20 +1,14 @@
-use humantime_to_duration::{from_str, ParseDurationError};
-use time::Duration;
+use chrono::{Duration, Utc};
+use humantime_to_duration::{from_str, from_str_at_date, ParseDurationError};

 #[test]
 fn test_invalid_input() {
    let result = from_str("foobar");
    println!("{result:?}");
-    match result {
-        Err(ParseDurationError::InvalidInput) => assert!(true),
-        _ => assert!(false),
-    }
+    assert_eq!(result, Err(ParseDurationError::InvalidInput));

    let result = from_str("invalid 1");
-    match result {
-        Err(ParseDurationError::InvalidInput) => assert!(true),
-        _ => assert!(false),
-    }
+    assert_eq!(result, Err(ParseDurationError::InvalidInput));
 }

 #[test]
@@ -82,20 +76,27 @@ fn test_duration_parsing() {
    assert_eq!(from_str("day").unwrap(), Duration::seconds(86_400));

    assert_eq!(from_str("1 hour").unwrap(), Duration::seconds(3_600));
+    assert_eq!(from_str("1 h").unwrap(), Duration::seconds(3_600));
    assert_eq!(from_str("1 hour ago").unwrap(), Duration::seconds(-3_600));
    assert_eq!(from_str("-2 hours").unwrap(), Duration::seconds(-7_200));
    assert_eq!(from_str("hour").unwrap(), Duration::seconds(3_600));

    assert_eq!(from_str("1 minute").unwrap(), Duration::seconds(60));
+    assert_eq!(from_str("1 min").unwrap(), Duration::seconds(60));
    assert_eq!(from_str("2 minutes").unwrap(), Duration::seconds(120));
+    assert_eq!(from_str("2 mins").unwrap(), Duration::seconds(120));
+    assert_eq!(from_str("2m").unwrap(), Duration::seconds(120));
    assert_eq!(from_str("min").unwrap(), Duration::seconds(60));

    assert_eq!(from_str("1 second").unwrap(), Duration::seconds(1));
+    assert_eq!(from_str("1 s").unwrap(), Duration::seconds(1));
    assert_eq!(from_str("2 seconds").unwrap(), Duration::seconds(2));
+    assert_eq!(from_str("2 secs").unwrap(), Duration::seconds(2));
+    assert_eq!(from_str("2 sec").unwrap(), Duration::seconds(2));
    assert_eq!(from_str("sec").unwrap(), Duration::seconds(1));

-    assert_eq!(from_str("now").unwrap(), Duration::ZERO);
-    assert_eq!(from_str("today").unwrap(), Duration::ZERO);
+    assert_eq!(from_str("now").unwrap(), Duration::seconds(0));
+    assert_eq!(from_str("today").unwrap(), Duration::seconds(0));

    assert_eq!(
        from_str("1 year 2 months 4 weeks 3 days and 2 seconds").unwrap(),
@@ -106,3 +107,42 @@ fn test_duration_parsing() {
        Duration::seconds(-39_398_402)
    );
 }
+
+#[test]
+#[should_panic]
+fn test_display_parse_duration_error_through_from_str() {
+    let invalid_input = "9223372036854775807 seconds and 1 second";
+    let _ = from_str(invalid_input).unwrap();
+}
+
+#[test]
+fn test_display_should_fail() {
+    let invalid_input = "Thu Jan 01 12:34:00 2015";
+    let error = from_str(invalid_input).unwrap_err();
+
+    assert_eq!(
+        format!("{error}"),
+        "Invalid input string: cannot be parsed as a relative time"
+    );
+}
+
+#[test]
+fn test_from_str_at_date_day() {
+    let today = Utc::now().date_naive();
+    let yesterday = today - Duration::days(1);
+    assert_eq!(
+        from_str_at_date(yesterday, "2 days").unwrap(),
+        Duration::days(1)
+    );
+}
+
+#[test]
+fn test_invalid_input_at_date() {
+    let today = Utc::now().date_naive();
+    let result = from_str_at_date(today, "foobar");
+    println!("{result:?}");
+    assert_eq!(result, Err(ParseDurationError::InvalidInput));
+
+    let result = from_str_at_date(today, "invalid 1r");
+    assert_eq!(result, Err(ParseDurationError::InvalidInput));
+}
Author	SHA1	Message	Date
Sylvestre Ledru	e5d7fbcece	We moved from time to chrono	2023-06-03 16:39:58 +02:00
Sylvestre Ledru	060998e90e	refresh the fuzz lock	2023-06-03 16:38:42 +02:00
Sylvestre Ledru	a272f55948	update of the doc	2023-06-03 16:38:21 +02:00
Sylvestre Ledru	9c5da7959c	new release	2023-06-03 16:34:51 +02:00
Sylvestre Ledru	a60f1d89f5	Merge pull request #11 from sylvestre/chrono Port the crate to use chrono instead of time	2023-06-03 16:33:51 +02:00
Sylvestre Ledru	1d78cc5a3f	Simplify the check	2023-06-03 16:31:37 +02:00
Sylvestre Ledru	6ba55a075b	Fix the various warnings	2023-06-03 14:38:30 +02:00
Sylvestre Ledru	b439960eb1	Port the crate to use chrono instead of time	2023-06-03 13:14:00 +02:00
Sylvestre Ledru	f1a15ab2b3	Merge pull request #8 from uutils/renovate/regex-1.x Update Rust crate regex to v1.8.3	2023-05-29 16:09:02 +02:00
Sylvestre Ledru	0bd4dd716a	Merge pull request #7 from uutils/renovate/rand-0.x Update Rust crate rand to 0.8.5	2023-05-29 15:58:18 +02:00
renovate[bot]	674909c0f9	Update Rust crate regex to v1.8.3	2023-05-29 13:33:54 +00:00
renovate[bot]	57bcf7f433	Update Rust crate rand to 0.8.5	2023-05-29 13:33:48 +00:00
Sylvestre Ledru	2e80358014	Merge pull request #6 from uutils/renovate/configure Configure Renovate	2023-05-29 15:31:52 +02:00
renovate[bot]	15fb185d95	Add renovate.json	2023-05-29 00:16:49 +00:00
Sylvestre Ledru	e64c163f47	adjust the license for Debian	2023-05-27 09:43:52 +02:00
Sylvestre Ledru	86378bc326	version 0.2.1	2023-05-12 13:58:33 +02:00
Sylvestre Ledru	6a52551dea	Merge pull request #5 from cakebaker/simplify_test Simplify tests	2023-05-12 13:54:39 +02:00
Sylvestre Ledru	21e7e01fc8	Merge pull request #4 from sylvestre/reverse Reverse the two functions	2023-05-12 13:54:31 +02:00
Daniel Hofstetter	1359dc9349	Simplify tests	2023-05-12 09:59:31 +02:00
Sylvestre Ledru	daec32d5c4	describe the error	2023-05-11 22:15:29 +02:00
Sylvestre Ledru	7a3d0bafca	Reverse the two functions	2023-05-11 22:15:07 +02:00
Sylvestre Ledru	537df73bdd	Fix a doc warning	2023-05-11 21:57:28 +02:00
Daniel Hofstetter	3e4c6e3b6c	Add .gitignore (#3 )	2023-05-11 17:29:08 +02:00
Sylvestre Ledru	29e64c3cda	version 0.2.0	2023-05-11 17:20:24 +02:00
Sylvestre Ledru	db00d0686f	add a new from_str_at_date(date, string) function (#2 ) Co-authored-by: Daniel Hofstetter <daniel.hofstetter@42dh.com>	2023-05-11 17:16:02 +02:00
Sylvestre Ledru	1f0eae3536	add the README	2023-04-25 09:00:51 +02:00
Sylvestre Ledru	6d6b0c39e3	update of the version to 0.1.2	2023-04-24 21:16:26 +02:00
Sylvestre Ledru	7decfeeb7f	lower the regex dep. we don't need 1.8	2023-04-24 21:15:44 +02:00
Sylvestre Ledru	9ac69eef7d	update of the version	2023-04-24 00:16:53 +02:00
Sylvestre Ledru	4bd207f6fc	update of the version	2023-04-24 00:14:30 +02:00
Sylvestre Ledru	3b05dabf54	update of the version	2023-04-24 00:11:58 +02:00
Sylvestre Ledru	a68f15e034	from_str('Thu Jan 01 12:34:00 2015') should fail	2023-04-24 00:07:34 +02:00
Sylvestre Ledru	492c6f76f4	fix the link to cov	2023-04-23 22:56:52 +02:00
Sylvestre Ledru	306e1e21a9	add a test to check InvalidInput	2023-04-23 22:51:47 +02:00
Sylvestre Ledru	87372718f1	Fix readme syntax	2023-04-23 22:12:41 +02:00
Sylvestre Ledru	112b7bf86d	improve the coverage	2023-04-23 22:10:56 +02:00
Sylvestre Ledru	8a7f4ec8cc	add more badges	2023-04-23 22:08:43 +02:00
Sylvestre Ledru	b3dbb3cb50	extend the CI	2023-04-23 21:22:45 +02:00
Sylvestre Ledru	50212c6d04	rename the action	2023-04-23 21:21:31 +02:00
Sylvestre Ledru	89cd5a2d54	add badges	2023-04-23 20:39:08 +02:00