clippy

Author: lovasoa

build.rs

@@ -36,13 +36,13 @@ fn make_client() -> awc::Client {
 
 /// Creates a file with inlined remote files included
 async fn download_deps(client: Rc<awc::Client>, filename: &str) {
-    let path_in = format!("sqlpage/{}", filename);
+    let path_in = format!("sqlpage/{filename}");
     let out_dir = PathBuf::from(std::env::var("OUT_DIR").unwrap());
     let path_out: PathBuf = out_dir.join(filename);
     // Generate outfile by reading infile and interpreting all comments
     // like "/* !include https://... */" as a request to include the contents of
     // the URL in the generated file.
-    println!("cargo:rerun-if-changed={}", path_in);
+    println!("cargo:rerun-if-changed={path_in}");
     let original = File::open(path_in).unwrap();
     process_input_file(&client, &path_out, original).await;
     std::fs::write(
@@ -68,7 +68,7 @@ async fn process_input_file(client: &awc::Client, path_out: &Path, original: Fil
             }
             outfile.write_all(b"\n").unwrap();
         } else {
-            writeln!(outfile, "{}", line).unwrap();
+            writeln!(outfile, "{line}").unwrap();
         }
     }
     outfile
@@ -119,10 +119,9 @@ async fn download_url_to_path(client: &awc::Client, url: &str, path: &Path) {
                     let path = make_url_path(url);
                     panic!(
                         "We need to download external frontend dependencies to build the static frontend. \n\
-                        Could not download static asset after {} attempts. You can manually download the file with: \n\
+                        Could not download static asset after {max_attempts} attempts. You can manually download the file with: \n\
                         curl {url:?} > {path:?} \n\
-                        {err}",
-                        max_attempts
+                        {err}"
                     );
                 }
                 sleep(Duration::from_secs(1)).await;

src/main.rs

@@ -8,7 +8,7 @@ use sqlpage::{
 async fn main() {
     init_logging();
     if let Err(e) = start().await {
-        log::error!("{:?}", e);
+        log::error!("{e:?}");
         std::process::exit(1);
     }
 }
@@ -38,6 +38,6 @@ fn init_logging() {
         Err(dotenvy::Error::Io(e)) if e.kind() == std::io::ErrorKind::NotFound => log::debug!(
             "No .env file found, using only environment variables and configuration files"
         ),
-        Err(e) => log::error!("Error loading .env file: {}", e),
+        Err(e) => log::error!("Error loading .env file: {e}"),
     }
 }

src/render.rs

@@ -92,9 +92,10 @@ impl HeaderContext {
     ) -> Self {
         let mut response = HttpResponseBuilder::new(StatusCode::OK);
         response.content_type("text/html; charset=utf-8");
+        let tpl = &app_state.config.content_security_policy;
         request_context
             .content_security_policy
-            .apply_to_response(&mut response);
+            .apply_to_response(tpl, &mut response);
         Self {
             app_state,
             request_context,

src/webserver/http.rs

@@ -177,9 +177,7 @@ async fn render_sql(
     actix_web::rt::spawn(async move {
         let request_context = RequestContext {
             is_embedded: req_param.get_variables.contains_key("_sqlpage_embed"),
-            content_security_policy: ContentSecurityPolicy::new(
-                app_state.config.content_security_policy.clone(),
-            ),
+            content_security_policy: ContentSecurityPolicy::with_random_nonce(),
         };
         let mut conn = None;
         let database_entries_stream =

tests/index.rs

@@ -94,7 +94,7 @@ async fn test_concurrent_requests() {
         .map(|i| {
             let component = components[i % components.len()];
             req_path_with_app_data(
-                format!("/tests/any_component.sql?component={}", component),
+                format!("/tests/any_component.sql?component={component}"),
                 app_data.clone(),
             )
         })
@@ -185,7 +185,7 @@ async fn test_files() {
             // skipping because the test does not support the database
             continue;
         }
-        let req_str = format!("/{}?x=1", test_file_path_string);
+        let req_str = format!("/{test_file_path_string}?x=1");
         let resp = req_path_with_app_data(&req_str, app_data.clone())
             .await
             .unwrap_or_else(|e| panic!("Failed to get response for {req_str}: {e}"));
@@ -966,16 +966,15 @@ pub fn test_config() -> AppConfig {
     let db_url = test_database_url();
     serde_json::from_str::<AppConfig>(&format!(
         r#"{{
-        "database_url": "{}",
+        "database_url": "{db_url}",
         "max_database_pool_connections": 1,
         "database_connection_retries": 3,
         "database_connection_acquire_timeout_seconds": 15,
         "allow_exec": true,
         "max_uploaded_file_size": 123456,
         "listen_on": "111.111.111.111:1",
         "system_root_ca_certificates" : false
-    }}"#,
-        db_url
+    }}"#
     ))
     .unwrap()
 }