Merge pull request #2686 from ldm0/delimiter

Make `value_delimiter` accept `char` rather than `String`
clap-rs · Aug 13, 2021 · d64ced0 · d64ced0
2 parents 3d2635b + a60836d
commit d64ced0
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 13 deletions.
diff --git a/clap.schema.json b/clap.schema.json
@@ -259,7 +259,7 @@
           "type": "string"
         },
         "value_delimiter": {
-          "type": "string"
+          "$ref": "#/definitions/shortArg"
         },
         "visible_alias": {
           "type": "string"

diff --git a/src/build/arg/mod.rs b/src/build/arg/mod.rs
@@ -2423,7 +2423,7 @@ impl<'help> Arg<'help> {
     ///     .arg(Arg::new("config")
     ///         .short('c')
     ///         .long("config")
-    ///         .value_delimiter(";"))
+    ///         .value_delimiter(';'))
     ///     .get_matches_from(vec![
     ///         "prog", "--config=val1;val2;val3"
     ///     ]);
@@ -2433,12 +2433,8 @@ impl<'help> Arg<'help> {
     /// [`Arg::use_delimiter(true)`]: Arg::use_delimiter()
     /// [`Arg::takes_value(true)`]: Arg::takes_value()
     #[inline]
-    pub fn value_delimiter(mut self, d: &str) -> Self {
-        self.val_delim = Some(
-            d.chars()
-                .next()
-                .expect("Failed to get value_delimiter from arg"),
-        );
+    pub fn value_delimiter(mut self, d: char) -> Self {
+        self.val_delim = Some(d);
         self.takes_value(true).use_delimiter(true)
     }
 

diff --git a/tests/help.rs b/tests/help.rs
@@ -1718,7 +1718,7 @@ fn issue_1052_require_delim_help() {
                 .takes_value(true)
                 .use_delimiter(true)
                 .require_delimiter(true)
-                .value_delimiter(":"),
+                .value_delimiter(':'),
         );
 
     assert!(utils::compare_output(
@@ -1844,7 +1844,7 @@ fn custom_headers_headers() {
                 .takes_value(true)
                 .use_delimiter(true)
                 .require_delimiter(true)
-                .value_delimiter(":"),
+                .value_delimiter(':'),
         )
         .help_heading("NETWORKING")
         .arg(
@@ -1898,7 +1898,7 @@ fn multiple_custom_help_headers() {
                 .takes_value(true)
                 .use_delimiter(true)
                 .require_delimiter(true)
-                .value_delimiter(":"),
+                .value_delimiter(':'),
         )
         .help_heading("NETWORKING")
         .arg(

diff --git a/tests/multiple_values.rs b/tests/multiple_values.rs
@@ -634,7 +634,7 @@ fn different_sep() {
             Arg::new("option")
                 .long("option")
                 .about("multiple options")
-                .value_delimiter(";"),
+                .value_delimiter(';'),
         )
         .try_get_matches_from(vec!["", "--option=val1;val2;val3"]);
 
@@ -655,7 +655,7 @@ fn different_sep_positional() {
         .arg(
             Arg::new("option")
                 .about("multiple options")
-                .value_delimiter(";"),
+                .value_delimiter(';'),
         )
         .try_get_matches_from(vec!["", "val1;val2;val3"]);