more cleanup

src/main.rs

@@ -312,7 +312,7 @@ fn get_setup() -> Setup {
     const ONEVENT_SHORT: &str = "o";
     #[cfg(feature = "passthrough-decoder")]
     const PASSTHROUGH_SHORT: &str = "P";
-    const TOKEN_SHORT: &str = "k";
+    const PASSWORD: &str = "password";
     const EMIT_SINK_EVENTS_SHORT: &str = "Q";
     const QUIET_SHORT: &str = "q";
     const INITIAL_VOLUME_SHORT: &str = "R";
@@ -501,9 +501,15 @@ fn get_setup() -> Setup {
         "USERNAME",
     )
     .optopt(
-        TOKEN_SHORT,
-        TOKEN,
-        "Spotify access token to sign in with. Use empty string to obtain token.",
+        PASSWORD_SHORT,
+        PASSWORD,
+        "Password used to sign in with.",
+        "PASSWORD",
+    )
+    .optopt(
+        ACCESS_TOKEN_SHORT,
+        ACCESS_TOKEN,
+        "Spotify access token to sign in with.",
         "TOKEN",
     )
     .optopt(