clap - get rid of dev-dependencies that are not in Debian so the rest of the tests...

diff --git a/src/clap/debian/changelog b/src/clap/debian/changelog
index 0de02752e7b47142e48691922e8f6a7e4333f235..fb85b7d3ec79ba06784421b6fde155cd70d8aef4 100644 (file)
--- a/src/clap/debian/changelog
+++ b/src/clap/debian/changelog
@@ -2,11 +2,15 @@ rust-clap (3.1.6-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
 
   * Team upload.
   * Package clap 3.1.6 from crates.io using debcargo 2.5.0
+  * Remove dev-dependency on criterion and disable benches that rely
+    on it.
+  * Remove dev-dependency on trycmd, the tests that use it are not
+    in the crates.io release of the crate anyway.
 
   [ Sylvestre Ledru ]
   * Package clap 3.1.6 from crates.io using debcargo 2.5.0
 
- -- Peter Michael Green <plugwash@debian.org>  Tue, 15 Mar 2022 17:55:00 +0000
+ -- Peter Michael Green <plugwash@debian.org>  Tue, 15 Mar 2022 18:15:59 +0000
 
 rust-clap (3.1.1-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
 

diff --git a/src/clap/debian/patches/disable-criterion.patch b/src/clap/debian/patches/disable-criterion.patch
new file mode 100644 (file)
index 0000000..c6eaa91
--- /dev/null
+++ b/src/clap/debian/patches/disable-criterion.patch
@@ -0,0 +1,139 @@
+Index: clap/benches/01_default.rs
+===================================================================
+--- clap.orig/benches/01_default.rs
++++ clap/benches/01_default.rs
+@@ -1,4 +1,4 @@
+-use clap::Command;
++/*use clap::Command;
+ use criterion::{criterion_group, criterion_main, Criterion};
+ 
+ pub fn build_empty(c: &mut Criterion) {
+@@ -12,4 +12,8 @@ pub fn parse_empty(c: &mut Criterion) {
+ }
+ 
+ criterion_group!(benches, build_empty, parse_empty);
+-criterion_main!(benches);
++criterion_main!(benches);*/
++
++fn main() {
++    println!("this bench is disabled because clap is not in Debian");
++}
+Index: clap/benches/02_simple.rs
+===================================================================
+--- clap.orig/benches/02_simple.rs
++++ clap/benches/02_simple.rs
+@@ -1,4 +1,4 @@
+-use clap::{arg, Arg, Command};
++/*use clap::{arg, Arg, Command};
+ use criterion::{criterion_group, criterion_main, Criterion};
+ 
+ macro_rules! create_app {
+@@ -101,4 +101,8 @@ criterion_group!(
+     build_simple
+ );
+ 
+-criterion_main!(benches);
++criterion_main!(benches);*/
++
++fn main() {
++    println!("this bench is disabled because clap is not in Debian");
++}
+Index: clap/benches/03_complex.rs
+===================================================================
+--- clap.orig/benches/03_complex.rs
++++ clap/benches/03_complex.rs
+@@ -1,4 +1,4 @@
+-use clap::{arg, Arg, Command};
++/*use clap::{arg, Arg, Command};
+ use criterion::{criterion_group, criterion_main, Criterion};
+ 
+ static OPT3_VALS: [&str; 2] = ["fast", "slow"];
+@@ -304,4 +304,8 @@ criterion_group!(
+     parse_complex_with_sc_complex
+ );
+ 
+-criterion_main!(benches);
++criterion_main!(benches);*/
++
++fn main() {
++    println!("this bench is disabled because clap is not in Debian");
++}
+Index: clap/benches/04_new_help.rs
+===================================================================
+--- clap.orig/benches/04_new_help.rs
++++ clap/benches/04_new_help.rs
+@@ -1,4 +1,4 @@
+-use clap::Command;
++/*use clap::Command;
+ use clap::{arg, Arg};
+ use criterion::{criterion_group, criterion_main, Criterion};
+ use std::io::Cursor;
+@@ -220,4 +220,8 @@ criterion_group!(
+     example4_template
+ );
+ 
+-criterion_main!(benches);
++criterion_main!(benches);*/
++
++fn main() {
++    println!("this bench is disabled because clap is not in Debian");
++}
+Index: clap/benches/05_ripgrep.rs
+===================================================================
+--- clap.orig/benches/05_ripgrep.rs
++++ clap/benches/05_ripgrep.rs
+@@ -3,7 +3,7 @@
+ //
+ // CLI used is adapted from ripgrep 48a8a3a691220f9e5b2b08f4051abe8655ea7e8a
+ 
+-use clap::{Arg, Command};
++/*use clap::{Arg, Command};
+ use criterion::{criterion_group, criterion_main, Criterion};
+ use std::collections::HashMap;
+ use std::io::Cursor;
+@@ -949,4 +949,8 @@ criterion_group!(
+     parse_rg_with_complex,
+     parse_rg_with_lots
+ );
+-criterion_main!(benches);
++criterion_main!(benches);*/
++
++fn main() {
++    println!("this bench is disabled because clap is not in Debian");
++}
+Index: clap/benches/06_rustup.rs
+===================================================================
+--- clap.orig/benches/06_rustup.rs
++++ clap/benches/06_rustup.rs
+@@ -2,7 +2,7 @@
+ //
+ // CLI used is from rustup 408ed84f0e50511ed44a405dd91365e5da588790
+ 
+-use clap::{AppSettings, Arg, ArgGroup, Command};
++/*use clap::{AppSettings, Arg, ArgGroup, Command};
+ use criterion::{criterion_group, criterion_main, Criterion};
+ 
+ pub fn build_rustup(c: &mut Criterion) {
+@@ -409,4 +409,8 @@ open specific pieces of documentation.";
+ 
+ criterion_group!(benches, build_rustup, parse_rustup, parse_rustup_with_sc);
+ 
+-criterion_main!(benches);
++criterion_main!(benches);*/
++
++fn main() {
++    println!("this bench is disabled because clap is not in Debian");
++}
+Index: clap/Cargo.toml
+===================================================================
+--- clap.orig/Cargo.toml
++++ clap/Cargo.toml
+@@ -389,8 +389,6 @@ optional = true
+ [dependencies.yaml-rust]
+ version = "0.5"
+ optional = true
+-[dev-dependencies.criterion]
+-version = "0.3.2"
+ 
+ [dev-dependencies.lazy_static]
+ version = "1"

diff --git a/src/clap/debian/patches/disable-trycmd.diff b/src/clap/debian/patches/disable-trycmd.diff
new file mode 100644 (file)
index 0000000..a3e8258
--- /dev/null
+++ b/src/clap/debian/patches/disable-trycmd.diff
@@ -0,0 +1,16 @@
+Index: clap/Cargo.toml
+===================================================================
+--- clap.orig/Cargo.toml
++++ clap/Cargo.toml
+@@ -402,11 +402,6 @@ version = "1"
+ [dev-dependencies.trybuild]
+ version = "1.0.18"
+ 
+-[dev-dependencies.trycmd]
+-version = "0.12"
+-features = ["color-auto", "diff", "examples"]
+-default-features = false
+-
+ [features]
+ cargo = ["lazy_static"]
+ color = ["atty", "termcolor"]

diff --git a/src/clap/debian/patches/series b/src/clap/debian/patches/series
index 9d44adc3b7aa4d404997973972f82af500a768ea..89ee0d43971c40ad620d6e47c3ec3fd52c821964 100644 (file)
--- a/src/clap/debian/patches/series
+++ b/src/clap/debian/patches/series
@@ -1,2 +1,4 @@
 no-clippy.patch
 relax-dep-versions.patch
+disable-criterion.patch
+disable-trycmd.diff