fix: codegen clippy

cargo-shuttle/src/client.rs

@@ -200,7 +200,7 @@ impl Client {
 
     async fn ws_get(&self, path: String) -> Result<WebSocketStream<MaybeTlsStream<TcpStream>>> {
         let ws_scheme = self.api_url.clone().replace("http", "ws");
-        let url = format!("{}{}", ws_scheme, path);
+        let url = format!("{ws_scheme}{path}");
         let mut request = url.into_client_request()?;
 
         if let Some(ref api_key) = self.api_key {

cargo-shuttle/src/init.rs

@@ -873,7 +873,7 @@ pub fn cargo_init(path: PathBuf) -> Result<()> {
     // Mimic `cargo init` behavior and log status or error to shell
     cargo_config
         .shell()
-        .status("Created", format!("{} (shuttle) package", init_result))?;
+        .status("Created", format!("{init_result} (shuttle) package"))?;
 
     Ok(())
 }
@@ -890,7 +890,7 @@ pub fn cargo_shuttle_init(path: PathBuf, framework: Framework) -> Result<()> {
     cargo_doc["package"]["publish"] = value(false);
 
     // Get `[dependencies]` table
-    let mut dependencies = cargo_doc["dependencies"]
+    let dependencies = cargo_doc["dependencies"]
         .as_table_mut()
         .expect("manifest to have a dependencies table");
 
@@ -910,7 +910,7 @@ pub fn cargo_shuttle_init(path: PathBuf, framework: Framework) -> Result<()> {
 
     // Set framework-specific dependencies to the `dependencies` table
     init_config.set_cargo_dependencies(
-        &mut dependencies,
+        dependencies,
         &manifest_path,
         &url,
         get_latest_dependency_version,
@@ -985,7 +985,7 @@ fn get_latest_dependency_version(
 ) -> String {
     let latest_version =
         get_latest_dependency(crate_name, flag_allow_prerelease, manifest_path, Some(url))
-            .unwrap_or_else(|_| panic!("Could not query the latest version of {}", crate_name));
+            .unwrap_or_else(|_| panic!("Could not query the latest version of {crate_name}"));
     let latest_version = latest_version
         .version()
         .expect("No latest shuttle-service version available");

cargo-shuttle/src/provisioner_server.rs

@@ -68,7 +68,7 @@ impl LocalProvisioner {
             env,
             is_ready_cmd,
         } = db_type_to_config(db_type);
-        let container_name = format!("shuttle_{}_{}", service_name, r#type);
+        let container_name = format!("shuttle_{service_name}_{type}");
 
         let container = match self.docker.inspect_container(&container_name, None).await {
             Ok(container) => {
@@ -297,7 +297,7 @@ fn print_layers(layers: &Vec<CreateImageInfo>) {
                 (Some(status), _) => status.to_string(),
                 _ => "Unknown".to_string(),
             };
-            println!("[{id} {}]", text);
+            println!("[{id} {text}]");
         } else {
             println!(
                 "{}",

codegen/src/shuttle_main/mod.rs

@@ -93,7 +93,7 @@ impl Loader {
     pub(crate) fn from_item_fn(item_fn: &mut ItemFn) -> Option<Self> {
         let fn_ident = item_fn.sig.ident.clone();
 
-        if fn_ident.clone().to_string() == "main".to_string() {
+        if fn_ident.to_string().as_str() == "main" {
             emit_error!(
                 fn_ident,
                 "shuttle_runtime::main functions cannot be named `main`"
@@ -127,15 +127,11 @@ impl Loader {
             })
             .collect();
 
-        if let Some(type_path) = check_return_type(item_fn.sig.clone()) {
-            Some(Self {
-                fn_ident: fn_ident.clone(),
-                fn_inputs: inputs,
-                fn_return: type_path,
-            })
-        } else {
-            None
-        }
+        check_return_type(item_fn.sig.clone()).map(|type_path| Self {
+            fn_ident: fn_ident.clone(),
+            fn_inputs: inputs,
+            fn_return: type_path,
+        })
     }
 }
 

common/src/models/project.rs

@@ -135,7 +135,7 @@ impl Display for State {
             State::Destroyed => write!(f, "{}", "destroyed".blue()),
             State::Errored { message } => {
                 writeln!(f, "{}", "errored".red())?;
-                write!(f, "\tmessage: {}", message)
+                write!(f, "\tmessage: {message}")
             }
         }
     }
@@ -199,9 +199,8 @@ pub fn get_table(projects: &Vec<Response>) -> String {
         format!(
             r#"
 These projects are linked to this account
-{}
+{table}
 "#,
-            table,
         )
     }
 }

common/src/models/secret.rs

@@ -38,9 +38,8 @@ pub fn get_table(secrets: &Vec<Response>) -> String {
 
         format!(
             r#"These secrets are linked to this service
-{}
+{table}
 "#,
-            table
         )
     }
 }

common/src/models/service.rs

@@ -46,7 +46,7 @@ impl Display for Detailed {
         let resources = get_resources_table(&self.resources);
         let secrets = secret::get_table(&self.secrets);
 
-        write!(f, "{}{}{}", deploys, resources, secrets)
+        write!(f, "{deploys}{resources}{secrets}")
     }
 }
 
@@ -82,7 +82,7 @@ URI:           {}
 
         let resources = get_resources_table(&self.resources);
 
-        write!(f, "{}{}", deployment, resources)
+        write!(f, "{deployment}{resources}")
     }
 }
 
@@ -150,9 +150,8 @@ fn get_resources_table(resources: &Vec<resource::Response>) -> String {
 
         format!(
             r#"These resources are linked to this service
-{}
+{table}
 "#,
-            table
         )
     }
 }

common/src/project.rs

@@ -99,13 +99,12 @@ impl Display for ProjectNameError {
             ProjectNameError::InvalidName(name) => write!(
                 f,
                 r#"
-`{}` is an invalid project name. project name must
+`{name}` is an invalid project name. project name must
 1. start and end with alphanumeric characters.
 2. only contain characters inside of the alphanumeric range, except for `-`, or `_`.
 3. not be empty.,
 4. not contain profanity.
 5. not be a reserved word."#,
-                name
             ),
         }
     }