Upgrade all dependencies

crates/cli/Cargo.toml

@@ -9,10 +9,10 @@ license = "Apache-2.0"
 tokio = { version = "1.12.0", features = ["full"] }
 futures = "0.3.17"
 anyhow = "1.0.44"
-clap = "3.0.0-beta.4"
+clap = "3.0.0-beta.5"
 dotenv = "0.15.0"
 schemars = { version = "0.8.6", features = ["url", "chrono"] }
-tower = { version = "0.4.8", features = ["full"] }
+tower = { version = "0.4.9", features = ["full"] }
 tower-http = { version = "0.1.1", features = ["full"] }
 hyper = { version = "0.14.13", features = ["full"] }
 serde_yaml = "0.8.21"

crates/cli/src/config.rs

@@ -12,20 +12,20 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use clap::Clap;
+use clap::Parser;
 use mas_config::{ConfigurationSection, RootConfig};
 use schemars::schema_for;
 use tracing::info;
 
 use super::RootCommand;
 
-#[derive(Clap, Debug)]
+#[derive(Parser, Debug)]
 pub(super) struct ConfigCommand {
     #[clap(subcommand)]
     subcommand: ConfigSubcommand,
 }
 
-#[derive(Clap, Debug)]
+#[derive(Parser, Debug)]
 enum ConfigSubcommand {
     /// Dump the current config as YAML
     Dump,

crates/cli/src/database.rs

@@ -13,19 +13,19 @@
 // limitations under the License.
 
 use anyhow::Context;
-use clap::Clap;
+use clap::Parser;
 use mas_config::DatabaseConfig;
 use mas_core::storage::MIGRATOR;
 
 use super::RootCommand;
 
-#[derive(Clap, Debug)]
+#[derive(Parser, Debug)]
 pub(super) struct DatabaseCommand {
     #[clap(subcommand)]
     subcommand: DatabaseSubcommand,
 }
 
-#[derive(Clap, Debug)]
+#[derive(Parser, Debug)]
 enum DatabaseSubcommand {
     /// Run database migrations
     Migrate,

crates/cli/src/main.rs

@@ -21,7 +21,7 @@
 use std::path::PathBuf;
 
 use anyhow::Context;
-use clap::Clap;
+use clap::Parser;
 use mas_config::{ConfigurationSection, TelemetryConfig};
 use tracing_subscriber::{
     filter::LevelFilter, layer::SubscriberExt, reload, util::SubscriberInitExt, EnvFilter, Layer,
@@ -40,7 +40,7 @@ mod server;
 mod telemetry;
 mod templates;
 
-#[derive(Clap, Debug)]
+#[derive(Parser, Debug)]
 enum Subcommand {
     /// Configuration-related commands
     Config(ConfigCommand),
@@ -58,7 +58,7 @@ enum Subcommand {
     Templates(TemplatesCommand),
 }
 
-#[derive(Clap, Debug)]
+#[derive(Parser, Debug)]
 struct RootCommand {
     /// Path to the configuration file
     #[clap(

crates/cli/src/manage.rs

@@ -13,20 +13,20 @@
 // limitations under the License.
 
 use argon2::Argon2;
-use clap::Clap;
+use clap::Parser;
 use mas_config::DatabaseConfig;
 use mas_core::storage::register_user;
 use tracing::{info, warn};
 
 use super::RootCommand;
 
-#[derive(Clap, Debug)]
+#[derive(Parser, Debug)]
 pub(super) struct ManageCommand {
     #[clap(subcommand)]
     subcommand: ManageSubcommand,
 }
 
-#[derive(Clap, Debug)]
+#[derive(Parser, Debug)]
 enum ManageSubcommand {
     /// Register a new user
     Register { username: String, password: String },

crates/cli/src/server.rs

@@ -18,7 +18,7 @@ use std::{
 };
 
 use anyhow::Context;
-use clap::Clap;
+use clap::Parser;
 use hyper::{header, Server, Version};
 use mas_config::RootConfig;
 use mas_core::{
@@ -37,7 +37,7 @@ use tracing::{field, info};
 
 use super::RootCommand;
 
-#[derive(Clap, Debug, Default)]
+#[derive(Parser, Debug, Default)]
 pub(super) struct ServerCommand {
     /// Automatically apply pending migrations
     #[clap(long)]

crates/cli/src/templates.rs

@@ -14,18 +14,18 @@
 
 use std::path::PathBuf;
 
-use clap::Clap;
+use clap::Parser;
 use mas_templates::Templates;
 
 use super::RootCommand;
 
-#[derive(Clap, Debug)]
+#[derive(Parser, Debug)]
 pub(super) struct TemplatesCommand {
     #[clap(subcommand)]
     subcommand: TemplatesSubcommand,
 }
 
-#[derive(Clap, Debug)]
+#[derive(Parser, Debug)]
 enum TemplatesSubcommand {
     /// Save the builtin templates to a folder
     Save {