.travis.yml

@@ -0,0 +1,40 @@
+language: rust
+
+jobs:
+  include:
+  - rust: stable
+    os: linux
+  - rust: 1.28.0
+    os: linux
+    env: DISABLE_TOOLS=true
+  - rust: stable
+    os: osx
+  - rust: stable-msvc
+    os: windows
+  - rust: stable
+    os: windows
+
+cache:
+  - cargo
+
+before_script:
+  - rustup show
+  # CMake doesn't like the `sh.exe` provided by Git being in PATH
+  - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then rm "C:/Program Files/Git/usr/bin/sh.exe"; fi
+  - if [[ "$DISABLE_TOOLS" == "" ]]; then rustup component add clippy; rustup component add rustfmt; fi
+
+script:
+  - if [[ "$DISABLE_TOOLS" == "" ]]; then cargo clippy --all && cargo fmt --all -- --check; fi
+
+  # For default build, split up compilation and tests so we can track build times
+  - cargo test --no-run
+  - cargo test
+  - cargo test --release --no-run
+  - cargo test --release
+
+branches:
+  only:
+    - master
+    - staging
+    - trying
+    

Cargo.toml

@@ -1,13 +1,12 @@
 [package]
 name = "dtparse"
-version = "2.0.1"
+version = "1.2.0"
 authors = ["Bradlee Speice <bradlee@speice.io>"]
 description = "A dateutil-compatible timestamp parser for Rust"
 repository = "https://github.com/bspeice/dtparse.git"
 readme = "README.md"
 categories = ["date-and-time"]
 license = "Apache-2.0"
-exclude = ["/*.py"]
 
 [badges]
 travis-ci = { repository = "bspeice/dtparse" }
@@ -17,10 +16,8 @@ maintenance = { status = "passively-maintained" }
 name = "dtparse"
 
 [dependencies]
-chrono = { version = "0.4.24", default-features = false, features = ["clock"] }
+chrono = "0.4"
-lazy_static = "1.4.0"
+chrono-tz = "0.5"
-num-traits = "0.2.15"
+lazy_static = "1.1"
-rust_decimal = { version = "1.29.1", default-features = false }
+num-traits = "0.2"
-
+rust_decimal = "^0.10.1"
-[dev-dependencies]
-base64 = "0.21.0"

LICENSE-APACHE

@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

README.md

@@ -1,5 +1,6 @@
 # dtparse
 
+[![travisci](https://travis-ci.org/bspeice/dtparse.svg?branch=master)](https://travis-ci.org/bspeice/dtparse)
 [![crates.io](https://img.shields.io/crates/v/dtparse.svg)](https://crates.io/crates/dtparse)
 [![docs.rs](https://docs.rs/dtparse/badge.svg)](https://docs.rs/dtparse/)
 

bors.toml

@@ -0,0 +1,4 @@
+status = [
+  "continuous-integration/travis-ci/push",
+]
+delete_merged_branches = true

build_pycompat.py

@@ -317,7 +317,7 @@ TEST_PARSE_DEFAULT = '''
 #[test]
 fn test_parse_default{i}() {{
     let info = ParserInfo::default();
-    let default_rsdate = &NaiveDate::from_ymd_opt(2003, 9, 25).unwrap().and_hms_opt(0, 0, 0).unwrap();
+    let default_rsdate = &NaiveDate::from_ymd(2003, 9, 25).and_hms(0, 0, 0);
     let pdt = PyDateTime {{
         year: {d.year}, month: {d.month}, day: {d.day},
         hour: {d.hour}, minute: {d.minute}, second: {d.second},
@@ -407,7 +407,7 @@ TEST_UNSPECIFIED_FALLBACK = '''
 #[test]
 fn test_unspecified_fallback{i}() {{
     let info = ParserInfo::default();
-    let default_rsdate = &NaiveDate::from_ymd_opt(2010, 1, 31).unwrap().and_hms_opt(0, 0, 0).unwrap();
+    let default_rsdate = &NaiveDate::from_ymd(2010, 1, 31).and_hms(0, 0, 0);
     let pdt = PyDateTime {{
         year: {d.year}, month: {d.month}, day: {d.day},
         hour: {d.hour}, minute: {d.minute}, second: {d.second},
@@ -435,7 +435,7 @@ TEST_PARSE_DEFAULT_IGNORE = '''
 #[ignore]
 fn test_parse_default_ignore{i}() {{
     let info = ParserInfo::default();
-    let default_rsdate = &NaiveDate::from_ymd_opt(2003, 9, 25).unwrap().and_hms_opt(0, 0, 0).unwrap();
+    let default_rsdate = &NaiveDate::from_ymd(2003, 9, 25).and_hms(0, 0, 0);
     let pdt = PyDateTime {{
         year: {d.year}, month: {d.month}, day: {d.day},
         hour: {d.hour}, minute: {d.minute}, second: {d.second},

ci/install.sh

@@ -0,0 +1,47 @@
+set -ex
+
+main() {
+    local target=
+    if [ $TRAVIS_OS_NAME = linux ]; then
+        target=x86_64-unknown-linux-musl
+        sort=sort
+    else
+        target=x86_64-apple-darwin
+        sort=gsort  # for `sort --sort-version`, from brew's coreutils.
+    fi
+
+    # Builds for iOS are done on OSX, but require the specific target to be
+    # installed.
+    case $TARGET in
+        aarch64-apple-ios)
+            rustup target install aarch64-apple-ios
+            ;;
+        armv7-apple-ios)
+            rustup target install armv7-apple-ios
+            ;;
+        armv7s-apple-ios)
+            rustup target install armv7s-apple-ios
+            ;;
+        i386-apple-ios)
+            rustup target install i386-apple-ios
+            ;;
+        x86_64-apple-ios)
+            rustup target install x86_64-apple-ios
+            ;;
+    esac
+
+    # This fetches latest stable release
+    local tag=$(git ls-remote --tags --refs --exit-code https://github.com/japaric/cross \
+                       | cut -d/ -f3 \
+                       | grep -E '^v[0.1.0-9.]+$' \
+                       | $sort --version-sort \
+                       | tail -n1)
+    curl -LSfs https://japaric.github.io/trust/install.sh | \
+        sh -s -- \
+           --force \
+           --git japaric/cross \
+           --tag $tag \
+           --target $target
+}
+
+main

ci/script.sh

@@ -0,0 +1,40 @@
+# This script takes care of testing your crate
+
+set -ex
+
+main() {
+    cross build --target $TARGET
+    cross build --target $TARGET --release
+
+    if [ ! -z $DISABLE_TESTS ]; then
+        return
+    fi
+
+    cross test --target $TARGET
+    cross test --target $TARGET --release
+}
+
+main_web() {
+    CARGO_WEB_RELEASE="$(curl -L -s -H 'Accept: application/json' https://github.com/koute/cargo-web/releases/latest)"
+    CARGO_WEB_VERSION="$(echo $CARGO_WEB_RELEASE | sed -e 's/.*"tag_name":"\([^"]*\)".*/\1/')"
+    CARGO_WEB_URL="https://github.com/koute/cargo-web/releases/download/$CARGO_WEB_VERSION/cargo-web-x86_64-unknown-linux-gnu.gz"
+
+    echo "Downloading cargo-web from: $CARGO_WEB_URL"
+    curl -L "$CARGO_WEB_URL" | gzip -d > cargo-web
+    chmod +x cargo-web
+
+    mkdir -p ~/.cargo/bin
+    mv cargo-web ~/.cargo/bin
+
+    cargo web build --target $TARGET
+    cargo web test --target $TARGET --release
+}
+
+# we don't run the "test phase" when doing deploys
+if [ -z $TRAVIS_TAG ]; then
+    if [ -z "$USE_CARGO_WEB" ]; then
+        main
+    else
+        main_web
+    fi
+fi

examples/russian.rs

@@ -43,6 +43,6 @@ fn main() {
         )
         .unwrap()
         .0,
-        NaiveDate::from_ymd_opt(2015, 9, 10).unwrap().and_hms_opt(10, 20, 0).unwrap()
+        NaiveDate::from_ymd(2015, 9, 10).and_hms(10, 20, 0)
     );
 }

src/lib.rs

@@ -74,12 +74,10 @@
 extern crate lazy_static;
 
 extern crate chrono;
+extern crate chrono_tz;
 extern crate num_traits;
 extern crate rust_decimal;
 
-#[cfg(test)]
-extern crate base64;
-
 use chrono::Datelike;
 use chrono::Duration;
 use chrono::FixedOffset;
@@ -620,7 +618,7 @@ struct ParsingResult {
     hour: Option<i32>,
     minute: Option<i32>,
     second: Option<i32>,
-    nanosecond: Option<i64>,
+    microsecond: Option<i32>,
     tzname: Option<String>,
     tzoffset: Option<i32>,
     ampm: Option<bool>,
@@ -647,7 +645,7 @@ impl ParsingResult {
             + option_len!(self.hour)
             + option_len!(self.minute)
             + option_len!(self.second)
-            + option_len!(self.nanosecond)
+            + option_len!(self.microsecond)
             + option_len!(self.tzname)
             + option_len!(self.ampm)
     }
@@ -715,7 +713,7 @@ impl Parser {
     ) -> ParseResult<(NaiveDateTime, Option<FixedOffset>, Option<Vec<String>>)> {
         let default_date = default.unwrap_or(&Local::now().naive_local()).date();
 
-        let default_ts = NaiveDateTime::new(default_date, NaiveTime::from_hms_opt(0, 0, 0).unwrap());
+        let default_ts = NaiveDateTime::new(default_date, NaiveTime::from_hms(0, 0, 0));
 
         let (res, tokens) =
             self.parse_with_tokens(timestr, dayfirst, yearfirst, fuzzy, fuzzy_with_tokens)?;
@@ -979,18 +977,18 @@ impl Parser {
         let hour = res.hour.unwrap_or(default.hour() as i32) as u32;
         let minute = res.minute.unwrap_or(default.minute() as i32) as u32;
         let second = res.second.unwrap_or(default.second() as i32) as u32;
-        let nanosecond = res
+        let microsecond = res
-            .nanosecond
+            .microsecond
-            .unwrap_or(default.timestamp_subsec_nanos() as i64) as u32;
+            .unwrap_or(default.timestamp_subsec_micros() as i32) as u32;
         let t =
-            NaiveTime::from_hms_nano_opt(hour, minute, second, nanosecond).ok_or_else(|| {
+            NaiveTime::from_hms_micro_opt(hour, minute, second, microsecond).ok_or_else(|| {
                 if hour >= 24 {
                     ParseError::ImpossibleTimestamp("Invalid hour")
                 } else if minute >= 60 {
                     ParseError::ImpossibleTimestamp("Invalid minute")
                 } else if second >= 60 {
                     ParseError::ImpossibleTimestamp("Invalid second")
-                } else if nanosecond >= 2_000_000_000 {
+                } else if microsecond >= 2_000_000 {
                     ParseError::ImpossibleTimestamp("Invalid microsecond")
                 } else {
                     unreachable!();
@@ -1007,7 +1005,7 @@ impl Parser {
         tzinfos: &HashMap<String, i32>,
     ) -> ParseResult<Option<FixedOffset>> {
         if let Some(offset) = res.tzoffset {
-            Ok(FixedOffset::east_opt(offset))
+            Ok(Some(FixedOffset::east(offset)))
         } else if res.tzoffset == None
             && (res.tzname == Some(" ".to_owned())
                 || res.tzname == Some(".".to_owned())
@@ -1016,9 +1014,9 @@ impl Parser {
         {
             Ok(None)
         } else if res.tzname.is_some() && tzinfos.contains_key(res.tzname.as_ref().unwrap()) {
-            Ok(FixedOffset::east_opt(
+            Ok(Some(FixedOffset::east(
                 *tzinfos.get(res.tzname.as_ref().unwrap()).unwrap(),
-            ))
+            )))
         } else if let Some(tzname) = res.tzname.as_ref() {
             println!("tzname {} identified but not understood.", tzname);
             Ok(None)
@@ -1074,7 +1072,7 @@ impl Parser {
 
                 let t = self.parsems(&s[4..])?;
                 res.second = Some(t.0);
-                res.nanosecond = Some(t.1);
+                res.microsecond = Some(t.1);
             }
         } else if vec![8, 12, 14].contains(&len_li) {
             // YYMMDD
@@ -1094,8 +1092,9 @@ impl Parser {
         } else if let Some(hms_idx) = self.find_hms_index(idx, tokens, info, true) {
             // HH[ ]h or MM[ ]m or SS[.ss][ ]s
             let (new_idx, hms) = self.parse_hms(idx, tokens, info, Some(hms_idx));
-            if let Some(hms) = hms {
+            if hms.is_some() {
-                self.assign_hms(res, value_repr, hms)?;
+                // TODO: This unwrap is unjustified.
+                self.assign_hms(res, value_repr, hms.unwrap());
             }
             idx = new_idx;
         } else if idx + 2 < len_l && tokens[idx + 1] == ":" {
@@ -1103,7 +1102,7 @@ impl Parser {
             // TODO: Better story around Decimal handling
             res.hour = Some(value.floor().to_i64().unwrap() as i32);
             // TODO: Rescope `value` here?
-            value = self.to_decimal(&tokens[idx + 2])?;
+            value = self.to_decimal(&tokens[idx + 2]);
             let min_sec = self.parse_min_sec(value);
             res.minute = Some(min_sec.0);
             res.second = min_sec.1;
@@ -1112,7 +1111,7 @@ impl Parser {
                 // TODO: (x, y) = (a, b) syntax?
                 let ms = self.parsems(&tokens[idx + 4]).unwrap();
                 res.second = Some(ms.0);
-                res.nanosecond = Some(ms.1);
+                res.microsecond = Some(ms.1);
 
                 idx += 2;
             }
@@ -1132,9 +1131,7 @@ impl Parser {
                 }
 
                 if idx + 3 < len_l && &tokens[idx + 3] == sep {
-                    if tokens.len() <= idx + 4 {
+                    if let Some(value) = info.month_index(&tokens[idx + 4]) {
-                        return Err(ParseError::UnrecognizedFormat);
-                    } else if let Some(value) = info.month_index(&tokens[idx + 4]) {
                         ymd.append(value as i32, &tokens[idx + 4], Some(YMDLabel::Month))?;
                     } else if let Ok(val) = tokens[idx + 4].parse::<i32>() {
                         ymd.append(val, &tokens[idx + 4], None)?;
@@ -1156,9 +1153,7 @@ impl Parser {
                 res.hour = Some(self.adjust_ampm(hour, ampm));
                 idx += 1;
             } else {
-                //let value = value.floor().to_i32().ok_or(Err(ParseError::InvalidNumeric()))
+                ymd.append(value.floor().to_i64().unwrap() as i32, &value_repr, None)?;
-                let value = value.floor().to_i32().ok_or_else(|| ParseError::InvalidNumeric(value_repr.to_owned()))?;
-                ymd.append(value, &value_repr, None)?;
             }
 
             idx += 1;
@@ -1188,13 +1183,13 @@ impl Parser {
         }
     }
 
-    fn parsems(&self, seconds_str: &str) -> ParseResult<(i32, i64)> {
+    fn parsems(&self, seconds_str: &str) -> ParseResult<(i32, i32)> {
         if seconds_str.contains('.') {
             let split: Vec<&str> = seconds_str.split('.').collect();
             let (i, f): (&str, &str) = (split[0], split[1]);
 
             let i_parse = i.parse::<i32>()?;
-            let f_parse = ljust(f, 9, '0').parse::<i64>()?;
+            let f_parse = ljust(f, 6, '0').parse::<i32>()?;
             Ok((i_parse, f_parse))
         } else {
             Ok((seconds_str.parse::<i32>()?, 0))
@@ -1271,11 +1266,11 @@ impl Parser {
         }
     }
 
-    fn assign_hms(&self, res: &mut ParsingResult, value_repr: &str, hms: usize) -> ParseResult<()> {
+    fn assign_hms(&self, res: &mut ParsingResult, value_repr: &str, hms: usize) {
-        let value = self.to_decimal(value_repr)?;
+        let value = self.to_decimal(value_repr);
 
         if hms == 0 {
-            res.hour = value.to_i32();
+            res.hour = Some(value.to_i64().unwrap() as i32);
             if !close_to_integer(&value) {
                 res.minute = Some((*SIXTY * (value % *ONE)).to_i64().unwrap() as i32);
             }
@@ -1286,14 +1281,13 @@ impl Parser {
         } else if hms == 2 {
             let (sec, micro) = self.parsems(value_repr).unwrap();
             res.second = Some(sec);
-            res.nanosecond = Some(micro);
+            res.microsecond = Some(micro);
         }
-
-        Ok(())
     }
 
-    fn to_decimal(&self, value: &str) -> ParseResult<Decimal> {
+    fn to_decimal(&self, value: &str) -> Decimal {
-        Decimal::from_str(value).or_else(|_| Err(ParseError::InvalidNumeric(value.to_owned())))
+        // TODO: Justify unwrap
+        Decimal::from_str(value).unwrap()
     }
 
     fn parse_min_sec(&self, value: Decimal) -> (i32, Option<i32>) {

src/tests/fuzzing.rs

@@ -1,8 +1,5 @@
-use base64::Engine;
-use base64::engine::general_purpose::STANDARD;
 use chrono::NaiveDate;
 use std::collections::HashMap;
-use std::str;
 
 use parse;
 use ParseError;
@@ -21,7 +18,7 @@ fn test_fuzz() {
         Err(ParseError::UnrecognizedFormat)
     );
 
-    let default = NaiveDate::from_ymd_opt(2016, 6, 29).unwrap().and_hms_opt(0, 0, 0).unwrap();
+    let default = NaiveDate::from_ymd(2016, 6, 29).and_hms(0, 0, 0);
     let p = Parser::default();
     let res = p.parse(
         "\x0D\x31",
@@ -63,44 +60,3 @@ fn an_even_larger_int() {
 fn empty_string() {
     assert_eq!(parse(""), Err(ParseError::NoDate))
 }
-
-#[test]
-fn github_33() {
-    assert_eq!(parse("66:'"), Err(ParseError::InvalidNumeric("'".to_owned())))
-}
-
-#[test]
-fn github_32() {
-    assert_eq!(parse("99999999999999999999999"), Err(ParseError::InvalidNumeric("99999999999999999999999".to_owned())))
-}
-
-#[test]
-fn github_34() {
-    let parse_vec = STANDARD.decode("KTMuLjYpGDYvLjZTNiouNjYuHzZpLjY/NkwuNh42Ry42PzYnKTMuNk02NjY2NjA2NjY2NjY2NjYTNjY2Ni82NjY2NlAuNlAuNlNI").unwrap();
-    let parse_str = str::from_utf8(&parse_vec).unwrap();
-    let parse_result = parse(parse_str);
-    assert!(parse_result.is_err());
-}
-
-#[test]
-fn github_35() {
-    let parse_vec = STANDARD.decode("KTY6LjYqNio6KjYn").unwrap();
-    let parse_str = str::from_utf8(&parse_vec).unwrap();
-    let parse_result = parse(parse_str);
-    assert!(parse_result.is_err());
-}
-
-#[test]
-fn github_36() {
-    let parse_vec = STANDARD.decode("KTYuLg==").unwrap();
-    let parse_str = str::from_utf8(&parse_vec).unwrap();
-    let parse_result = parse(parse_str);
-    assert!(parse_result.is_err());
-}
-
-#[test]
-fn github_45() {
-    assert!(parse("/2018-fifa-").is_err());
-    assert!(parse("/2009/07/").is_err());
-    assert!(parse("2021-09-").is_err());
-}

src/tests/mod.rs

@@ -1,14 +1,3 @@
 mod fuzzing;
 mod pycompat_parser;
 mod pycompat_tokenizer;
-
-use chrono::NaiveDate;
-use crate::parse;
-
-#[test]
-fn nanosecond_precision() {
-    assert_eq!(
-        parse("2008.12.29T08:09:10.123456789").unwrap(),
-        (NaiveDate::from_ymd_opt(2008, 12, 29).unwrap().and_hms_nano_opt(8, 9, 10, 123_456_789).unwrap(), None)
-    )
-}