Replace structopt with clap 3

This patch rewrites the CLI interfaces to be used with clap 3.0 instead
of clap 2.x + structopt.

The changes are as minimal as possible, although I did not verify that
the CLI is the same as before.

Signed-off-by: Matthias Beyer <matthias.beyer@ifm.com>

1 files changed, 10 insertions, 6 deletions

diff --git a/crates/core/tedge/src/cli/mod.rs b/crates/core/tedge/src/cli/mod.rs
index d54dacee..236b718f 100644
--- a/crates/core/tedge/src/cli/mod.rs
+++ b/crates/core/tedge/src/cli/mod.rs
@@ -1,6 +1,5 @@
 use crate::command::{BuildCommand, BuildContext, Command};
-use structopt::clap;
-use structopt::StructOpt;
+use clap;
 
 mod certificate;
 mod config;
@@ -8,32 +7,37 @@ mod connect;
 mod disconnect;
 mod mqtt;
 
-#[derive(StructOpt, Debug)]
-#[structopt(
+#[derive(clap::Parser, Debug)]
+#[clap(
     name = clap::crate_name!(),
     version = clap::crate_version!(),
     about = clap::crate_description!()
 )]
 pub struct Opt {
-    #[structopt(subcommand)]
+    #[clap(subcommand)]
     pub tedge: TEdgeOpt,
 }
 
-#[derive(StructOpt, Debug)]
+#[derive(clap::Subcommand, Debug)]
 pub enum TEdgeOpt {
     /// Create and manage device certificate
+    #[clap(subcommand)]
     Cert(certificate::TEdgeCertCli),
 
     /// Configure Thin Edge.
+    #[clap(subcommand)]
     Config(config::ConfigCmd),
 
     /// Connect to connector provider
+    #[clap(subcommand)]
     Connect(connect::TEdgeConnectOpt),
 
     /// Remove bridge connection for a provider
+    #[clap(subcommand)]
     Disconnect(disconnect::TEdgeDisconnectBridgeCli),
 
     /// Publish a message on a topic and subscribe a topic.
+    #[clap(subcommand)]
     Mqtt(mqtt::TEdgeMqttCli),
 }