Preserve leading 0s for disjoint items. (#9)

Signed-off-by: Joe Grund <jgrund@whamcloud.io>

Author: Joe Grund

Cargo.toml

@@ -4,7 +4,7 @@ description = "Parses hostlist expressions into a Vec of Strings"
 repository = "https://github.com/whamcloud/hostlist-parser"
 keywords = ["hostlist", "pdsh", "hpc", "cluster"]
 license = "MIT"
-version = "0.1.4"
+version = "0.1.5"
 authors = ["EMF Team <emf@whamcloud.com>"]
 edition = "2021"
 

README.md

@@ -1,6 +1,6 @@
 # hostlist-parser
 
-![Crates.io](https://img.shields.io/crates/v/hostlist-parser) ![docs.rs](https://docs.rs/hostlist-parser/badge.svg?version=0.1.4)
+![Crates.io](https://img.shields.io/crates/v/hostlist-parser) ![docs.rs](https://docs.rs/hostlist-parser/badge.svg?version=0.1.5)
 
 Parses hostlist expressions into a deduped `Vec` of Strings
 

src/lib.rs

@@ -77,14 +77,6 @@ where
     many1(digit())
 }
 
-fn parsed_digits<I>() -> impl Parser<I, Output = u64>
-where
-    I: Stream<Token = char>,
-    I::Error: ParseError<I::Token, I::Range, I::Position>,
-{
-    digits().and_then(|x| x.parse::<u64>().map_err(StreamErrorFor::<I>::other))
-}
-
 fn leading_zeros<I>() -> impl Parser<I, Output = (usize, u64)>
 where
     I: Stream<Token = char>,
@@ -156,7 +148,7 @@ where
 
     sep_by1(
         optional_spaces()
-            .with(parsed_digits())
+            .with(leading_zeros())
             .skip(optional_spaces()),
         attempt(comma().skip(not_name)),
     )
@@ -285,6 +277,7 @@ mod tests {
     fn test_disjoint_digits() {
         assert_debug_snapshot!(disjoint_digits().easy_parse("1,2,3,4,5]"));
         assert_debug_snapshot!(disjoint_digits().easy_parse("1,2,3-5"));
+        assert_debug_snapshot!(disjoint_digits().easy_parse("1,2,006,0007,3-5"));
     }
 
     #[test]
@@ -484,4 +477,10 @@ mod tests {
             parse("hostname]00[asdf")
         );
     }
+
+    #[test]
+
+    fn test_parse_osts() {
+        assert_debug_snapshot!("Leading 0s", parse("OST01[00,01]"));
+    }
 }

src/snapshots/hostlist_parser__tests__Leading 0s.snap

@@ -0,0 +1,10 @@
+---
+source: src/lib.rs
+expression: "parse(\"OST01[00,01]\")"
+---
+Ok(
+    [
+        "OST0100",
+        "OST0101",
+    ],
+)

src/snapshots/hostlist_parser__tests__disjoint_digits-2.snap

@@ -6,8 +6,14 @@ Ok(
     (
         Disjoint(
             [
-                1,
-                2,
+                (
+                    0,
+                    1,
+                ),
+                (
+                    0,
+                    2,
+                ),
             ],
         ),
         ",3-5",

src/snapshots/hostlist_parser__tests__disjoint_digits-3.snap

@@ -0,0 +1,29 @@
+---
+source: src/lib.rs
+expression: "disjoint_digits().easy_parse(\"1,2,006,0007,3-5\")"
+---
+Ok(
+    (
+        Disjoint(
+            [
+                (
+                    0,
+                    1,
+                ),
+                (
+                    0,
+                    2,
+                ),
+                (
+                    2,
+                    6,
+                ),
+                (
+                    3,
+                    7,
+                ),
+            ],
+        ),
+        ",3-5",
+    ),
+)

src/snapshots/hostlist_parser__tests__disjoint_digits.snap

@@ -6,11 +6,26 @@ Ok(
     (
         Disjoint(
             [
-                1,
-                2,
-                3,
-                4,
-                5,
+                (
+                    0,
+                    1,
+                ),
+                (
+                    0,
+                    2,
+                ),
+                (
+                    0,
+                    3,
+                ),
+                (
+                    0,
+                    4,
+                ),
+                (
+                    0,
+                    5,
+                ),
             ],
         ),
         "]",

src/snapshots/hostlist_parser__tests__hostlist-2.snap

@@ -12,8 +12,14 @@ Ok(
                 [
                     Disjoint(
                         [
-                            1,
-                            2,
+                            (
+                                0,
+                                1,
+                            ),
+                            (
+                                0,
+                                2,
+                            ),
                         ],
                     ),
                 ],

src/snapshots/hostlist_parser__tests__hostlist-3.snap

@@ -12,9 +12,18 @@ Ok(
                 [
                     Disjoint(
                         [
-                            2,
-                            6,
-                            7,
+                            (
+                                0,
+                                2,
+                            ),
+                            (
+                                0,
+                                6,
+                            ),
+                            (
+                                0,
+                                7,
+                            ),
                         ],
                     ),
                 ],

src/snapshots/hostlist_parser__tests__hostlists-2.snap

@@ -13,8 +13,14 @@ Ok(
                     [
                         Disjoint(
                             [
-                                1,
-                                2,
+                                (
+                                    0,
+                                    1,
+                                ),
+                                (
+                                    0,
+                                    2,
+                                ),
                             ],
                         ),
                     ],