Resolve deprecation warnings from clap

.github/workflows/integration_tests_validation.yaml

@@ -42,7 +42,9 @@ jobs:
           wget -q https://github.com/opencontainers/runc/releases/download/v1.1.0/runc.amd64
           sudo mv runc.amd64 /usr/bin/runc
           sudo chmod 755 /usr/bin/runc
+      - name: Build youki and tests
+        run: ./scripts/build.sh -o "$(git rev-parse --show-toplevel)"/scripts -r
       - name: Validate tests on runc
-        run: cd scripts && ./rust_integration_tests.sh runc
+        run: make validate-rust-tests
       - name: Validate tests on youki
         run: make integration-test

Makefile

@@ -17,5 +17,8 @@ oci-integration-test: release-build
 integration-test: release-build
 	./scripts/rust_integration_tests.sh $(ROOT)/youki
 
+validate-rust-tests: release-build
+	./scripts/rust_integration_tests.sh runc
+
 clean:
 	./scripts/clean.sh $(ROOT)

crates/liboci-cli/src/lib.rs

@@ -54,7 +54,7 @@ pub enum CommonCmd {
     Exec(Exec),
     List(List),
     Pause(Pause),
-    #[clap(setting = clap::AppSettings::AllowLeadingHyphen)]
+    #[clap(allow_hyphen_values = true)]
     Ps(Ps),
     Resume(Resume),
     Run(Run),

crates/liboci-cli/src/ps.rs

@@ -9,6 +9,6 @@ pub struct Ps {
     #[clap(forbid_empty_values = true, required = true)]
     pub container_id: String,
     /// options will be passed to the ps utility
-    #[clap(setting = clap::ArgSettings::Last)]
+    #[clap(last = true)]
     pub ps_options: Vec<String>,
 }

crates/youki/Cargo.toml

@@ -32,7 +32,7 @@ procfs = "0.12.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 tabwriter = "1"
-clap_generate = { version = "3.0.0-beta.5" }
+clap_complete = "3.1.1"
 
 [dev-dependencies]
 serial_test = "0.6.0"

crates/youki/src/commands/completion.rs

@@ -1,6 +1,7 @@
 use anyhow::Result;
-use clap::{App, Parser};
-use clap_generate::{generate, Shell};
+use clap::{Command, Parser};
+
+use clap_complete::{generate, Shell};
 use std::io;
 
 #[derive(Debug, Parser)]
@@ -10,7 +11,7 @@ pub struct Completion {
     pub shell: Shell,
 }
 
-pub fn completion(args: Completion, app: &mut App) -> Result<()> {
+pub fn completion(args: Completion, app: &mut Command) -> Result<()> {
     generate(
         args.shell,
         app,

crates/youki/src/main.rs

@@ -82,7 +82,7 @@ fn main() -> Result<()> {
     pentacle::ensure_sealed().context("failed to seal /proc/self/exe")?;
 
     let opts = Opts::parse();
-    let mut app = Opts::into_app();
+    let mut app = Opts::command();
 
     if let Err(e) = crate::logger::init(opts.global.debug, opts.global.log, opts.global.log_format)
     {