README.md: adjust the doc to avoid the hardcoded version

Merge pull request #119 from sylvestre/new-release
Prepare the new relase + clippy
2026-06-10 16:13:15 -07:00 · 2025-02-17 11:24:36 +01:00 · 2025-02-17 08:58:27 +01:00 · 2025-02-16 21:52:29 +01:00 · 2025-02-16 21:32:13 +01:00 · 2025-02-16 17:20:29 +01:00
17 changed files with 2235 additions and 1009 deletions
@@ -13,15 +13,9 @@ jobs:
      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
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
+      - run: cargo check

  test:
    name: cargo test
@@ -30,31 +24,18 @@ jobs:
      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
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
+      - run: cargo 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
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
      - run: rustup component add rustfmt
-      - uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --all -- --check
+      - run: cargo fmt --all -- --check

  clippy:
    name: cargo clippy -- -D warnings
@@ -63,17 +44,10 @@ jobs:
      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/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
      - run: rustup component add clippy
-      - uses: actions-rs/cargo@v1
-        with:
-          command: clippy
-          args: -- -D warnings
+      - run: cargo clippy --all-targets -- -D warnings

  coverage:
    name: Code Coverage
@@ -86,7 +60,7 @@ jobs:
          - { os: macos-latest   , features: macos }
          - { os: windows-latest , features: windows }
    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
    - name: Initialize workflow variables
      id: vars
      shell: bash
@@ -101,28 +75,22 @@ jobs:
        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
+      uses: dtolnay/rust-toolchain@nightly
      with:
-        toolchain: ${{ steps.vars.outputs.TOOLCHAIN }}
-        default: true
-        profile: minimal # minimal component installation (ie, no documentation)
+        components: llvm-tools-preview
    - name: Test
-      uses: actions-rs/cargo@v1
-      with:
-        command: test
-        args: ${{ steps.vars.outputs.CARGO_FEATURES_OPTION }} --no-fail-fast
+      run: cargo test --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"
+        RUSTFLAGS: "-Cinstrument-coverage -Zcoverage-options=branch -Ccodegen-units=1 -Copt-level=0 -Coverflow-checks=off -Zpanic_abort_tests -Cpanic=abort"
        RUSTDOCFLAGS: "-Cpanic=abort"
+        LLVM_PROFILE_FILE: "parse_datetime-%p-%m.profraw"
    - name: "`grcov` ~ install"
      id: build_grcov
      shell: bash
@@ -150,16 +118,15 @@ jobs:
        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
+        grcov . --binary-path="${COVERAGE_REPORT_DIR}" --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\()"
+        grcov . --binary-path="${COVERAGE_REPORT_DIR}" --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
+      uses: codecov/codecov-action@v5
      with:
-        # token: ${{ secrets.CODECOV_TOKEN }}
-        file: ${{ steps.coverage.outputs.report }}
+        token: ${{ secrets.CODECOV_TOKEN }}
+        files: ${{ steps.coverage.outputs.report }}
        ## flags: IntegrationTests, UnitTests, ${{ steps.vars.outputs.CODECOV_FLAGS }}
        flags: ${{ steps.vars.outputs.CODECOV_FLAGS }}
        name: codecov-umbrella
@@ -171,7 +138,7 @@ jobs:
    env:
      RUN_FOR: 60
    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
    - uses: dtolnay/rust-toolchain@nightly
    - name: Install `cargo-fuzz`
      run: cargo install cargo-fuzz
@@ -181,10 +148,4 @@ jobs:
      run: |
        ## Run it
        cd fuzz
-        cargo +nightly fuzz run fuzz_from_str -- -max_total_time=${{ env.RUN_FOR }} -detect_leaks=0
-    - name: Run fuzz_parse_datetime_from_str for XX seconds
-      shell: bash
-      run: |
-        ## Run it
-        cd fuzz
-        cargo +nightly fuzz run fuzz_parse_datetime_from_str -- -max_total_time=${{ env.RUN_FOR }} -detect_leaks=0
+        cargo +nightly fuzz run fuzz_parse_datetime -- -max_total_time=${{ env.RUN_FOR }} -detect_leaks=0
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4

 [[package]]
 name = "aho-corasick"
@@ -52,14 +52,14 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"

 [[package]]
 name = "chrono"
-version = "0.4.26"
+version = "0.4.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
+checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
 dependencies = [
 "android-tzdata",
 "iana-time-zone",
 "num-traits",
- "winapi",
+ "windows-targets",
 ]

 [[package]]
@@ -70,16 +70,16 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"

 [[package]]
 name = "iana-time-zone"
-version = "0.1.56"
+version = "0.1.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c"
+checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
 dependencies = [
 "android_system_properties",
 "core-foundation-sys",
 "iana-time-zone-haiku",
 "js-sys",
 "wasm-bindgen",
- "windows",
+ "windows-core",
 ]

 [[package]]
@@ -93,9 +93,9 @@ dependencies = [

 [[package]]
 name = "js-sys"
-version = "0.3.63"
+version = "0.3.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790"
+checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
 dependencies = [
 "wasm-bindgen",
 ]
@@ -114,9 +114,18 @@ checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de"

 [[package]]
 name = "memchr"
-version = "2.5.0"
+version = "2.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
+
+[[package]]
+name = "nom"
+version = "8.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405"
+dependencies = [
+ "memchr",
+]

 [[package]]
 name = "num-traits"
@@ -135,9 +144,10 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"

 [[package]]
 name = "parse_datetime"
-version = "0.4.0"
+version = "0.8.0"
 dependencies = [
 "chrono",
+ "nom",
 "regex",
 ]

@@ -161,9 +171,21 @@ dependencies = [

 [[package]]
 name = "regex"
-version = "1.8.1"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
 dependencies = [
 "aho-corasick",
 "memchr",
@@ -172,9 +194,9 @@ dependencies = [

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

 [[package]]
 name = "syn"
@@ -195,19 +217,20 @@ checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0"

 [[package]]
 name = "wasm-bindgen"
-version = "0.2.86"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73"
+checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
 dependencies = [
 "cfg-if",
+ "once_cell",
 "wasm-bindgen-macro",
 ]

 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.86"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb"
+checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
 dependencies = [
 "bumpalo",
 "log",
@@ -220,9 +243,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.86"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258"
+checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
 dependencies = [
 "quote",
 "wasm-bindgen-macro-support",
@@ -230,9 +253,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.86"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8"
+checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -243,50 +266,29 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.86"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93"
+checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"

 [[package]]
-name = "winapi"
-version = "0.3.9"
+name = "windows-core"
+version = "0.52.0"
 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"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
 dependencies = [
 "windows-targets",
 ]

 [[package]]
 name = "windows-targets"
-version = "0.48.0"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
+checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
 dependencies = [
 "windows_aarch64_gnullvm",
 "windows_aarch64_msvc",
 "windows_i686_gnu",
+ "windows_i686_gnullvm",
 "windows_i686_msvc",
 "windows_x86_64_gnu",
 "windows_x86_64_gnullvm",
@@ -295,42 +297,48 @@ dependencies = [

 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.48.0"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
+checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"

 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.48.0"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
+checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"

 [[package]]
 name = "windows_i686_gnu"
-version = "0.48.0"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
+checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"

 [[package]]
 name = "windows_i686_msvc"
-version = "0.48.0"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
+checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"

 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.48.0"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
+checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"

 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.48.0"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
+checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"

 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.48.0"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
+checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
@@ -1,12 +1,13 @@
 [package]
 name = "parse_datetime"
-description = " parsing human-readable relative time strings and converting them to a Duration"
-version = "0.4.0"
+description = "parsing human-readable time strings and converting them to a DateTime"
+version = "0.8.0"
 edition = "2021"
 license = "MIT"
 repository = "https://github.com/uutils/parse_datetime"
 readme = "README.md"

 [dependencies]
-regex = "1.8"
-chrono = { version="0.4", default-features=false, features=["std", "alloc", "clock"] }
+regex = "1.10.4"
+chrono = { version="0.4.38", default-features=false, features=["std", "alloc", "clock"] }
+nom = "8.0.0"
@@ -4,7 +4,7 @@
 [![License](http://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/uutils/parse_datetime/blob/main/LICENSE)
 [![CodeCov](https://codecov.io/gh/uutils/parse_datetime/branch/main/graph/badge.svg)](https://codecov.io/gh/uutils/parse_datetime)

-A Rust crate for parsing human-readable relative time strings and converting them to a `Duration`, or parsing human-readable datetime strings and converting them to a `DateTime`.
+A Rust crate for parsing human-readable relative time strings and human-readable datetime strings and converting them to a `DateTime`.

 ## Features

@@ -18,39 +18,38 @@ A Rust crate for parsing human-readable relative time strings and converting the

 Add this to your `Cargo.toml`:

-```toml
-[dependencies]
-parse_datetime = "0.4.0"
+```
+cargo add parse_datetime
 ```

-Then, import the crate and use the `from_str` and `from_str_at_date` functions:
+Then, import the crate and use the `parse_datetime_at_date` function:
+
 ```rs
-use parse_datetime::{from_str, from_str_at_date};
-use chrono::Duration;
+use chrono::{Duration, Local};
+use parse_datetime::parse_datetime_at_date;

-let duration = from_str("+3 days");
-assert_eq!(duration.unwrap(), Duration::days(3));
+let now = Local::now();
+let after = parse_datetime_at_date(now, "+3 days");

-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)
+  (now + Duration::days(3)).naive_utc(),
+  after.unwrap().naive_utc()
 );
 ```

-For DateTime parsing, import the `parse_datetime` module:
+For DateTime parsing, import the `parse_datetime` function:
+
 ```rs
-use parse_datetime::parse_datetime::from_str;
+use parse_datetime::parse_datetime;
 use chrono::{Local, TimeZone};

-let dt = from_str("2021-02-14 06:37:47");
+let dt = parse_datetime("2021-02-14 06:37:47");
 assert_eq!(dt.unwrap(), Local.with_ymd_and_hms(2021, 2, 14, 6, 37, 47).unwrap());
 ```

 ### Supported Formats

-The `from_str` and `from_str_at_date` functions support the following formats for relative time:
+The `parse_datetime` and `parse_datetime_at_date` functions support absolute datetime and the following relative times:

 - `num` `unit` (e.g., "-1 hour", "+3 days")
 - `unit` (e.g., "hour", "day")
@@ -58,35 +57,30 @@ The `from_str` and `from_str_at_date` functions support the following formats fo
 - "yesterday"
 - "tomorrow"
 - use "ago" for the past
+- use "next" or "last" with `unit` (e.g., "next week", "last year")
 - combined units with "and" or "," (e.g., "2 years and 1 month", "1 day, 2 hours" or "2 weeks 1 second")
+- unix timestamps (for example "@0" "@1344000")

 `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.

 ## Return Values

-### Duration
+### parse_datetime and parse_datetime_at_date

-The `from_str` and `from_str_at_date` functions return:
+The `parse_datetime` and `parse_datetime_at_date` function 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
-
-This function will return `Err(ParseDurationError::InvalidInput)` if the input string
-cannot be parsed as a relative time.
-
-### parse_datetime
-
-The `from_str` function returns:
-
- `Ok(DateTime<FixedOffset>)` - If the input string can be prsed as a datetime
- `Err(ParseDurationError::InvalidInput)` - If the input string cannot be parsed
+- `Ok(DateTime<FixedOffset>)` - If the input string can be parsed as a datetime
+- `Err(ParseDateTimeError::InvalidInput)` - If the input string cannot be parsed

 ## Fuzzer

 To run the fuzzer:
+
 ```
-$ cargo fuzz run fuzz_from_str
+$ cd fuzz
+$ cargo install cargo-fuzz
+$ cargo +nightly fuzz run fuzz_parse_datetime
 ```

 ## License
@@ -0,0 +1 @@
+corpus
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4

 [[package]]
 name = "aho-corasick"
@@ -46,11 +46,13 @@ checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"

 [[package]]
 name = "cc"
-version = "1.0.79"
+version = "1.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
+checksum = "13208fcbb66eaeffe09b99fffbe1af420f00a7b35aa99ad683dfc1aa76145229"
 dependencies = [
 "jobserver",
+ "libc",
+ "shlex",
 ]

 [[package]]
@@ -61,17 +63,14 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"

 [[package]]
 name = "chrono"
-version = "0.4.26"
+version = "0.4.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
+checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
 dependencies = [
 "android-tzdata",
 "iana-time-zone",
- "js-sys",
 "num-traits",
- "time",
- "wasm-bindgen",
- "winapi",
+ "windows-targets",
 ]

 [[package]]
@@ -81,39 +80,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"

 [[package]]
-name = "fuzz_from_str"
-version = "0.1.0"
+name = "fuzz_parse_datetime"
+version = "0.2.0"
 dependencies = [
 "chrono",
 "libfuzzer-sys",
 "parse_datetime",
- "rand",
 "regex",
 ]

-[[package]]
-name = "getrandom"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
-]
-
 [[package]]
 name = "iana-time-zone"
-version = "0.1.56"
+version = "0.1.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c"
+checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
 dependencies = [
 "android_system_properties",
 "core-foundation-sys",
 "iana-time-zone-haiku",
 "js-sys",
 "wasm-bindgen",
- "windows",
+ "windows-core",
 ]

 [[package]]
@@ -127,18 +114,18 @@ dependencies = [

 [[package]]
 name = "jobserver"
-version = "0.1.26"
+version = "0.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2"
+checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
 dependencies = [
 "libc",
 ]

 [[package]]
 name = "js-sys"
-version = "0.3.63"
+version = "0.3.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790"
+checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
 dependencies = [
 "wasm-bindgen",
 ]
@@ -151,13 +138,12 @@ checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317"

 [[package]]
 name = "libfuzzer-sys"
-version = "0.4.6"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "beb09950ae85a0a94b27676cccf37da5ff13f27076aa1adbc6545dd0d0e1bd4e"
+checksum = "cf78f52d400cf2d84a3a973a78a592b4adc535739e0a5597a0da6f0c357adc75"
 dependencies = [
 "arbitrary",
 "cc",
- "once_cell",
 ]

 [[package]]
@@ -168,9 +154,18 @@ checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de"

 [[package]]
 name = "memchr"
-version = "2.5.0"
+version = "2.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+checksum = "5486aed0026218e61b8a01d5fbd5a0a134649abb71a0e53b7bc088529dced86e"
+
+[[package]]
+name = "nom"
+version = "8.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405"
+dependencies = [
+ "memchr",
+]

 [[package]]
 name = "num-traits"
@@ -189,18 +184,13 @@ checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"

 [[package]]
 name = "parse_datetime"
-version = "0.4.0"
+version = "0.7.0"
 dependencies = [
 "chrono",
+ "nom",
 "regex",
 ]

-[[package]]
-name = "ppv-lite86"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
-
 [[package]]
 name = "proc-macro2"
 version = "1.0.59"
@@ -219,41 +209,23 @@ dependencies = [
 "proc-macro2",
 ]

-[[package]]
-name = "rand"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-dependencies = [
- "libc",
- "rand_chacha",
- "rand_core",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-dependencies = [
- "ppv-lite86",
- "rand_core",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-dependencies = [
- "getrandom",
-]
-
 [[package]]
 name = "regex"
-version = "1.8.4"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
 dependencies = [
 "aho-corasick",
 "memchr",
@@ -262,9 +234,15 @@ dependencies = [

 [[package]]
 name = "regex-syntax"
-version = "0.7.2"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"

 [[package]]
 name = "syn"
@@ -277,50 +255,28 @@ dependencies = [
 "unicode-ident",
 ]

-[[package]]
-name = "time"
-version = "0.1.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-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"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73"
+checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
 dependencies = [
 "cfg-if",
+ "once_cell",
 "wasm-bindgen-macro",
 ]

 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.86"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb"
+checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
 dependencies = [
 "bumpalo",
 "log",
@@ -333,9 +289,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.86"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258"
+checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
 dependencies = [
 "quote",
 "wasm-bindgen-macro-support",
@@ -343,9 +299,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.86"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8"
+checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -356,50 +312,29 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.86"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93"
+checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"

 [[package]]
-name = "winapi"
-version = "0.3.9"
+name = "windows-core"
+version = "0.52.0"
 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"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
 dependencies = [
 "windows-targets",
 ]

 [[package]]
 name = "windows-targets"
-version = "0.48.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 dependencies = [
 "windows_aarch64_gnullvm",
 "windows_aarch64_msvc",
 "windows_i686_gnu",
+ "windows_i686_gnullvm",
 "windows_i686_msvc",
 "windows_x86_64_gnu",
 "windows_x86_64_gnullvm",
@@ -408,42 +343,48 @@ dependencies = [

 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.48.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"

 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.48.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"

 [[package]]
 name = "windows_i686_gnu"
-version = "0.48.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"

 [[package]]
 name = "windows_i686_msvc"
-version = "0.48.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"

 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.48.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"

 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.48.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"

 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.48.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
@@ -1,28 +1,21 @@
 [package]
-name = "fuzz_from_str"
-version = "0.1.0"
-edition = "2018"
+name = "fuzz_parse_datetime"
+version = "0.2.0"
+edition = "2021"

 [package.metadata]
 cargo-fuzz = true

 [dependencies]
-rand = "0.8.5"
-libfuzzer-sys = "0.4"
-regex = "1.8.4"
-chrono = "0.4"
+libfuzzer-sys = "0.4.7"
+regex = "1.10.4"
+chrono = { version="0.4", default-features=false, features=["std", "alloc", "clock"] }

 [dependencies.parse_datetime]
 path = "../"

 [[bin]]
-name = "fuzz_from_str"
-path = "fuzz_targets/from_str.rs"
-test = false
-doc = false
-
-[[bin]]
-name = "fuzz_parse_datetime_from_str"
-path = "fuzz_targets/parse_datetime_from_str.rs"
+name = "fuzz_parse_datetime"
+path = "fuzz_targets/parse_datetime.rs"
 test = false
 doc = false
@@ -4,5 +4,5 @@ use libfuzzer_sys::fuzz_target;

 fuzz_target!(|data: &[u8]| {
    let s = std::str::from_utf8(data).unwrap_or("");
-    let _ = parse_datetime::from_str(s);
+    let _ = parse_datetime::parse_datetime(s);
 });
@@ -1,8 +0,0 @@
-#![no_main]
-
-use libfuzzer_sys::fuzz_target;
-
-fuzz_target!(|data: &[u8]| {
-    let s = std::str::from_utf8(data).unwrap_or("");
-    let _ = parse_datetime::parse_datetime::from_str(s);
-});
@@ -1,6 +1,6 @@
 {
  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
  "extends": [
-    "config:base"
+    "config:recommended"
  ]
 }
@@ -1,252 +0,0 @@
-// For the full copyright and license information, please view the LICENSE
-// file that was distributed with this source code.
-
-use chrono::{DateTime, FixedOffset, Local, LocalResult, NaiveDateTime, TimeZone};
-
-use crate::ParseDurationError;
-
-/// Formats that parse input can take.
-/// Taken from `touch` coreutils
-mod format {
-    pub(crate) const ISO_8601: &str = "%Y-%m-%d";
-    pub(crate) const ISO_8601_NO_SEP: &str = "%Y%m%d";
-    pub(crate) const POSIX_LOCALE: &str = "%a %b %e %H:%M:%S %Y";
-    pub(crate) const YYYYMMDDHHMM_DOT_SS: &str = "%Y%m%d%H%M.%S";
-    pub(crate) const YYYYMMDDHHMMSS: &str = "%Y-%m-%d %H:%M:%S.%f";
-    pub(crate) const YYYYMMDDHHMMS: &str = "%Y-%m-%d %H:%M:%S";
-    pub(crate) const YYYY_MM_DD_HH_MM: &str = "%Y-%m-%d %H:%M";
-    pub(crate) const YYYYMMDDHHMM: &str = "%Y%m%d%H%M";
-    pub(crate) const YYYYMMDDHHMM_OFFSET: &str = "%Y%m%d%H%M %z";
-    pub(crate) const YYYYMMDDHHMM_UTC_OFFSET: &str = "%Y%m%d%H%MUTC%z";
-    pub(crate) const YYYYMMDDHHMM_ZULU_OFFSET: &str = "%Y%m%d%H%MZ%z";
-    pub(crate) const YYYYMMDDHHMM_HYPHENATED_OFFSET: &str = "%Y-%m-%d %H:%M %z";
-    pub(crate) const YYYYMMDDHHMMS_T_SEP: &str = "%Y-%m-%dT%H:%M:%S";
-    pub(crate) const UTC_OFFSET: &str = "UTC%#z";
-    pub(crate) const ZULU_OFFSET: &str = "Z%#z";
-}
-
-/// Loosely parses a time string and returns a `DateTime` representing the
-/// absolute time of the string.
-///
-/// # Arguments
-///
-/// * `s` - A string slice representing the time.
-///
-/// # Examples
-///
-/// ```
-/// use chrono::{DateTime, Utc, TimeZone};
-/// let time = parse_datetime::parse_datetime::from_str("2023-06-03 12:00:01Z");
-/// assert_eq!(time.unwrap(), Utc.with_ymd_and_hms(2023, 06, 03, 12, 00, 01).unwrap());
-/// ```
-///
-/// # Supported formats
-///
-/// The function supports the following formats for time:
-///
-/// * ISO formats
-/// * timezone offsets, e.g., "UTC-0100"
-///
-/// # Returns
-///
-/// * `Ok(DateTime<FixedOffset>)` - If the input string can be parsed as a time
-/// * `Err(ParseDurationError)` - If the input string cannot be parsed as a relative time
-///
-/// # Errors
-///
-/// This function will return `Err(ParseDurationError::InvalidInput)` if the input string
-/// cannot be parsed as a relative time.
-///
-pub fn from_str<S: AsRef<str> + Clone>(s: S) -> Result<DateTime<FixedOffset>, ParseDurationError> {
-    // TODO: Replace with a proper customiseable parsing solution using `nom`, `grmtools`, or
-    // similar
-
-    // Formats with offsets don't require NaiveDateTime workaround
-    for fmt in [
-        format::YYYYMMDDHHMM_OFFSET,
-        format::YYYYMMDDHHMM_HYPHENATED_OFFSET,
-        format::YYYYMMDDHHMM_UTC_OFFSET,
-        format::YYYYMMDDHHMM_ZULU_OFFSET,
-    ] {
-        if let Ok(parsed) = DateTime::parse_from_str(s.as_ref(), fmt) {
-            return Ok(parsed);
-        }
-    }
-
-    // Parse formats with no offset, assume local time
-    for fmt in [
-        format::YYYYMMDDHHMMS_T_SEP,
-        format::YYYYMMDDHHMM,
-        format::YYYYMMDDHHMMS,
-        format::YYYYMMDDHHMMSS,
-        format::YYYY_MM_DD_HH_MM,
-        format::YYYYMMDDHHMM_DOT_SS,
-        format::POSIX_LOCALE,
-    ] {
-        if let Ok(parsed) = NaiveDateTime::parse_from_str(s.as_ref(), fmt) {
-            if let Ok(dt) = naive_dt_to_fixed_offset(parsed) {
-                return Ok(dt);
-            }
-        }
-    }
-
-    // Parse epoch seconds
-    if s.as_ref().bytes().next() == Some(b'@') {
-        if let Ok(parsed) = NaiveDateTime::parse_from_str(&s.as_ref()[1..], "%s") {
-            if let Ok(dt) = naive_dt_to_fixed_offset(parsed) {
-                return Ok(dt);
-            }
-        }
-    }
-
-    let ts = s.as_ref().to_owned() + "0000";
-    // Parse date only formats - assume midnight local timezone
-    for fmt in [format::ISO_8601, format::ISO_8601_NO_SEP] {
-        let f = fmt.to_owned() + "%H%M";
-        if let Ok(parsed) = NaiveDateTime::parse_from_str(&ts, &f) {
-            if let Ok(dt) = naive_dt_to_fixed_offset(parsed) {
-                return Ok(dt);
-            }
-        }
-    }
-
-    // Parse offsets. chrono doesn't provide any functionality to parse
-    // offsets, so instead we replicate parse_date behaviour by getting
-    // the current date with local, and create a date time string at midnight,
-    // before trying offset suffixes
-    let local = Local::now();
-    let ts = format!("{}", local.format("%Y%m%d")) + "0000" + s.as_ref();
-    for fmt in [format::UTC_OFFSET, format::ZULU_OFFSET] {
-        let f = format::YYYYMMDDHHMM.to_owned() + fmt;
-        if let Ok(parsed) = DateTime::parse_from_str(&ts, &f) {
-            return Ok(parsed);
-        }
-    }
-
-    // Default parse and failure
-    s.as_ref()
-        .parse()
-        .map_err(|_| (ParseDurationError::InvalidInput))
-}
-
-// Convert NaiveDateTime to DateTime<FixedOffset> by assuming the offset
-// is local time
-fn naive_dt_to_fixed_offset(dt: NaiveDateTime) -> Result<DateTime<FixedOffset>, ()> {
-    let now = Local::now();
-    match now.offset().from_local_datetime(&dt) {
-        LocalResult::Single(dt) => Ok(dt),
-        _ => Err(()),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    static TEST_TIME: i64 = 1613371067;
-
-    #[cfg(test)]
-    mod iso_8601 {
-        use std::env;
-
-        use crate::{
-            parse_datetime::from_str, parse_datetime::tests::TEST_TIME, ParseDurationError,
-        };
-
-        #[test]
-        fn test_t_sep() {
-            env::set_var("TZ", "UTC");
-            let dt = "2021-02-15T06:37:47";
-            let actual = from_str(dt);
-            assert_eq!(actual.unwrap().timestamp(), TEST_TIME);
-        }
-
-        #[test]
-        fn test_space_sep() {
-            env::set_var("TZ", "UTC");
-            let dt = "2021-02-15 06:37:47";
-            let actual = from_str(dt);
-            assert_eq!(actual.unwrap().timestamp(), TEST_TIME);
-        }
-
-        #[test]
-        fn test_space_sep_offset() {
-            env::set_var("TZ", "UTC");
-            let dt = "2021-02-14 22:37:47 -0800";
-            let actual = from_str(dt);
-            assert_eq!(actual.unwrap().timestamp(), TEST_TIME);
-        }
-
-        #[test]
-        fn test_t_sep_offset() {
-            env::set_var("TZ", "UTC");
-            let dt = "2021-02-14T22:37:47 -0800";
-            let actual = from_str(dt);
-            assert_eq!(actual.unwrap().timestamp(), TEST_TIME);
-        }
-
-        #[test]
-        fn invalid_formats() {
-            let invalid_dts = vec!["NotADate", "202104", "202104-12T22:37:47"];
-            for dt in invalid_dts {
-                assert_eq!(from_str(dt), Err(ParseDurationError::InvalidInput));
-            }
-        }
-    }
-
-    #[cfg(test)]
-    mod offsets {
-        use chrono::Local;
-
-        use crate::{parse_datetime::from_str, ParseDurationError};
-
-        #[test]
-        fn test_positive_offsets() {
-            let offsets = vec![
-                "UTC+07:00",
-                "UTC+0700",
-                "UTC+07",
-                "Z+07:00",
-                "Z+0700",
-                "Z+07",
-            ];
-
-            let expected = format!("{}{}", Local::now().format("%Y%m%d"), "0000+0700");
-            for offset in offsets {
-                let actual = from_str(offset).unwrap();
-                assert_eq!(expected, format!("{}", actual.format("%Y%m%d%H%M%z")));
-            }
-        }
-
-        #[test]
-        fn test_partial_offset() {
-            let offsets = vec!["UTC+00:15", "UTC+0015", "Z+00:15", "Z+0015"];
-            let expected = format!("{}{}", Local::now().format("%Y%m%d"), "0000+0015");
-            for offset in offsets {
-                let actual = from_str(offset).unwrap();
-                assert_eq!(expected, format!("{}", actual.format("%Y%m%d%H%M%z")));
-            }
-        }
-
-        #[test]
-        fn invalid_offset_format() {
-            let invalid_offsets = vec!["+0700", "UTC+2", "Z-1", "UTC+01005"];
-            for offset in invalid_offsets {
-                assert_eq!(from_str(offset), Err(ParseDurationError::InvalidInput));
-            }
-        }
-    }
-
-    /// Used to test example code presented in the README.
-    mod readme_test {
-        use crate::parse_datetime::from_str;
-        use chrono::{Local, TimeZone};
-
-        #[test]
-        fn test_readme_code() {
-            let dt = from_str("2021-02-14 06:37:47");
-            assert_eq!(
-                dt.unwrap(),
-                Local.with_ymd_and_hms(2021, 2, 14, 6, 37, 47).unwrap()
-            );
-        }
-    }
-}
@@ -0,0 +1,210 @@
+use chrono::{DateTime, FixedOffset, Local, NaiveTime, TimeZone};
+use regex::Regex;
+
+mod time_only_formats {
+    pub const HH_MM: &str = "%R";
+    pub const HH_MM_SS: &str = "%T";
+    pub const TWELVEHOUR: &str = "%r";
+}
+
+/// Convert a military time zone string to a time zone offset.
+///
+/// Military time zones are the letters A through Z except J. They are
+/// described in RFC 5322.
+fn to_offset(tz: &str) -> Option<FixedOffset> {
+    let hour = match tz {
+        "A" => 1,
+        "B" => 2,
+        "C" => 3,
+        "D" => 4,
+        "E" => 5,
+        "F" => 6,
+        "G" => 7,
+        "H" => 8,
+        "I" => 9,
+        "K" => 10,
+        "L" => 11,
+        "M" => 12,
+        "N" => -1,
+        "O" => -2,
+        "P" => -3,
+        "Q" => -4,
+        "R" => -5,
+        "S" => -6,
+        "T" => -7,
+        "U" => -8,
+        "V" => -9,
+        "W" => -10,
+        "X" => -11,
+        "Y" => -12,
+        "Z" => 0,
+        _ => return None,
+    };
+    let offset_in_sec = hour * 3600;
+    FixedOffset::east_opt(offset_in_sec)
+}
+
+/// Parse a time string without an offset and apply an offset to it.
+///
+/// Multiple formats are attempted when parsing the string.
+fn parse_time_with_offset_multi(
+    date: DateTime<Local>,
+    offset: FixedOffset,
+    s: &str,
+) -> Option<DateTime<FixedOffset>> {
+    for fmt in [
+        time_only_formats::HH_MM,
+        time_only_formats::HH_MM_SS,
+        time_only_formats::TWELVEHOUR,
+    ] {
+        let parsed = match NaiveTime::parse_from_str(s, fmt) {
+            Ok(t) => t,
+            Err(_) => continue,
+        };
+        let parsed_dt = date.date_naive().and_time(parsed);
+        match offset.from_local_datetime(&parsed_dt).single() {
+            Some(dt) => return Some(dt),
+            None => continue,
+        }
+    }
+    None
+}
+
+pub(crate) fn parse_time_only(date: DateTime<Local>, s: &str) -> Option<DateTime<FixedOffset>> {
+    let re =
+        Regex::new(r"^(?<time>.*?)(?:(?<sign>\+|-)(?<h>[0-9]{1,2}):?(?<m>[0-9]{0,2}))?$").unwrap();
+    let captures = re.captures(s)?;
+
+    // Parse the sign, hour, and minute to get a `FixedOffset`, if possible.
+    let parsed_offset = match captures.name("h") {
+        Some(hours) if !(hours.as_str().is_empty()) => {
+            let mut offset_in_sec = hours.as_str().parse::<i32>().unwrap() * 3600;
+            match captures.name("m") {
+                Some(minutes) if !(minutes.as_str().is_empty()) => {
+                    offset_in_sec += minutes.as_str().parse::<i32>().unwrap() * 60;
+                }
+                _ => (),
+            };
+            offset_in_sec *= if &captures["sign"] == "-" { -1 } else { 1 };
+            FixedOffset::east_opt(offset_in_sec)
+        }
+        _ => None,
+    };
+
+    // Parse the time and apply the parsed offset.
+    let s = captures["time"].trim();
+    let offset = match parsed_offset {
+        Some(offset) => offset,
+        None => *date.offset(),
+    };
+    if let Some(result) = parse_time_with_offset_multi(date, offset, s) {
+        return Some(result);
+    }
+
+    // Military time zones are specified in RFC 5322, Section 4.3
+    // "Obsolete Date and Time".
+    // <https://datatracker.ietf.org/doc/html/rfc5322>
+    //
+    // We let the parsing above handle "5:00 AM" so at this point we
+    // should be guaranteed that we don't have an AM/PM suffix. That
+    // way, we can safely parse "5:00M" here without interference.
+    let re = Regex::new(r"(?<time>.*?)(?<tz>[A-IKLMN-YZ])").unwrap();
+    let captures = re.captures(s)?;
+    if let Some(tz) = captures.name("tz") {
+        let s = captures["time"].trim();
+        let offset = match to_offset(tz.as_str()) {
+            Some(offset) => offset,
+            None => *date.offset(),
+        };
+        if let Some(result) = parse_time_with_offset_multi(date, offset, s) {
+            return Some(result);
+        }
+    }
+
+    None
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::parse_time_only_str::parse_time_only;
+    use chrono::{DateTime, Local, TimeZone};
+    use std::env;
+
+    fn get_test_date() -> DateTime<Local> {
+        Local.with_ymd_and_hms(2024, 3, 3, 0, 0, 0).unwrap()
+    }
+
+    #[test]
+    fn test_time_only() {
+        env::set_var("TZ", "UTC");
+        let parsed_time = parse_time_only(get_test_date(), "21:04")
+            .unwrap()
+            .timestamp();
+        assert_eq!(parsed_time, 1709499840);
+    }
+
+    #[test]
+    fn test_military_time_zones() {
+        env::set_var("TZ", "UTC");
+        let date = get_test_date();
+        let actual = parse_time_only(date, "05:00C").unwrap().timestamp();
+        // Computed via `date -u -d "2024-03-03 05:00:00C" +%s`, using a
+        // version of GNU date after v8.32 (earlier versions had a bug).
+        let expected = 1709431200;
+        assert_eq!(actual, expected);
+    }
+
+    #[test]
+    fn test_time_with_offset() {
+        env::set_var("TZ", "UTC");
+        let parsed_time = parse_time_only(get_test_date(), "21:04 +0530")
+            .unwrap()
+            .timestamp();
+        assert_eq!(parsed_time, 1709480040);
+    }
+
+    #[test]
+    fn test_time_with_hour_only_offset() {
+        env::set_var("TZ", "UTC");
+        let parsed_time = parse_time_only(get_test_date(), "22:04 +01")
+            .unwrap()
+            .timestamp();
+        assert_eq!(parsed_time, 1709499840);
+    }
+
+    #[test]
+    fn test_time_with_hour_only_neg_offset() {
+        env::set_var("TZ", "UTC");
+        let parsed_time = parse_time_only(get_test_date(), "17:04 -04")
+            .unwrap()
+            .timestamp();
+        assert_eq!(parsed_time, 1709499840);
+    }
+
+    #[test]
+    fn test_time_with_seconds() {
+        env::set_var("TZ", "UTC");
+        let parsed_time = parse_time_only(get_test_date(), "21:04:30")
+            .unwrap()
+            .timestamp();
+        assert_eq!(parsed_time, 1709499870);
+    }
+
+    #[test]
+    fn test_time_with_seconds_with_offset() {
+        env::set_var("TZ", "UTC");
+        let parsed_time = parse_time_only(get_test_date(), "21:04:30 +0530")
+            .unwrap()
+            .timestamp();
+        assert_eq!(parsed_time, 1709480070);
+    }
+
+    #[test]
+    fn test_twelve_hour_time() {
+        env::set_var("TZ", "UTC");
+        let parsed_time = parse_time_only(get_test_date(), "9:04:00 PM")
+            .unwrap()
+            .timestamp();
+        assert_eq!(parsed_time, 1709499840);
+    }
+}
@@ -0,0 +1,111 @@
+// For the full copyright and license information, please view the LICENSE
+// file that was distributed with this source code.
+use core::fmt;
+use std::error::Error;
+use std::fmt::Display;
+use std::num::ParseIntError;
+
+use nom::branch::alt;
+use nom::character::complete::{char, digit1};
+use nom::combinator::all_consuming;
+use nom::multi::fold_many0;
+use nom::sequence::preceded;
+use nom::{self, IResult, Parser};
+
+#[derive(Debug, PartialEq)]
+pub enum ParseTimestampError {
+    InvalidNumber(ParseIntError),
+    InvalidInput,
+}
+
+impl Display for ParseTimestampError {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Self::InvalidInput => {
+                write!(f, "Invalid input string: cannot be parsed as a timestamp")
+            }
+            Self::InvalidNumber(err) => {
+                write!(f, "Invalid timestamp number: {err}")
+            }
+        }
+    }
+}
+
+impl Error for ParseTimestampError {}
+
+// TODO is this necessary
+impl From<ParseIntError> for ParseTimestampError {
+    fn from(err: ParseIntError) -> Self {
+        Self::InvalidNumber(err)
+    }
+}
+
+type NomError<'a> = nom::Err<nom::error::Error<&'a str>>;
+
+impl<'a> From<NomError<'a>> for ParseTimestampError {
+    fn from(_err: NomError<'a>) -> Self {
+        Self::InvalidInput
+    }
+}
+
+pub(crate) fn parse_timestamp(s: &str) -> Result<i64, ParseTimestampError> {
+    let s = s.trim().to_lowercase();
+    let s = s.as_str();
+
+    let res: IResult<&str, (char, &str)> = all_consuming(preceded(
+        char('@'),
+        (
+            // Note: to stay compatible with gnu date this code allows
+            // multiple + and - and only considers the last one
+            fold_many0(
+                // parse either + or -
+                alt((char('+'), char('-'))),
+                // start with a +
+                || '+',
+                // whatever we get (+ or -), update the accumulator to that value
+                |_, c| c,
+            ),
+            digit1,
+        ),
+    ))
+    .parse(s);
+
+    let (_, (sign, number_str)) = res?;
+
+    let mut number = number_str.parse::<i64>()?;
+
+    if sign == '-' {
+        number *= -1;
+    }
+
+    Ok(number)
+}
+
+#[cfg(test)]
+mod tests {
+
+    use crate::parse_timestamp::parse_timestamp;
+
+    #[test]
+    fn test_valid_timestamp() {
+        assert_eq!(parse_timestamp("@1234"), Ok(1234));
+        assert_eq!(parse_timestamp("@99999"), Ok(99999));
+        assert_eq!(parse_timestamp("@-4"), Ok(-4));
+        assert_eq!(parse_timestamp("@-99999"), Ok(-99999));
+        assert_eq!(parse_timestamp("@+4"), Ok(4));
+        assert_eq!(parse_timestamp("@0"), Ok(0));
+
+        // gnu date accepts numbers signs and uses the last sign
+        assert_eq!(parse_timestamp("@---+12"), Ok(12));
+        assert_eq!(parse_timestamp("@+++-12"), Ok(-12));
+        assert_eq!(parse_timestamp("@+----+12"), Ok(12));
+        assert_eq!(parse_timestamp("@++++-123"), Ok(-123));
+    }
+
+    #[test]
+    fn test_invalid_timestamp() {
+        assert!(parse_timestamp("@").is_err());
+        assert!(parse_timestamp("@+--+").is_err());
+        assert!(parse_timestamp("@+1ab2").is_err());
+    }
+}
@@ -0,0 +1,100 @@
+// For the full copyright and license information, please view the LICENSE
+// file that was distributed with this source code.
+use chrono::Weekday;
+use nom::branch::alt;
+use nom::bytes::complete::tag;
+use nom::combinator::value;
+use nom::{self, IResult, Parser};
+
+// Helper macro to simplify tag matching
+macro_rules! tag_match {
+    ($day:expr, $($pattern:expr),+) => {
+        value($day, alt(($(tag($pattern)),+)))
+    };
+}
+
+pub(crate) fn parse_weekday(s: &str) -> Option<Weekday> {
+    let s = s.trim().to_lowercase();
+    let s = s.as_str();
+
+    let parse_result: IResult<&str, Weekday> = nom::combinator::all_consuming(alt((
+        tag_match!(Weekday::Mon, "monday", "mon"),
+        tag_match!(Weekday::Tue, "tuesday", "tues", "tue"),
+        tag_match!(Weekday::Wed, "wednesday", "wednes", "wed"),
+        tag_match!(Weekday::Thu, "thursday", "thurs", "thur", "thu"),
+        tag_match!(Weekday::Fri, "friday", "fri"),
+        tag_match!(Weekday::Sat, "saturday", "sat"),
+        tag_match!(Weekday::Sun, "sunday", "sun"),
+    )))
+    .parse(s);
+
+    match parse_result {
+        Ok((_, weekday)) => Some(weekday),
+        Err(_) => None,
+    }
+}
+
+#[cfg(test)]
+mod tests {
+
+    use chrono::Weekday::*;
+
+    use crate::parse_weekday::parse_weekday;
+
+    #[test]
+    fn test_valid_weekdays() {
+        let days = [
+            ("mon", Mon),
+            ("monday", Mon),
+            ("tue", Tue),
+            ("tues", Tue),
+            ("tuesday", Tue),
+            ("wed", Wed),
+            ("wednes", Wed),
+            ("wednesday", Wed),
+            ("thu", Thu),
+            ("thursday", Thu),
+            ("fri", Fri),
+            ("friday", Fri),
+            ("sat", Sat),
+            ("saturday", Sat),
+            ("sun", Sun),
+            ("sunday", Sun),
+        ];
+
+        for (name, weekday) in days {
+            assert_eq!(parse_weekday(name), Some(weekday));
+            assert_eq!(parse_weekday(&format!(" {name}")), Some(weekday));
+            assert_eq!(parse_weekday(&format!(" {name} ")), Some(weekday));
+            assert_eq!(parse_weekday(&format!("{name} ")), Some(weekday));
+
+            let (left, right) = name.split_at(1);
+            let (test_str1, test_str2) = (
+                format!("{}{}", left.to_uppercase(), right.to_lowercase()),
+                format!("{}{}", left.to_lowercase(), right.to_uppercase()),
+            );
+
+            assert_eq!(parse_weekday(&test_str1), Some(weekday));
+            assert_eq!(parse_weekday(&test_str2), Some(weekday));
+        }
+    }
+
+    #[test]
+    fn test_invalid_weekdays() {
+        let days = [
+            "mond",
+            "tuesda",
+            "we",
+            "th",
+            "fr",
+            "sa",
+            "su",
+            "garbageday",
+            "tomorrow",
+            "yesterday",
+        ];
+        for day in days {
+            assert!(parse_weekday(day).is_none());
+        }
+    }
+}
@@ -1,148 +1 @@
-use chrono::{Duration, Utc};
-use parse_datetime::{from_str, from_str_at_date, ParseDurationError};

-#[test]
-fn test_invalid_input() {
-    let result = from_str("foobar");
-    println!("{result:?}");
-    assert_eq!(result, Err(ParseDurationError::InvalidInput));
-
-    let result = from_str("invalid 1");
-    assert_eq!(result, Err(ParseDurationError::InvalidInput));
-}
-
-#[test]
-fn test_duration_parsing() {
-    assert_eq!(from_str("1 year").unwrap(), Duration::seconds(31_536_000));
-    assert_eq!(
-        from_str("-2 years").unwrap(),
-        Duration::seconds(-63_072_000)
-    );
-    assert_eq!(
-        from_str("2 years ago").unwrap(),
-        Duration::seconds(-63_072_000)
-    );
-    assert_eq!(from_str("year").unwrap(), Duration::seconds(31_536_000));
-
-    assert_eq!(from_str("1 month").unwrap(), Duration::seconds(2_592_000));
-    assert_eq!(
-        from_str("1 month and 2 weeks").unwrap(),
-        Duration::seconds(3_801_600)
-    );
-    assert_eq!(
-        from_str("1 month, 2 weeks").unwrap(),
-        Duration::seconds(3_801_600)
-    );
-    assert_eq!(
-        from_str("1 months 2 weeks").unwrap(),
-        Duration::seconds(3_801_600)
-    );
-    assert_eq!(
-        from_str("1 month and 2 weeks ago").unwrap(),
-        Duration::seconds(-3_801_600)
-    );
-    assert_eq!(from_str("2 months").unwrap(), Duration::seconds(5_184_000));
-    assert_eq!(from_str("month").unwrap(), Duration::seconds(2_592_000));
-
-    assert_eq!(
-        from_str("1 fortnight").unwrap(),
-        Duration::seconds(1_209_600)
-    );
-    assert_eq!(
-        from_str("3 fortnights").unwrap(),
-        Duration::seconds(3_628_800)
-    );
-    assert_eq!(from_str("fortnight").unwrap(), Duration::seconds(1_209_600));
-
-    assert_eq!(from_str("1 week").unwrap(), Duration::seconds(604_800));
-    assert_eq!(
-        from_str("1 week 3 days").unwrap(),
-        Duration::seconds(864_000)
-    );
-    assert_eq!(
-        from_str("1 week 3 days ago").unwrap(),
-        Duration::seconds(-864_000)
-    );
-    assert_eq!(from_str("-2 weeks").unwrap(), Duration::seconds(-1_209_600));
-    assert_eq!(
-        from_str("2 weeks ago").unwrap(),
-        Duration::seconds(-1_209_600)
-    );
-    assert_eq!(from_str("week").unwrap(), Duration::seconds(604_800));
-
-    assert_eq!(from_str("1 day").unwrap(), Duration::seconds(86_400));
-    assert_eq!(from_str("2 days ago").unwrap(), Duration::seconds(-172_800));
-    assert_eq!(from_str("-2 days").unwrap(), Duration::seconds(-172_800));
-    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::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(),
-        Duration::seconds(39_398_402)
-    );
-    assert_eq!(
-        from_str("1 year 2 months 4 weeks 3 days and 2 seconds ago").unwrap(),
-        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));
-}