Compare commits
3 Commits
23f50fb62b
...
fe773b0d9f
Author | SHA1 | Date |
---|---|---|
bors[bot] | fe773b0d9f | |
Chris Gillespie | bf456f466f | |
Bradlee Speice | 6a5ec31d8e |
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "dtparse"
|
||||
version = "1.0.3"
|
||||
version = "1.1.0"
|
||||
authors = ["Bradlee Speice <bradlee@speice.io>"]
|
||||
description = "A dateutil-compatible timestamp parser for Rust"
|
||||
repository = "https://github.com/bspeice/dtparse.git"
|
||||
|
|
|
@ -951,8 +951,7 @@ impl Parser {
|
|||
let m = res.month.unwrap_or_else(|| default.month() as i32) as u32;
|
||||
|
||||
let d_offset = if res.weekday.is_some() && res.day.is_none() {
|
||||
// TODO: Unwrap not justified
|
||||
let dow = day_of_week(y as u32, m, default.day()).unwrap();
|
||||
let dow = day_of_week(y as u32, m, default.day())?;
|
||||
|
||||
// UNWRAP: We've already check res.weekday() is some
|
||||
let actual_weekday = (res.weekday.unwrap() + 1) % 7;
|
||||
|
@ -963,14 +962,15 @@ impl Parser {
|
|||
};
|
||||
|
||||
// TODO: Change month/day to u32
|
||||
let d = NaiveDate::from_ymd(
|
||||
let d = NaiveDate::from_ymd_opt(
|
||||
y,
|
||||
m,
|
||||
min(
|
||||
res.day.unwrap_or(default.day() as i32) as u32,
|
||||
days_in_month(y, m as i32)?,
|
||||
),
|
||||
);
|
||||
)
|
||||
.ok_or_else(|| ParseError::ImpossibleTimestamp("Invalid date range given"))?;
|
||||
|
||||
let d = d + d_offset;
|
||||
|
||||
|
|
|
@ -44,6 +44,18 @@ fn large_int() {
|
|||
assert!(parse_result.is_err());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn another_large_int() {
|
||||
let parse_result = parse("1412409095009");
|
||||
assert!(parse_result.is_err());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn an_even_larger_int() {
|
||||
let parse_result = parse("1566997680962280");
|
||||
assert!(parse_result.is_err());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn empty_string() {
|
||||
assert_eq!(parse(""), Err(ParseError::NoDate))
|
||||
|
|
Loading…
Reference in New Issue