resolve `cargo check --features clap/deprecated`

This has no functional effects.
merge-requests/413/merge
Charles Hall 2 years ago
parent 4710f739c0
commit fc852f8be6
No known key found for this signature in database
GPG Key ID: 7B8E0645816E07CF

@ -38,9 +38,9 @@ use crate::{
use super::pdu::PduBuilder; use super::pdu::PduBuilder;
#[derive(Parser)] #[derive(Parser)]
#[clap(name = "@conduit:server.name:", version = env!("CARGO_PKG_VERSION"))] #[command(name = "@conduit:server.name:", version = env!("CARGO_PKG_VERSION"))]
enum AdminCommand { enum AdminCommand {
#[clap(verbatim_doc_comment)] #[command(verbatim_doc_comment)]
/// Register an appservice using its registration YAML /// Register an appservice using its registration YAML
/// ///
/// This command needs a YAML generated by an appservice (such as a bridge), /// This command needs a YAML generated by an appservice (such as a bridge),
@ -80,12 +80,12 @@ enum AdminCommand {
/// User will not be removed from all rooms by default. /// User will not be removed from all rooms by default.
/// Use --leave-rooms to force the user to leave all rooms /// Use --leave-rooms to force the user to leave all rooms
DeactivateUser { DeactivateUser {
#[clap(short, long)] #[arg(short, long)]
leave_rooms: bool, leave_rooms: bool,
user_id: Box<UserId>, user_id: Box<UserId>,
}, },
#[clap(verbatim_doc_comment)] #[command(verbatim_doc_comment)]
/// Deactivate a list of users /// Deactivate a list of users
/// ///
/// Recommended to use in conjunction with list-local-users. /// Recommended to use in conjunction with list-local-users.
@ -100,10 +100,10 @@ enum AdminCommand {
/// # User list here /// # User list here
/// # ``` /// # ```
DeactivateAll { DeactivateAll {
#[clap(short, long)] #[arg(short, long)]
/// Remove users from their joined rooms /// Remove users from their joined rooms
leave_rooms: bool, leave_rooms: bool,
#[clap(short, long)] #[arg(short, long)]
/// Also deactivate admin accounts /// Also deactivate admin accounts
force: bool, force: bool,
}, },
@ -114,7 +114,7 @@ enum AdminCommand {
event_id: Box<EventId>, event_id: Box<EventId>,
}, },
#[clap(verbatim_doc_comment)] #[command(verbatim_doc_comment)]
/// Parse and print a PDU from a JSON /// Parse and print a PDU from a JSON
/// ///
/// The PDU event is only checked for validity and is not added to the /// The PDU event is only checked for validity and is not added to the

Loading…
Cancel
Save