Merge branch 'imbris/admin-cmd' into 'master'

Make admin adding/removing command arguments positional again

See merge request veloren/veloren!2700

CHANGELOG.md

@@ -42,6 +42,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Mushroom Curry gives long-lasting Regeneration buff
 - Trades now consider if items can stack in full inventories.
 - The types of animals that can be tamed as pets are now limited to certain species, pending further balancing of pets
+- Made server-cli admin add/remove command use positional arguments again
 
 
 ### Removed

server-cli/src/cli.rs

@@ -8,15 +8,13 @@ use tracing::error;
 pub enum Admin {
     /// Adds an admin
     Add {
-        #[structopt(short, long)]
         /// Name of the admin to whom to assign a role
         username: String,
         /// role to assign to the admin
-        #[structopt(short, long, possible_values = &comp::AdminRole::variants(), case_insensitive = true)]
+        #[structopt(possible_values = &comp::AdminRole::variants(), case_insensitive = true)]
         role: comp::AdminRole,
     },
     Remove {
-        #[structopt(short, long)]
         /// Name of the admin from whom to remove any existing roles
         username: String,
     },