Upgrade clap to 3.0.0-rc.11

NNPDF · Jan 1, 2022 · 2857c24 · 2857c24
1 parent 75a80e8
commit 2857c24
Show file tree

Hide file tree

Showing 17 changed files with 3 additions and 19 deletions.
diff --git a/pineappl_cli/Cargo.toml b/pineappl_cli/Cargo.toml
@@ -12,7 +12,7 @@ description = "Read, write, and query PineAPPL grids"
 
 [dependencies]
 anyhow = "1.0.48"
-clap = { version = "=3.0.0-beta.5" }
+clap = { features = ["derive"], version = "=3.0.0-rc.11" }
 enum_dispatch = "0.3.7"
 git-version = "0.3.5"
 itertools = "0.10.1"

diff --git a/pineappl_cli/src/channels.rs b/pineappl_cli/src/channels.rs
@@ -175,7 +175,6 @@ mod tests {
     use assert_cmd::Command;
 
     const HELP_STR: &str = "pineappl-channels 
-
 Shows the contribution for each partonic channel
 
 USAGE:

diff --git a/pineappl_cli/src/convolute.rs b/pineappl_cli/src/convolute.rs
@@ -156,7 +156,6 @@ mod tests {
     use assert_cmd::Command;
 
     const HELP_STR: &str = "pineappl-convolute 
-
 Convolutes a PineAPPL grid with a PDF set
 
 USAGE:

diff --git a/pineappl_cli/src/diff.rs b/pineappl_cli/src/diff.rs
@@ -238,7 +238,6 @@ mod tests {
     use assert_cmd::Command;
 
     const HELP_STR: &str = "pineappl-diff 
-
 Compares the contents of two grids with each other
 
 USAGE:

diff --git a/pineappl_cli/src/info.rs b/pineappl_cli/src/info.rs
@@ -111,7 +111,6 @@ mod tests {
     use assert_cmd::Command;
 
     const HELP_STR: &str = "pineappl-info 
-
 Shows information about the grid
 
 USAGE:

diff --git a/pineappl_cli/src/luminosity.rs b/pineappl_cli/src/luminosity.rs
@@ -54,7 +54,6 @@ mod tests {
     use assert_cmd::Command;
 
     const HELP_STR: &str = "pineappl-luminosity 
-
 Shows the luminosity function
 
 USAGE:

diff --git a/pineappl_cli/src/merge.rs b/pineappl_cli/src/merge.rs
@@ -56,7 +56,6 @@ mod tests {
     use assert_cmd::Command;
 
     const HELP_STR: &str = "pineappl-merge 
-
 Merges one or more PineAPPL grids together
 
 USAGE:

diff --git a/pineappl_cli/src/optimize.rs b/pineappl_cli/src/optimize.rs
@@ -29,7 +29,6 @@ mod tests {
     use assert_fs::NamedTempFile;
 
     const HELP_STR: &str = "pineappl-optimize 
-
 Optimizes the internal data structure to minimize memory usage
 
 USAGE:

diff --git a/pineappl_cli/src/orders.rs b/pineappl_cli/src/orders.rs
@@ -139,7 +139,6 @@ mod tests {
     use assert_cmd::Command;
 
     const HELP_STR: &str = "pineappl-orders 
-
 Shows the predictions for all bin for each order separately
 
 USAGE:

diff --git a/pineappl_cli/src/pdf_uncertainty.rs b/pineappl_cli/src/pdf_uncertainty.rs
@@ -116,7 +116,6 @@ mod tests {
     use assert_cmd::Command;
 
     const HELP_STR: &str = "pineappl-pdf-uncertainty 
-
 Calculates PDF uncertainties
 
 USAGE:

diff --git a/pineappl_cli/src/plot.rs b/pineappl_cli/src/plot.rs
@@ -788,7 +788,6 @@ mod tests {
     use assert_cmd::Command;
 
     const HELP_STR: &str = "pineappl-plot 
-
 Creates a matplotlib script plotting the contents of the grid
 
 USAGE:

diff --git a/pineappl_cli/src/pull.rs b/pineappl_cli/src/pull.rs
@@ -185,7 +185,6 @@ mod tests {
     use assert_cmd::Command;
 
     const HELP_STR: &str = "pineappl-pull 
-
 Calculates the pull between two different PDF sets
 
 USAGE:

diff --git a/pineappl_cli/src/remap.rs b/pineappl_cli/src/remap.rs
@@ -194,7 +194,6 @@ mod tests {
     use assert_cmd::Command;
 
     const HELP_STR: &str = "pineappl-remap 
-
 Modifies the bin dimensions, widths and normalizations
 
 USAGE:
@@ -209,7 +208,7 @@ OPTIONS:
     -h, --help
             Print help information
 
-        --ignore-obs-norm <IGNORE_OBS_NORM>...
+        --ignore-obs-norm <IGNORE_OBS_NORM>
             Ignore the given observables for differential normalization
 
         --norm <NORM>

diff --git a/pineappl_cli/src/set.rs b/pineappl_cli/src/set.rs
@@ -61,7 +61,6 @@ mod tests {
     use assert_cmd::Command;
 
     const HELP_STR: &str = "pineappl-set 
-
 Modifies the internal key-value storage
 
 USAGE:
@@ -72,7 +71,7 @@ ARGS:
     <OUTPUT>    Path of the modified PineAPPL file
 
 OPTIONS:
-        --delete <KEY>...
+        --delete <KEY>
             Deletes an internal key-value pair
 
         --entry <KEY> <VALUE>

diff --git a/pineappl_cli/src/subgrids.rs b/pineappl_cli/src/subgrids.rs
@@ -58,7 +58,6 @@ mod tests {
     use assert_cmd::Command;
 
     const HELP_STR: &str = "pineappl-subgrids 
-
 Print information about the internal subgrid types
 
 USAGE:

diff --git a/pineappl_cli/src/sum.rs b/pineappl_cli/src/sum.rs
@@ -55,7 +55,6 @@ mod tests {
     use assert_fs::NamedTempFile;
 
     const HELP_STR: &str = "pineappl-sum 
-
 Sums two or more bins of a grid together
 
 USAGE:

diff --git a/pineappl_cli/src/upgrade.rs b/pineappl_cli/src/upgrade.rs
@@ -29,7 +29,6 @@ mod tests {
     use assert_fs::NamedTempFile;
 
     const HELP_STR: &str = "pineappl-upgrade 
-
 Converts the file format to the most recent version
 
 USAGE:
-Original file line number
+Diff line change
@@ Expand Up / @@ -175,7 +175,6 @@ mod tests { @@
         use assert_cmd::Command;
         const HELP_STR: &str = "pineappl-channels
     Shows the contribution for each partonic channel
     USAGE:
@@ Expand Down @@