Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge ParseError with Error, convert Parsed_set* #1511

Open
wants to merge 3 commits into
base: 0.5.x
Choose a base branch
from
Open

Merge ParseError with Error, convert Parsed_set* #1511

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dbb3c6b
Merge `ParseError` with `Error`, convert to alias
pitdicker Mar 7, 2024
83ea30f
Replace `ParseError` with `Error`
pitdicker Mar 12, 2024
36def24
Fully convert `Parsed::set_*` to new error type
pitdicker Feb 25, 2024
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
Prev Previous commit
Fully convert Parsed::set_* to new error type
  • Loading branch information
@pitdicker
pitdicker committed Mar 22, 2024
commit 36def24828d054a97096566d10f62d0415995547
10 changes: 5 additions & 5 deletions src/format/parse.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use super::{Fixed, InternalFixed, InternalInternal, Item, Numeric, Pad, Parsed};
use super::{BAD_FORMAT, INVALID, OUT_OF_RANGE, TOO_LONG, TOO_SHORT};
use crate::{DateTime, Error, FixedOffset, Weekday};

fn set_weekday_with_num_days_from_sunday(p: &mut Parsed, v: i64) -> ParseResult<&mut Parsed> {
fn set_weekday_with_num_days_from_sunday(p: &mut Parsed, v: i64) -> Result<&mut Parsed, Error> {
p.set_weekday(match v {
0 => Weekday::Sun,
1 => Weekday::Mon,
Expand All @@ -23,11 +23,11 @@ fn set_weekday_with_num_days_from_sunday(p: &mut Parsed, v: i64) -> ParseResult<
4 => Weekday::Thu,
5 => Weekday::Fri,
6 => Weekday::Sat,
_ => return Err(OUT_OF_RANGE),
_ => return Err(Error::InvalidArgument),
})
}

fn set_weekday_with_number_from_monday(p: &mut Parsed, v: i64) -> ParseResult<&mut Parsed> {
fn set_weekday_with_number_from_monday(p: &mut Parsed, v: i64) -> Result<&mut Parsed, Error> {
p.set_weekday(match v {
1 => Weekday::Mon,
2 => Weekday::Tue,
Expand All @@ -36,7 +36,7 @@ fn set_weekday_with_number_from_monday(p: &mut Parsed, v: i64) -> ParseResult<&m
5 => Weekday::Fri,
6 => Weekday::Sat,
7 => Weekday::Sun,
_ => return Err(OUT_OF_RANGE),
_ => return Err(Error::InvalidArgument),
})
}

Expand Down Expand Up @@ -339,7 +339,7 @@ where

Item::Numeric(ref spec, ref _pad) => {
use super::Numeric::*;
type Setter = fn(&mut Parsed, i64) -> ParseResult<&mut Parsed>;
type Setter = fn(&mut Parsed, i64) -> Result<&mut Parsed, Error>;

let (width, signed, set): (usize, bool, Setter) = match *spec {
Year => (4, true, Parsed::set_year),
Expand Down
Loading
Loading