clippy: changes from nightly clippy

all of this is embeding teh var into teh format macro

src/bin/cleanup_committee.rs

@@ -45,7 +45,7 @@ async fn main() {
   }
 
   if let Err(why) = client.start().await {
-    println!("Client error: {:?}", why);
+    println!("Client error: {why:?}");
   }
 }
 

src/bin/update_committee.rs

@@ -40,7 +40,7 @@ async fn main() {
   }
 
   if let Err(why) = client.start().await {
-    println!("Client error: {:?}", why);
+    println!("Client error: {why:?}");
   }
 }
 

src/bin/update_data.rs

@@ -42,7 +42,7 @@ async fn main() {
   }
 
   if let Err(why) = client.start().await {
-    println!("Client error: {:?}", why);
+    println!("Client error: {why:?}");
   }
 }
 

src/bin/update_server-icon.rs

@@ -39,7 +39,7 @@ async fn main() {
   }
 
   if let Err(why) = client.start().await {
-    println!("Client error: {:?}", why);
+    println!("Client error: {why:?}");
   }
 }
 

src/bin/update_users.rs

@@ -40,7 +40,7 @@ async fn main() {
   }
 
   if let Err(why) = client.start().await {
-    println!("Client error: {:?}", why);
+    println!("Client error: {why:?}");
   }
 }
 

src/commands/add_server.rs

@@ -76,8 +76,8 @@ pub async fn run(command: &CommandInteraction, ctx: &Context) -> String {
   match add_server(&db, ctx, &server_data).await {
     Ok(_) => {}
     Err(e) => {
-      println!("{:?}", e);
+      println!("{e:?}");
-      return format!("Failure to insert into Servers {:?}", server_data);
+      return format!("Failure to insert into Servers {server_data:?}");
     }
   }
 

src/commands/count.rs

@@ -52,7 +52,7 @@ pub mod committee {
     for (count, name) in cs {
       let leading = if count < 10 { " " } else { "" };
 
-      let line = format!("{}{} {}", leading, count, name);
+      let line = format!("{leading}{count} {name}");
 
       let length = line.len() + 1;
 
@@ -146,7 +146,7 @@ pub mod servers {
         ""
       };
 
-      let line = format!("{}{} {}{} {}", current_leading, current, past_leading, past, name);
+      let line = format!("{current_leading}{current} {past_leading}{past} {name}");
 
       let length = line.len() + 1;
 

src/commands/minecraft.rs

@@ -75,14 +75,14 @@ pub(crate) mod user {
           Ok(_) => {}
           Err(e) => {
             dbg!("{:?}", e);
-            return format!("Failure to minecraft username {:?}", username);
+            return format!("Failure to minecraft username {username:?}");
           }
         }
         username_mc = username.to_string();
       } else {
         match get_minecraft_bedrock(username, &config.minecraft_mcprofile).await {
           None => {
-            return format!("No UID found for {:?}", username);
+            return format!("No UID found for {username:?}");
           }
           Some(x) => {
             match add_minecraft_bedrock(&db, &command.user.id, &x.floodgateuid).await {
@@ -238,7 +238,7 @@ pub(crate) mod server {
       match add_server(&db, &g_id, &server_minecraft).await {
         Ok(_) => {}
         Err(e) => {
-          println!("{:?}", e);
+          println!("{e:?}");
           return format!("Failure to insert into Minecraft {} {}", &g_id, &server_minecraft);
         }
       }
@@ -375,7 +375,7 @@ pub(crate) mod server {
       match server_remove(&db, &g_id, &server_minecraft).await {
         Ok(_) => {}
         Err(e) => {
-          println!("{:?}", e);
+          println!("{e:?}");
           return format!("Failure to insert into Minecraft {} {}", &g_id, &server_minecraft);
         }
       }

src/commands/role_adder.rs

@@ -79,8 +79,8 @@ pub mod edit {
     match add_server(&db, &server_data, delete).await {
       Ok(_) => {}
       Err(e) => {
-        println!("{:?}", e);
+        println!("{e:?}");
-        return format!("Failure to insert into Servers {:?}", server_data);
+        return format!("Failure to insert into Servers {server_data:?}");
       }
     }
 
@@ -101,9 +101,9 @@ pub mod edit {
     }
 
     if delete {
-      format!("Removed {} + {} = {}", role_a_name, role_b_name, role_c_name)
+      format!("Removed {role_a_name} + {role_b_name} = {role_c_name}")
     } else {
-      format!("Added {} + {} = {}", role_a_name, role_b_name, role_c_name)
+      format!("Added {role_a_name} + {role_b_name} = {role_c_name}")
     }
   }
 
@@ -179,13 +179,13 @@ pub mod tools {
 
       if !roles_add.is_empty() {
         if let Err(e) = new_data.add_roles(&ctx, &roles_add).await {
-          println!("{:?}", e);
+          println!("{e:?}");
         }
       }
 
       if !roles_remove.is_empty() {
         if let Err(e) = new_data.remove_roles(&ctx, &roles_remove).await {
-          println!("{:?}", e);
+          println!("{e:?}");
         }
       }
     }

src/commands/server_icon.rs

@@ -207,7 +207,7 @@ pub(crate) mod user {
 
         // the `` is so that the numbers will be rendered in monospaced font
         // the <> is to suppress the URL embed
-        let line = format!("``{}{}`` [{}](<{}>)", current_leading, times, name, url);
+        let line = format!("``{current_leading}{times}`` [{name}](<{url}>)");
 
         let length = line.len() + 1;
 

src/commands/wolves.rs

@@ -115,7 +115,7 @@ pub mod link {
       }
     }
 
-    format!("Verification email sent to {}, it may take up to 15 min for it to arrive. If it takes longer check the Junk folder.", email)
+    format!("Verification email sent to {email}, it may take up to 15 min for it to arrive. If it takes longer check the Junk folder.")
   }
 
   pub async fn get_server_member_discord(db: &Pool<Sqlite>, user: &UserId) -> Option<Wolves> {
@@ -365,12 +365,12 @@ pub mod verify {
             "Discord username linked to Wolves".to_string()
           }
           Err(e) => {
-            println!("{:?}", e);
+            println!("{e:?}");
             "Failed to save, please try /link_wolves again".to_string()
           }
         };
       }
-      Err(e) => println!("{:?}", e),
+      Err(e) => println!("{e:?}"),
     }
 
     "Failed to verify".to_string()
@@ -427,7 +427,7 @@ pub mod verify {
             }
 
             if let Err(e) = member.add_roles(&ctx, &roles).await {
-              println!("{:?}", e);
+              println!("{e:?}");
             }
           }
         }
@@ -443,7 +443,7 @@ pub mod verify {
         WHERE committee LIKE ?1
         "#,
     )
-    .bind(format!("%{}%", wolves_id))
+    .bind(format!("%{wolves_id}%"))
     .fetch_all(db)
     .await
     .unwrap_or_else(|e| {

src/common/database.rs

@@ -225,7 +225,7 @@ pub async fn db_init(config: &Config) -> Result<Pool<Sqlite>, Error> {
   let pool = SqlitePoolOptions::new()
     .max_connections(5)
     .connect_with(
-      SqliteConnectOptions::from_str(&format!("sqlite://{}", database))?
+      SqliteConnectOptions::from_str(&format!("sqlite://{database}"))?
         .foreign_keys(true)
         .create_if_missing(true),
     )

src/common/minecraft.rs

@@ -152,7 +152,7 @@ pub async fn get_minecraft_config_server(db: &Pool<Sqlite>, g_id: GuildId) -> Ve
 }
 
 pub async fn whitelist_update(add: &Vec<(String, bool)>, server: &str, token: &str) {
-  println!("Update whitelist for {}", server);
+  println!("Update whitelist for {server}");
   let url_base = format!("https://panel.games.skynet.ie/api/client/servers/{server}");
   let bearer = format!("Bearer {token}");
 

src/common/renderer.rs

@@ -179,7 +179,7 @@ impl Renderer {
   }
 
   fn set_color(&self, svg: &str, color: &String) -> String {
-    svg.replace("fill=\"currentColor\"", &format!("fill=\"#{}\"", color))
+    svg.replace("fill=\"currentColor\"", &format!("fill=\"#{color}\""))
   }
 
   fn get_svg_data(&self, fi: &Path) -> Result<String> {

src/common/set_roles.rs

@@ -71,7 +71,7 @@ pub mod normal {
           }
 
           if let Err(e) = member.add_roles(ctx, &roles).await {
-            println!("{:?}", e);
+            println!("{e:?}");
           }
         } else {
           // old and never
@@ -86,13 +86,13 @@ pub mod normal {
             roles_set.current_rem += 1;
             // if theya re not a current member and have the role then remove it
             if let Err(e) = member.remove_role(ctx, role_current).await {
-              println!("{:?}", e);
+              println!("{e:?}");
             }
           }
         }
         for role in remove_roles.iter().flatten() {
           if let Err(e) = member.remove_role(ctx, role).await {
-            println!("{:?}", e);
+            println!("{e:?}");
           }
         }
       }
@@ -148,7 +148,7 @@ pub mod normal {
       Ok(_) => {}
       Err(e) => {
         println!("Failure to insert into {}", server.get());
-        println!("{:?}", e);
+        println!("{e:?}");
       }
     }
   }
@@ -471,8 +471,8 @@ pub mod committee {
     {
       Ok(_) => {}
       Err(e) => {
-        println!("Failure to insert into Wolves {:?}", role);
+        println!("Failure to insert into Wolves {role:?}");
-        println!("{:?}", e);
+        println!("{e:?}");
       }
     }
   }
@@ -489,7 +489,7 @@ pub mod committee {
     .await
     .unwrap_or_else(|e| {
       println!("Failure to get Roles from committee_roles");
-      println!("{:?}", e);
+      println!("{e:?}");
       vec![]
     })
   }

src/common/wolves.rs

@@ -38,8 +38,8 @@ async fn add_users_wolves(db: &Pool<Sqlite>, user: &WolvesResultUserMin) {
   {
     Ok(_) => {}
     Err(e) => {
-      println!("Failure to insert into Wolves {:?}", user);
+      println!("Failure to insert into Wolves {user:?}");
-      println!("{:?}", e);
+      println!("{e:?}");
     }
   }
 }
@@ -145,7 +145,7 @@ pub mod cns {
       Ok(_) => {}
       Err(e) => {
         println!("Failure to set server name {}", server.get());
-        println!("{:?}", e);
+        println!("{e:?}");
       }
     }
   }
@@ -184,7 +184,7 @@ pub mod cns {
       Ok(_) => {}
       Err(e) => {
         println!("Failure to insert into ServerMembers {}  {:?}", server.get(), user);
-        println!("{:?}", e);
+        println!("{e:?}");
       }
     }
   }
@@ -263,8 +263,8 @@ pub mod committees {
     {
       Ok(_) => {}
       Err(e) => {
-        println!("Failure to insert into Committees {:?}", committee);
+        println!("Failure to insert into Committees {committee:?}");
-        println!("{:?}", e);
+        println!("{e:?}");
       }
     }
   }

src/main.rs

@@ -81,7 +81,7 @@ impl EventHandler for Handler {
       }
 
       if let Err(e) = new_member.add_roles(&ctx, &roles).await {
-        println!("{:?}", e);
+        println!("{e:?}");
       }
     } else {
       let tmp = get_committee(&db, config_server.wolves_id).await;
@@ -146,7 +146,7 @@ Sign up on [UL Wolves]({}) and go to https://discord.com/channels/{}/{} and use
     {
       Ok(_) => {}
       Err(e) => {
-        println!("{:?}", e)
+        println!("{e:?}")
       }
     }
 
@@ -154,7 +154,7 @@ Sign up on [UL Wolves]({}) and go to https://discord.com/channels/{}/{} and use
     match config.committee_server.set_commands(&ctx.http, vec![commands::count::committee::register()]).await {
       Ok(_) => {}
       Err(e) => {
-        println!("{:?}", e)
+        println!("{e:?}")
       }
     }
 
@@ -173,7 +173,7 @@ Sign up on [UL Wolves]({}) and go to https://discord.com/channels/{}/{} and use
     {
       Ok(_) => {}
       Err(e) => {
-        println!("{:?}", e)
+        println!("{e:?}")
       }
     }
   }
@@ -260,7 +260,7 @@ Sign up on [UL Wolves]({}) and go to https://discord.com/channels/{}/{} and use
       };
 
       if let Err(why) = command.edit_response(&ctx.http, EditInteractionResponse::new().content(content)).await {
-        println!("Cannot respond to slash command: {}", why);
+        println!("Cannot respond to slash command: {why}");
       }
     }
   }
@@ -312,6 +312,6 @@ async fn main() {
   // Shards will automatically attempt to reconnect, and will perform
   // exponential backoff until it reconnects.
   if let Err(why) = client.start().await {
-    println!("Client error: {:?}", why);
+    println!("Client error: {why:?}");
   }
 }