Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ concurrency:
env:
CARGO_INCREMENTAL: "0"
CARGO_TERM_COLOR: always
RUST_MIN_SRV: "1.71.1"
RUST_MIN_SRV: "1.85"

jobs:
quality:
Expand Down
24 changes: 12 additions & 12 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
[package]
name = "parse_datetime"
description = "parsing human-readable time strings and converting them to a Zoned datetime"
description = "parsing human-readable time strings and converting them to a Jiff zoned datetime"
version = "0.17.0"
edition = "2021"
license = "MIT"
repository = "https://github.com/uutils/parse_datetime"
readme = "README.md"
rust-version = "1.71.1"
rust-version = "1.85"

[dependencies]
winnow = "1.0.0"
num-traits = "0.2.19"
jiff = { version = "0.2.15", default-features = false, features = ["tz-system", "tzdb-bundle-platform", "tzdb-zoneinfo"] }
jiff = { version = "1.0.0", default-features = false, features = ["tz-system", "tzdb-bundle-platform", "tzdb-zoneinfo"] }
Comment thread
xtqqczze marked this conversation as resolved.
Resolved

[dev-dependencies]
rstest = "0.28"
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ cargo add parse_datetime
Then, import the crate and use the `parse_datetime_at_date` function:

```rs
use jiff::{ToSpan, Zoned};
use jiff::{ToSpan, ZonedDateTime};
use parse_datetime::{parse_datetime_at_date, ParsedDateTime};

let now = Zoned::now();
let now = ZonedDateTime::now();
let after = parse_datetime_at_date(now.clone(), "+3 days");

match after.unwrap() {
Expand All @@ -42,12 +42,12 @@ match after.unwrap() {
For DateTime parsing, import the `parse_datetime` function:

```rs
use jiff::{civil::{date, time} ,Zoned};
use jiff::{civil::{date, time}, ZonedDateTime};
use parse_datetime::{parse_datetime, ParsedDateTime};

let dt = parse_datetime("2021-02-14 06:37:47");
match dt.unwrap() {
ParsedDateTime::InRange(z) => assert_eq!(z, Zoned::now().with().date(date(2021, 2, 14)).time(time(6, 37, 47, 0)).build().unwrap()),
ParsedDateTime::InRange(z) => assert_eq!(z, ZonedDateTime::now().with().date(date(2021, 2, 14)).time(time(6, 37, 47, 0)).build().unwrap()),
ParsedDateTime::Extended(_) => unreachable!("unexpected for this input"),
}
```
Expand Down Expand Up @@ -91,7 +91,7 @@ The `parse_datetime` and `parse_datetime_at_date` functions support absolute dat
The `parse_datetime` and `parse_datetime_at_date` function return:

- `Ok(ParsedDateTime)` - If the input string can be parsed
- `ParsedDateTime::InRange(Zoned)` for years supported by `jiff::Zoned`
- `ParsedDateTime::InRange(ZonedDateTime)` for years supported by `jiff::ZonedDateTime`
- `ParsedDateTime::Extended(ExtendedDateTime)` for out-of-range years (for example `>9999`)
- `Err(ParseDateTimeError::InvalidInput)` - If the input string cannot be parsed

Expand Down
10 changes: 5 additions & 5 deletions benches/parse_datetime.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use codspeed_criterion_compat::{criterion_group, criterion_main, Criterion};
use jiff::Zoned;
use jiff::ZonedDateTime;
use parse_datetime::{parse_datetime, parse_datetime_at_date};

fn bench_iso_datetime(c: &mut Criterion) {
Expand Down Expand Up @@ -33,14 +33,14 @@ fn bench_epoch_timestamp(c: &mut Criterion) {
}

fn bench_relative_time(c: &mut Criterion) {
let now = Zoned::now();
let now = ZonedDateTime::now();
c.bench_function("parse_relative_time", |b| {
b.iter(|| parse_datetime_at_date(now.clone(), "+3 days"))
});
}

fn bench_relative_time_complex(c: &mut Criterion) {
let now = Zoned::now();
let now = ZonedDateTime::now();
c.bench_function("parse_relative_time_complex", |b| {
b.iter(|| parse_datetime_at_date(now.clone(), "1 year 3 months 2 days ago"))
});
Expand All @@ -60,7 +60,7 @@ fn bench_weekday(c: &mut Criterion) {
// makes the measurement vary with the day the benchmark runs.
// 2000-01-03 is a Monday, so "wednesday" resolves two days ahead.
let base = jiff::civil::DateTime::from(jiff::civil::date(2000, 1, 3))
.to_zoned(jiff::tz::TimeZone::UTC)
.to_zoned_datetime(jiff::tz::TimeZone::UTC)
.unwrap();
c.bench_function("parse_weekday", |b| {
b.iter(|| parse_datetime_at_date(base.clone(), "wednesday"))
Expand Down Expand Up @@ -117,7 +117,7 @@ fn bench_extended_year_rollover(c: &mut Criterion) {

fn bench_extended_year_relative(c: &mut Criterion) {
let base = jiff::civil::DateTime::from(jiff::civil::date(2000, 1, 1))
.to_zoned(jiff::tz::TimeZone::UTC)
.to_zoned_datetime(jiff::tz::TimeZone::UTC)
.unwrap();
c.bench_function("parse_extended_year_relative", |b| {
b.iter(|| parse_datetime_at_date(base.clone(), "10000-01-01 +1 day"))
Expand Down
37 changes: 13 additions & 24 deletions fuzz/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion fuzz/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ cargo-fuzz = true
[dependencies]
libfuzzer-sys = "0.4.7"
arbitrary = { version = "1", features = ["derive"] }
jiff = "0.2"
jiff = "1.0.0"

[dependencies.parse_datetime]
path = "../"
Expand Down
2 changes: 1 addition & 1 deletion fuzz/fuzz_targets/large_year.rs
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ fuzz_target!(|input: Input| {
// Test parse_datetime_at_date with a controlled base.
let by = base_year(input.base_year_selector);
if let Ok(base) = DateTime::new(by, 1, 1, 0, 0, 0, 0) {
if let Ok(base) = base.to_zoned(TimeZone::UTC) {
if let Ok(base) = base.to_zoned_datetime(TimeZone::UTC) {
let _ = parse_datetime::parse_datetime_at_date(base, &date_str);
}
}
Expand Down
Loading
Loading