Increase cargo fmt max width

Author: zkxs

.rustfmt.toml

@@ -0,0 +1 @@
+max_width = 120

build.rs

@@ -12,9 +12,7 @@ fn main() -> io::Result<()> {
     create_constants(constants_path.as_path())?;
     println!(
         "cargo:rustc-env=CONSTANTS_PATH={}",
-        constants_path
-            .to_str()
-            .expect("invalid unicode in constants path")
+        constants_path.to_str().expect("invalid unicode in constants path")
     );
     Ok(())
 }
@@ -31,15 +29,11 @@ fn create_constants<P: AsRef<Path>>(path: P) -> io::Result<()> {
     writer.write_fmt(format_args!(
         "pub const GIT_COMMIT_HASH: &str = \"{git_commit_hash}\";\n"
     ))?;
-    writer.write_fmt(format_args!(
-        "pub const CLAP_VERSION: &str = \"{clap_version}\";\n"
-    ))?;
+    writer.write_fmt(format_args!("pub const CLAP_VERSION: &str = \"{clap_version}\";\n"))?;
     writer.write_fmt(format_args!(
         "pub const DISCORD_BOT_VERSION: &str = \"{discord_bot_version}\";\n"
     ))?;
-    writer.write_fmt(format_args!(
-        "pub const USER_AGENT: &str = \"{user_agent}\";\n"
-    ))?;
+    writer.write_fmt(format_args!("pub const USER_AGENT: &str = \"{user_agent}\";\n"))?;
     writer.flush()
 }
 
@@ -70,8 +64,7 @@ fn git_commit_hash() -> String {
         .args(["rev-parse", "HEAD"])
         .output()
         .expect("failed to get git commit hash");
-    let untrimmed_git_commit_hash =
-        String::from_utf8(output.stdout).expect("failed to read git commit hash as UTF-8");
+    let untrimmed_git_commit_hash = String::from_utf8(output.stdout).expect("failed to read git commit hash as UTF-8");
     untrimmed_git_commit_hash.trim().to_string()
 }
 

src/bot/cache.rs

@@ -29,11 +29,7 @@ thread_local! {
 }
 
 /// Shows bot help
-#[poise::command(
-    slash_command,
-    install_context = "Guild",
-    interaction_context = "Guild"
-)]
+#[poise::command(slash_command, install_context = "Guild", interaction_context = "Guild")]
 pub(in crate::bot) async fn help(context: Context<'_>) -> Result<(), Error> {
     let embed = CreateEmbed::default().title("Jinx Help").description(
         "Jinx is a Discord bot that grants roles to users when they register Jinxxy license keys.\n\
@@ -46,11 +42,7 @@ pub(in crate::bot) async fn help(context: Context<'_>) -> Result<(), Error> {
 }
 
 /// Shows bot version
-#[poise::command(
-    slash_command,
-    install_context = "Guild",
-    interaction_context = "Guild"
-)]
+#[poise::command(slash_command, install_context = "Guild", interaction_context = "Guild")]
 pub(in crate::bot) async fn version(context: Context<'_>) -> Result<(), Error> {
     context.defer_ephemeral().await?;
     let embed = CreateEmbed::default()
@@ -109,8 +101,7 @@ pub(in crate::bot) async fn init(
             // I suspect this is a discord/serenity/poise bug.
             // For some <id>, <nonce>, this looks like:
             // Http(UnsuccessfulRequest(ErrorResponse { status_code: 404, url: "https://discord.com/api/v10/interactions/<id>/<nonce>/callback", method: POST, error: DiscordJsonError { code: 10062, message: "Unknown interaction", errors: [] } }))
-            util::set_guild_commands(&context, &context.data().db, guild_id, Some(true), None)
-                .await?;
+            util::set_guild_commands(&context, &context.data().db, guild_id, Some(true), None).await?;
 
             success_reply("Success", "Owner commands installed.")
         } else {
@@ -119,8 +110,7 @@ pub(in crate::bot) async fn init(
     } else if api_key == "uninstall_owner_commands" {
         if check_owner(context).await? {
             context.data().db.set_owner_guild(guild_id, false).await?;
-            util::set_guild_commands(&context, &context.data().db, guild_id, Some(false), None)
-                .await?;
+            util::set_guild_commands(&context, &context.data().db, guild_id, Some(false), None).await?;
             success_reply("Success", "Owner commands uninstalled.")
         } else {
             error_reply("Error Uninstalling Owner Commands", "Not an owner")
@@ -136,20 +126,15 @@ pub(in crate::bot) async fn init(
                     .db
                     .set_jinxxy_api_key(guild_id, api_key.to_string())
                     .await?;
-                util::set_guild_commands(&context, &context.data().db, guild_id, None, Some(true))
-                    .await?;
+                util::set_guild_commands(&context, &context.data().db, guild_id, None, Some(true)).await?;
                 let reply = success_reply(
                     "Success",
                     format!(
                         "Welcome, {display_name}! API key set and additional slash commands enabled. Please continue bot setup."
                     ),
                 );
                 if has_required_scopes {
-                    context
-                        .data()
-                        .api_cache
-                        .register_guild_in_cache(guild_id)
-                        .await?;
+                    context.data().api_cache.register_guild_in_cache(guild_id).await?;
                     reply
                 } else {
                     debug!("nagged about API key scopes in {}", guild_id.get());
@@ -160,18 +145,11 @@ pub(in crate::bot) async fn init(
                     reply.embed(embed)
                 }
             }
-            Err(e) => error_reply(
-                "Error Initializing Jinx",
-                format!("Error verifying API key: {e}"),
-            ),
+            Err(e) => error_reply("Error Initializing Jinx", format!("Error verifying API key: {e}")),
         }
     } else {
         // user has given us some mystery garbage value for their API key
-        debug!(
-            "invalid API key provided in {}: \"{}\"",
-            guild_id.get(),
-            api_key
-        ); // log it to try and diagnose why people have trouble with the initial setup
+        debug!("invalid API key provided in {}: \"{}\"", guild_id.get(), api_key); // log it to try and diagnose why people have trouble with the initial setup
         error_reply(
             "Error Initializing Jinx",
             "Provided API key appears to be invalid. API keys should look like `sk_9bba2064ee8c20aa4fd6b015eed2001a`. If you need help, bot setup documentation can be found [here](<https://github.com/zkxs/jinx#installation>).",