xeos
/
chrono
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move NanosecondXNoDot to internal enum 

To avoid adding new variants to the public enum (see https://github.com/chronotope/chrono/pull/251#issuecomment-396692148)
This commit is contained in:
Evan Schwartz 2018-06-12 14:53:49 -04:00
parent 937189ee52
commit 11cfb3696e
3 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/format/mod.rs
View File

@ -177,12 +177,6 @@ pub enum Fixed {
Nanosecond6, Nanosecond6,
/// Same to [`Nanosecond`](#variant.Nanosecond) but the accuracy is fixed to 9. /// Same to [`Nanosecond`](#variant.Nanosecond) but the accuracy is fixed to 9.
Nanosecond9, Nanosecond9,
/// Same to [`Nanosecond`](#variant.Nanosecond) but the accuracy is fixed to 3 and there is no leading dot.
Nanosecond3NoDot,
/// Same to [`Nanosecond`](#variant.Nanosecond) but the accuracy is fixed to 6 and there is no leading dot.
Nanosecond6NoDot,
/// Same to [`Nanosecond`](#variant.Nanosecond) but the accuracy is fixed to 9 and there is no leading dot.
Nanosecond9NoDot,
/// Timezone name. /// Timezone name.
/// ///
/// It does not support parsing, its use in the parser is an immediate failure. /// It does not support parsing, its use in the parser is an immediate failure.
@ -235,6 +229,12 @@ enum InternalInternal {
/// ///
/// [iso8601]: https://en.wikipedia.org/wiki/ISO_8601#Time_offsets_from_UTC /// [iso8601]: https://en.wikipedia.org/wiki/ISO_8601#Time_offsets_from_UTC
TimezoneOffsetPermissive, TimezoneOffsetPermissive,
/// Same to [`Nanosecond`](#variant.Nanosecond) but the accuracy is fixed to 3 and there is no leading dot.
Nanosecond3NoDot,
/// Same to [`Nanosecond`](#variant.Nanosecond) but the accuracy is fixed to 6 and there is no leading dot.
Nanosecond6NoDot,
/// Same to [`Nanosecond`](#variant.Nanosecond) but the accuracy is fixed to 9 and there is no leading dot.
Nanosecond9NoDot,
} }
/// A single formatting item. This is used for both formatting and parsing. /// A single formatting item. This is used for both formatting and parsing.
@ -481,17 +481,17 @@ pub fn format<'a, I>(w: &mut fmt::Formatter, date: Option<&NaiveDate>, time: Opt
let nano = t.nanosecond() % 1_000_000_000; let nano = t.nanosecond() % 1_000_000_000;
write!(w, ".{:09}", nano) write!(w, ".{:09}", nano)
}), }),
Nanosecond3NoDot => Internal(InternalFixed { val: InternalInternal::Nanosecond3NoDot }) =>
time.map(|t| { time.map(|t| {
let nano = t.nanosecond() % 1_000_000_000; let nano = t.nanosecond() % 1_000_000_000;
write!(w, "{:03}", nano / 1_000_000) write!(w, "{:03}", nano / 1_000_000)
}), }),
Nanosecond6NoDot => Internal(InternalFixed { val: InternalInternal::Nanosecond6NoDot }) =>
time.map(|t| { time.map(|t| {
let nano = t.nanosecond() % 1_000_000_000; let nano = t.nanosecond() % 1_000_000_000;
write!(w, "{:06}", nano / 1_000) write!(w, "{:06}", nano / 1_000)
}), }),
Nanosecond9NoDot => Internal(InternalFixed { val: InternalInternal::Nanosecond9NoDot }) =>
time.map(|t| { time.map(|t| {
let nano = t.nanosecond() % 1_000_000_000; let nano = t.nanosecond() % 1_000_000_000;
write!(w, "{:09}", nano) write!(w, "{:09}", nano)

66
src/format/parse.rs
View File

@ -315,19 +315,19 @@ pub fn parse<'a, I>(parsed: &mut Parsed, mut s: &str, items: I) -> ParseResult<(
} }
} }
Nanosecond3NoDot => { Internal(InternalFixed { val: InternalInternal::Nanosecond3NoDot }) => {
if s.len() < 3 { return Err(TOO_SHORT); } if s.len() < 3 { return Err(TOO_SHORT); }
let nano = try_consume!(scan::nanosecond_fixed(s, 3)); let nano = try_consume!(scan::nanosecond_fixed(s, 3));
try!(parsed.set_nanosecond(nano)); try!(parsed.set_nanosecond(nano));
} }
Nanosecond6NoDot => { Internal(InternalFixed { val: InternalInternal::Nanosecond6NoDot }) => {
if s.len() < 6 { return Err(TOO_SHORT); } if s.len() < 6 { return Err(TOO_SHORT); }
let nano = try_consume!(scan::nanosecond_fixed(s, 6)); let nano = try_consume!(scan::nanosecond_fixed(s, 6));
try!(parsed.set_nanosecond(nano)); try!(parsed.set_nanosecond(nano));
} }
Nanosecond9NoDot => { Internal(InternalFixed { val: InternalInternal::Nanosecond9NoDot }) => {
if s.len() < 9 { return Err(TOO_SHORT); } if s.len() < 9 { return Err(TOO_SHORT); }
let nano = try_consume!(scan::nanosecond_fixed(s, 9)); let nano = try_consume!(scan::nanosecond_fixed(s, 9));
try!(parsed.set_nanosecond(nano)); try!(parsed.set_nanosecond(nano));
@ -553,37 +553,37 @@ fn test_parse() {
check!(" .4", [fix!(Nanosecond)]; TOO_LONG); // no automatic trimming check!(" .4", [fix!(Nanosecond)]; TOO_LONG); // no automatic trimming
// fixed: nanoseconds without the dot // fixed: nanoseconds without the dot
check!("", [fix!(Nanosecond3NoDot)]; TOO_SHORT); check!("", [internal_fix!(Nanosecond3NoDot)]; TOO_SHORT);
check!("0", [fix!(Nanosecond3NoDot)]; TOO_SHORT); check!("0", [internal_fix!(Nanosecond3NoDot)]; TOO_SHORT);
check!("4", [fix!(Nanosecond3NoDot)]; TOO_SHORT); check!("4", [internal_fix!(Nanosecond3NoDot)]; TOO_SHORT);
check!("42", [fix!(Nanosecond3NoDot)]; TOO_SHORT); check!("42", [internal_fix!(Nanosecond3NoDot)]; TOO_SHORT);
check!("421", [fix!(Nanosecond3NoDot)]; nanosecond: 421_000_000); check!("421", [internal_fix!(Nanosecond3NoDot)]; nanosecond: 421_000_000);
check!("42143", [fix!(Nanosecond3NoDot), num!(Second)]; nanosecond: 421_000_000, second: 43); check!("42143", [internal_fix!(Nanosecond3NoDot), num!(Second)]; nanosecond: 421_000_000, second: 43);
check!("42195", [fix!(Nanosecond3NoDot)]; TOO_LONG); check!("42195", [internal_fix!(Nanosecond3NoDot)]; TOO_LONG);
check!("4x", [fix!(Nanosecond3NoDot)]; TOO_SHORT); check!("4x", [internal_fix!(Nanosecond3NoDot)]; TOO_SHORT);
check!(" 4", [fix!(Nanosecond3NoDot)]; INVALID); check!(" 4", [internal_fix!(Nanosecond3NoDot)]; INVALID);
check!(".421", [fix!(Nanosecond3NoDot)]; INVALID); check!(".421", [internal_fix!(Nanosecond3NoDot)]; INVALID);
check!("", [fix!(Nanosecond6NoDot)]; TOO_SHORT); check!("", [internal_fix!(Nanosecond6NoDot)]; TOO_SHORT);
check!("0", [fix!(Nanosecond6NoDot)]; TOO_SHORT); check!("0", [internal_fix!(Nanosecond6NoDot)]; TOO_SHORT);
check!("42195", [fix!(Nanosecond6NoDot)]; TOO_SHORT); check!("42195", [internal_fix!(Nanosecond6NoDot)]; TOO_SHORT);
check!("421950", [fix!(Nanosecond6NoDot)]; nanosecond: 421_950_000); check!("421950", [internal_fix!(Nanosecond6NoDot)]; nanosecond: 421_950_000);
check!("000003", [fix!(Nanosecond6NoDot)]; nanosecond: 3000); check!("000003", [internal_fix!(Nanosecond6NoDot)]; nanosecond: 3000);
check!("000000", [fix!(Nanosecond6NoDot)]; nanosecond: 0); check!("000000", [internal_fix!(Nanosecond6NoDot)]; nanosecond: 0);
check!("4x", [fix!(Nanosecond6NoDot)]; TOO_SHORT); check!("4x", [internal_fix!(Nanosecond6NoDot)]; TOO_SHORT);
check!(" 4", [fix!(Nanosecond6NoDot)]; INVALID); check!(" 4", [internal_fix!(Nanosecond6NoDot)]; INVALID);
check!(".42100", [fix!(Nanosecond6NoDot)]; INVALID); check!(".42100", [internal_fix!(Nanosecond6NoDot)]; INVALID);
check!("", [fix!(Nanosecond9NoDot)]; TOO_SHORT); check!("", [internal_fix!(Nanosecond9NoDot)]; TOO_SHORT);
check!("42195", [fix!(Nanosecond9NoDot)]; TOO_SHORT); check!("42195", [internal_fix!(Nanosecond9NoDot)]; TOO_SHORT);
check!("421950803", [fix!(Nanosecond9NoDot)]; nanosecond: 421_950_803); check!("421950803", [internal_fix!(Nanosecond9NoDot)]; nanosecond: 421_950_803);
check!("000000003", [fix!(Nanosecond9NoDot)]; nanosecond: 3); check!("000000003", [internal_fix!(Nanosecond9NoDot)]; nanosecond: 3);
check!("42195080354", [fix!(Nanosecond9NoDot), num!(Second)]; nanosecond: 421_950_803, second: 54); // don't skip digits that come after the 9 check!("42195080354", [internal_fix!(Nanosecond9NoDot), num!(Second)]; nanosecond: 421_950_803, second: 54); // don't skip digits that come after the 9
check!("421950803547", [fix!(Nanosecond9NoDot)]; TOO_LONG); check!("421950803547", [internal_fix!(Nanosecond9NoDot)]; TOO_LONG);
check!("000000000", [fix!(Nanosecond9NoDot)]; nanosecond: 0); check!("000000000", [internal_fix!(Nanosecond9NoDot)]; nanosecond: 0);
check!("00000000x", [fix!(Nanosecond9NoDot)]; INVALID); check!("00000000x", [internal_fix!(Nanosecond9NoDot)]; INVALID);
check!(" 4", [fix!(Nanosecond9NoDot)]; INVALID); check!(" 4", [internal_fix!(Nanosecond9NoDot)]; INVALID);
check!(".42100000", [fix!(Nanosecond9NoDot)]; INVALID); check!(".42100000", [internal_fix!(Nanosecond9NoDot)]; INVALID);
// fixed: timezone offsets // fixed: timezone offsets
check!("+00:00", [fix!(TimezoneOffset)]; offset: 0); check!("+00:00", [fix!(TimezoneOffset)]; offset: 0);
@ -637,7 +637,7 @@ fn test_parse() {
minute: 37, second: 5, offset: 32400); minute: 37, second: 5, offset: 32400);
check!("20150204143705567", check!("20150204143705567",
[num!(Year), num!(Month), num!(Day), [num!(Year), num!(Month), num!(Day),
num!(Hour), num!(Minute), num!(Second), fix!(Nanosecond3NoDot)]; num!(Hour), num!(Minute), num!(Second), internal_fix!(Nanosecond3NoDot)];
year: 2015, month: 2, day: 4, hour_div_12: 1, hour_mod_12: 2, year: 2015, month: 2, day: 4, hour_div_12: 1, hour_mod_12: 2,
minute: 37, second: 5, nanosecond: 567000000); minute: 37, second: 5, nanosecond: 567000000);
check!("Mon, 10 Jun 2013 09:32:37 GMT", check!("Mon, 10 Jun 2013 09:32:37 GMT",

6
src/format/strftime.rs
View File

@ -305,15 +305,15 @@ impl<'a> Iterator for StrftimeItems<'a> {
_ => Item::Error, _ => Item::Error,
}, },
'3' => match next!() { '3' => match next!() {
'f' => fix!(Nanosecond3NoDot), 'f' => internal_fix!(Nanosecond3NoDot),
_ => Item::Error, _ => Item::Error,
}, },
'6' => match next!() { '6' => match next!() {
'f' => fix!(Nanosecond6NoDot), 'f' => internal_fix!(Nanosecond6NoDot),
_ => Item::Error, _ => Item::Error,
}, },
'9' => match next!() { '9' => match next!() {
'f' => fix!(Nanosecond9NoDot), 'f' => internal_fix!(Nanosecond9NoDot),
_ => Item::Error, _ => Item::Error,
}, },
'%' => lit!("%"), '%' => lit!("%"),