Merge branch 'cli-testability-improvements'

Author: AnthonyMichaelTDM

Cargo.lock

@@ -532,10 +532,7 @@ pub fn register(
     mail::auth_register::send(
         mailer,
         &user.email,
-        &format!(
-            "http://localhost:3000/activate?token={token}",
-            token = token
-        ),
+        &format!("http://localhost:3000/activate?token={token}"),
     );
 
     Ok(())
@@ -645,10 +642,7 @@ pub fn forgot_password(
         )
         .unwrap();
 
-        let link = &format!(
-            "http://localhost:3000/reset?token={reset_token}",
-            reset_token = reset_token
-        );
+        let link = &format!("http://localhost:3000/reset?token={reset_token}");
         mail::auth_recover_existent_account::send(mailer, &user.email, link);
     } else {
         let link = &"http://localhost:300/register".to_string();

create-rust-app/src/auth/controller.rs

@@ -13,8 +13,7 @@ Someone requested a password reset for the account associated with this email.
 Please visit this link to reset your password:
 {link}
 (valid for 24 hours)
-"#,
-        link = link
+"#
     );
     let html = format!(
         r#"
@@ -26,8 +25,7 @@ Someone requested a password reset for the account associated with this email.
 Please visit this link to reset your password:
 {link}
 (valid for 24 hours)
-"#,
-        link = link
+"#
     );
 
     mailer.send(to_email, subject, &text, &html);

create-rust-app/src/auth/mail/auth_recover_existent_account.rs

@@ -12,8 +12,7 @@ Hello,
 Someone requested a password reset for the account associated with this email, but no account exists!
 If this was intentional, you can register for a new account using the link below:
 {link}
-"#,
-        link = link
+"#
     );
     let html = format!(
         r#"
@@ -24,8 +23,7 @@ Hello,
 Someone requested a password reset for the account associated with this email, but no account exists!
 If this was intentional, you can register for a new account using the link below:
 {link}
-"#,
-        link = link
+"#
     );
 
     mailer.send(to_email, subject, &text, &html);

create-rust-app/src/auth/mail/auth_recover_nonexistent_account.rs

@@ -11,8 +11,7 @@ Hello,
 
 Please follow the link below to complete your registration:
 {link}
-"#,
-        link = link
+"#
     );
     let html = format!(
         r#"
@@ -22,8 +21,7 @@ Hello,
 
 Please follow the link below to complete your registration:
 {link}
-"#,
-        link = link
+"#
     );
 
     mailer.send(to_email, subject, &text, &html);

create-rust-app/src/auth/mail/auth_register.rs

@@ -212,7 +212,7 @@ impl Storage {
             .map_err(|err| {
                 self.error_string(
                     "Could not delete objects",
-                    format!("{:#?}", keys),
+                    format!("{keys:#?}"),
                     err.to_string(),
                 )
             })?;

create-rust-app/src/storage/mod.rs

@@ -13,7 +13,7 @@ pub fn render_single_page_application(route: &str, view: &str) -> Scope {
     let route = route.strip_prefix('/').unwrap_or(route);
     let view = view.strip_prefix('/').unwrap_or(view);
 
-    actix_web::web::scope(&format!("/{}{{tail:(/.*)?}}", route))
+    actix_web::web::scope(&format!("/{route}{{tail:(/.*)?}}"))
         .app_data(Data::new(SinglePageApplication {
             view_name: view.to_string(),
         }))

create-rust-app/src/util/actix_web_utils.rs

@@ -15,7 +15,7 @@ lazy_static! {
         let mut tera = match Tera::new("backend/views/**/*.html") {
             Ok(t) => t,
             Err(e) => {
-                println!("Parsing error(s): {}", e);
+                println!("Parsing error(s): {e}");
                 ::std::process::exit(1);
             }
         };

create-rust-app/src/util/template_utils.rs

@@ -18,7 +18,7 @@ console = "0.15.5"
 dialoguer = "0.10.3"
 indoc = "1.0.8"
 rust-embed = "6.4.2"
-structopt = "0.3.26"
+clap = {version = "4.1", features = ["wrap_help", "derive", "cargo"]}
 toml = "0.5.11"
 tsync = "1"
 

create-rust-app_cli/Cargo.toml

@@ -25,8 +25,8 @@ pub fn create(name: &str, up: &str, down: &str) -> Result<()> {
     migrations_dir.push(&migration_dir_name);
     ensure_directory(&migrations_dir, false)?;
 
-    let up_file = PathBuf::from(format!("migrations/{}/up.sql", migration_dir_name));
-    let down_file = PathBuf::from(format!("migrations/{}/down.sql", migration_dir_name));
+    let up_file = PathBuf::from(format!("migrations/{migration_dir_name}/up.sql"));
+    let down_file = PathBuf::from(format!("migrations/{migration_dir_name}/down.sql"));
     ensure_file(&up_file, Some(up))?;
     ensure_file(&down_file, Some(down))?;