git.delta.rocks / jrsonnet / refs/commits / d13b86279a71

difftreelog

fix clap now requires multiple_occurrences

Yaroslav Bolyukin2021-07-06parent: #6745272.patch.diff
in: master

2 files changed

modifiedcrates/jrsonnet-cli/src/ext.rsdiffbeforeafterboth
--- a/crates/jrsonnet-cli/src/ext.rs
+++ b/crates/jrsonnet-cli/src/ext.rs
@@ -61,19 +61,40 @@
 	/// to use top level arguments whenever it's possible.
 	/// If [=data] is not set then it will be read from `name` env variable.
 	/// Can be accessed from code via `std.extVar("name")`.
-	#[clap(long, short = 'V', name = "name[=var data]", number_of_values = 1)]
+	#[clap(
+		long,
+		short = 'V',
+		name = "name[=var data]",
+		number_of_values = 1,
+		multiple_occurrences = true
+	)]
 	ext_str: Vec<ExtStr>,
 	/// Read string external variable from file.
 	/// See also `--ext-str`
-	#[clap(long, name = "name=var path", number_of_values = 1)]
+	#[clap(
+		long,
+		name = "name=var path",
+		number_of_values = 1,
+		multiple_occurrences = true
+	)]
 	ext_str_file: Vec<ExtFile>,
 	/// Add external variable from code.
 	/// See also `--ext-str`
-	#[clap(long, name = "name[=var source]", number_of_values = 1)]
+	#[clap(
+		long,
+		name = "name[=var source]",
+		number_of_values = 1,
+		multiple_occurrences = true
+	)]
 	ext_code: Vec<ExtStr>,
 	/// Read string external variable from file.
 	/// See also `--ext-str`
-	#[clap(long, name = "name=var code path", number_of_values = 1)]
+	#[clap(
+		long,
+		name = "name=var code path",
+		number_of_values = 1,
+		multiple_occurrences = true
+	)]
 	ext_code_file: Vec<ExtFile>,
 }
 impl ConfigureState for ExtVarOpts {
modifiedcrates/jrsonnet-cli/src/tla.rsdiffbeforeafterboth
13 long,
14 short = 'A',
15 name = "name[=tla data]",
16 number_of_values = 1,
17 multiple_occurrences = true
18 )]
13 tla_str: Vec<ExtStr>,19 tla_str: Vec<ExtStr>,
14 /// Read top level argument string from file.20 /// Read top level argument string from file.
15 /// See also `--tla-str`21 /// See also `--tla-str`
16 #[clap(long, name = "name=tla path", number_of_values = 1)]22 #[clap(
23 long,
24 name = "name=tla path",
25 number_of_values = 1,
26 multiple_occurrences = true
27 )]
17 tla_str_file: Vec<ExtFile>,28 tla_str_file: Vec<ExtFile>,
18 /// Add top level argument from code.29 /// Add top level argument from code.
19 /// See also `--tla-str`30 /// See also `--tla-str`
20 #[clap(long, name = "name[=tla source]", number_of_values = 1)]31 #[clap(
32 long,
33 name = "name[=tla source]",
34 number_of_values = 1,
35 multiple_occurrences = true
36 )]
21 tla_code: Vec<ExtStr>,37 tla_code: Vec<ExtStr>,
22 /// Read top level argument code from file.38 /// Read top level argument code from file.
23 /// See also `--tla-str`39 /// See also `--tla-str`
24 #[clap(long, name = "name=tla code path", number_of_values = 1)]40 #[clap(
41 long,
42 name = "name=tla code path",
43 number_of_values = 1,
44 multiple_occurrences = true
45 )]
25 tla_code_file: Vec<ExtFile>,46 tla_code_file: Vec<ExtFile>,
26}47}