diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/datetime.rs | 44 | ||||
| -rw-r--r-- | src/ser.rs | 10 |
2 files changed, 27 insertions, 27 deletions
diff --git a/src/datetime.rs b/src/datetime.rs index f39d9fa..83b5c0b 100644 --- a/src/datetime.rs +++ b/src/datetime.rs @@ -55,7 +55,7 @@ struct Time { hour: u8, minute: u8, second: u8, - secfract: f64, + nanosecond: u32, } #[derive(PartialEq, Clone)] @@ -97,9 +97,9 @@ impl fmt::Display for Date { impl fmt::Display for Time { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { write!(f, "{:02}:{:02}:{:02}", self.hour, self.minute, self.second)?; - if self.secfract != 0.0 { - let s = format!("{}", self.secfract); - write!(f, "{}", s.trim_left_matches("0"))?; + if self.nanosecond != 0 { + let s = format!("{:09}", self.nanosecond); + write!(f, ".{}", s.trim_right_matches('0'))?; } Ok(()) } @@ -199,38 +199,37 @@ impl FromStr for Datetime { let s1 = digit(&mut chars)?; let s2 = digit(&mut chars)?; - let secfract = if chars.clone().next() == Some('.') { + let mut nanosecond = 0; + if chars.clone().next() == Some('.') { chars.next(); - let mut first = true; let whole = chars.as_str(); + let mut end = whole.len(); - for (i, c) in whole.char_indices() { - match c { - '0' ... '9' => {} + for (i, byte) in whole.bytes().enumerate() { + match byte { + b'0' ... b'9' => { + if i < 9 { + let p = 10_u32.pow(8 - i as u32); + nanosecond += p * (byte - b'0') as u32; + } + } _ => { end = i; - break + break; } } - first = false; } - if first { + if end == 0 { return Err(DatetimeParseError { _private: () }) } chars = whole[end..].chars(); - match format!("0.{}", &whole[..end]).parse() { - Ok(f) => f, - Err(_) => return Err(DatetimeParseError { _private: () }), - } - } else { - 0.0 - }; + } let time = Time { hour: h1 * 10 + h2, minute: m1 * 10 + m2, second: s1 * 10 + s2, - secfract: secfract, + nanosecond: nanosecond, }; if time.hour > 24 { @@ -239,7 +238,10 @@ impl FromStr for Datetime { if time.minute > 59 { return Err(DatetimeParseError { _private: () }) } - if time.second > 60 { + if time.second > 59 { + return Err(DatetimeParseError { _private: () }) + } + if time.nanosecond > 999_999_999 { return Err(DatetimeParseError { _private: () }) } @@ -107,7 +107,8 @@ pub enum Error { /// attempted where the key of a map was not a string. KeyNotString, - /// Keys in maps are not allowed to have newlines. + /// An error that we never omit but keep for backwards compatibility + #[doc(hidden)] KeyNewline, /// Arrays in TOML must have a homogenous type, but a heterogeneous array @@ -624,9 +625,6 @@ impl<'a, 'b> ser::SerializeMap for SerializeTable<'a, 'b> { SerializeTable::Table { ref mut key, .. } => { key.truncate(0); *key = input.serialize(StringExtractor)?; - if key.contains('\n') { - return Err(Error::KeyNewline) - } } } Ok(()) @@ -1047,13 +1045,13 @@ impl fmt::Display for Error { match *self { Error::UnsupportedType => "unsupported Rust type".fmt(f), Error::KeyNotString => "map key was not a string".fmt(f), - Error::KeyNewline => "map keys cannot contain newlines".fmt(f), Error::ArrayMixedType => "arrays cannot have mixed types".fmt(f), Error::ValueAfterTable => "values must be emitted before tables".fmt(f), Error::DateInvalid => "a serialized date was invalid".fmt(f), Error::NumberInvalid => "a serialized number was invalid".fmt(f), Error::UnsupportedNone => "unsupported None value".fmt(f), Error::Custom(ref s) => s.fmt(f), + Error::KeyNewline => unreachable!(), Error::__Nonexhaustive => panic!(), } } @@ -1064,13 +1062,13 @@ impl error::Error for Error { match *self { Error::UnsupportedType => "unsupported Rust type", Error::KeyNotString => "map key was not a string", - Error::KeyNewline => "map keys cannot contain newlines", Error::ArrayMixedType => "arrays cannot have mixed types", Error::ValueAfterTable => "values must be emitted before tables", Error::DateInvalid => "a serialized date was invalid", Error::NumberInvalid => "a serialized number was invalid", Error::UnsupportedNone => "unsupported None value", Error::Custom(_) => "custom error", + Error::KeyNewline => unreachable!(), Error::__Nonexhaustive => panic!(), } } |