Switch to Rust 2024 edition.

Cargo.toml

@@ -9,7 +9,7 @@ categories = ["web-programming::http-server", "command-line-utilities"]
 keywords = ["web", "server", "http", "templating", "handlebars"]
 readme = "README.md"
 license = "GPL-3.0"
-edition = "2021"
+edition = "2024"
 include = [
     "src/**/*",
     "Cargo.toml",

benches/load_test.rs

@@ -4,9 +4,9 @@ use actix_web::error::PayloadError;
 use actix_web::http::StatusCode;
 use actix_web::test::unused_addr;
 use bytes::{Bytes, BytesMut};
-use criterion::{criterion_main, BenchmarkId, Criterion};
+use criterion::{BenchmarkId, Criterion, criterion_main};
 use futures::FutureExt;
-use futures::{future, Stream, TryStreamExt};
+use futures::{Stream, TryStreamExt, future};
 use lazy_static::lazy_static;
 use mime_guess::MimeGuess;
 use operator::content::ContentDirectory;

src/cli.rs

@@ -257,12 +257,9 @@ mod tests {
             );
             let output_as_str = str::from_utf8(output.as_slice()).expect("Output was not UTF-8");
             assert_eq!(
-                output_as_str,
-                expected_output,
+                output_as_str, expected_output,
                 "Template rendering for `{}` did not produce the expected output (\"{}\"), instead got \"{}\"",
-                template,
-                expected_output,
-                output_as_str
+                template, expected_output, output_as_str
             );
         }
     }
@@ -303,13 +300,10 @@ mod tests {
         );
         let output_as_str = str::from_utf8(output.as_slice()).expect("Output was not UTF-8");
         assert_eq!(
-                output_as_str,
-                expected_output,
-                "Template rendering for `{}` did not produce the expected output (\"{}\"), instead got \"{}\"",
-                template,
-                expected_output,
-                output_as_str
-            );
+            output_as_str, expected_output,
+            "Template rendering for `{}` did not produce the expected output (\"{}\"), instead got \"{}\"",
+            template, expected_output, output_as_str
+        );
     }
 
     #[test]
@@ -329,12 +323,9 @@ mod tests {
         );
         let output_as_str = str::from_utf8(output.as_slice()).expect("Output was not UTF-8");
         assert_eq!(
-            output_as_str,
-            expected_output,
+            output_as_str, expected_output,
             "Template rendering for content at '{}' did not produce the expected output (\"{}\"), instead got \"{}\"",
-            route,
-            expected_output,
-            output_as_str
+            route, expected_output, output_as_str
         );
     }
 
@@ -355,12 +346,9 @@ mod tests {
         );
         let output_as_str = str::from_utf8(output.as_slice()).expect("Output was not UTF-8");
         assert_eq!(
-            output_as_str,
-            expected_output,
+            output_as_str, expected_output,
             "Template rendering for content at '{}' did not produce the expected output (\"{}\"), instead got \"{}\"",
-            route,
-            expected_output,
-            output_as_str
+            route, expected_output, output_as_str
         );
     }
 

src/content/body.rs

@@ -5,8 +5,8 @@
 use super::StreamError;
 use crate::bug_message;
 use bytes::Bytes;
-use futures::future::{Future, FutureExt, LocalBoxFuture};
 use futures::Stream;
+use futures::future::{Future, FutureExt, LocalBoxFuture};
 use std::cmp;
 use std::fs::File;
 use std::io::ErrorKind::Interrupted;

src/content/content_directory.rs

@@ -122,7 +122,7 @@ impl ContentFile {
                 return Err(ContentFileError(format!(
                     "Non-unicode directory root (path is similar to '{}')",
                     content_directory_root.display(),
-                )))
+                )));
             }
         };
 

src/content/content_engine.rs

@@ -7,8 +7,8 @@ use super::*;
 use crate::bug_message;
 use handlebars::{self, Handlebars};
 use mime_guess::MimeGuess;
-use std::collections::hash_map::Entry;
 use std::collections::HashMap;
+use std::collections::hash_map::Entry;
 use std::path::Path;
 use std::sync::{Arc, RwLock};
 use thiserror::Error;
@@ -149,13 +149,13 @@ where
                     return Err(ContentLoadingError::ContentFileNameError(format!(
                         "Content file name '{}' has too many extensions.",
                         entry.relative_path
-                    )))
+                    )));
                 }
                 [] => {
                     return Err(ContentLoadingError::ContentFileNameError(format!(
                         "Content file names must have extensions, but '{}' does not.",
                         entry.relative_path
-                    )))
+                    )));
                 }
             }
         }
@@ -222,14 +222,12 @@ where
             // have the executable bit set. They are evaluated when rendered.
             [first_extension, Self::HANDLEBARS_FILE_EXTENSION] => {
                 if content.is_executable {
-                    return Err(ContentLoadingError::ContentFileNameError(
-                        format!(
-                            "The content file '{}' appears to be a handlebars file (because it ends in '.{}'), \
+                    return Err(ContentLoadingError::ContentFileNameError(format!(
+                        "The content file '{}' appears to be a handlebars file (because it ends in '.{}'), \
                             but it is also executable. It must be one or the other.",
-                            content.relative_path,
-                            Self::HANDLEBARS_FILE_EXTENSION,
-                        ),
-                    ));
+                        content.relative_path,
+                        Self::HANDLEBARS_FILE_EXTENSION,
+                    )));
                 }
 
                 let mime = MimeGuess::from_ext(first_extension)
@@ -480,12 +478,9 @@ mod tests {
             let actual_output = media_to_string(rendered);
 
             assert_eq!(
-                actual_output,
-                expected_output,
+                actual_output, expected_output,
                 "Template rendering for `{}` did not produce the expected output (\"{}\"), instead got \"{}\"",
-                template,
-                expected_output,
-                actual_output,
+                template, expected_output, actual_output,
             );
         }
     }
@@ -539,12 +534,9 @@ mod tests {
         let actual_output = media_to_string(rendered);
 
         assert_eq!(
-            actual_output,
-            expected_output,
+            actual_output, expected_output,
             "Template rendering for `{}` did not produce the expected output (\"{}\"), instead got \"{}\"",
-            template,
-            expected_output,
-            actual_output,
+            template, expected_output, actual_output,
         );
     }
 
@@ -573,12 +565,9 @@ mod tests {
         let actual_output = media_to_string(rendered);
 
         assert_eq!(
-            actual_output,
-            expected_output,
+            actual_output, expected_output,
             "Rendering content at '{}' did not produce the expected output (\"{}\"), instead got \"{}\"",
-            route,
-            expected_output,
-            actual_output,
+            route, expected_output, actual_output,
         );
     }
 
@@ -639,12 +628,9 @@ mod tests {
         let actual_output = media_to_string(rendered);
 
         assert_eq!(
-            actual_output,
-            expected_output,
+            actual_output, expected_output,
             "Template rendering for `{}` did not produce the expected output (\"{}\"), instead got \"{}\"",
-            template,
-            expected_output,
-            actual_output,
+            template, expected_output, actual_output,
         );
     }
 
@@ -709,12 +695,9 @@ mod tests {
         let actual_output = media_to_string(rendered);
 
         assert_eq!(
-            actual_output,
-            expected_output,
+            actual_output, expected_output,
             "Template rendering for `{}` did not produce the expected output (\"{}\"), instead got \"{}\"",
-            template,
-            expected_output,
-            actual_output,
+            template, expected_output, actual_output,
         );
     }
 
@@ -750,12 +733,9 @@ mod tests {
         let actual_output = media_to_string(rendered);
 
         assert_eq!(
-            actual_output,
-            expected_output,
+            actual_output, expected_output,
             "Template rendering for `{}` did not produce the expected output (\"{}\"), instead got \"{}\"",
-            template,
-            expected_output,
-            actual_output,
+            template, expected_output, actual_output,
         );
     }
 
@@ -949,12 +929,9 @@ mod tests {
         let actual_output = media_to_string(rendered);
 
         assert_eq!(
-            actual_output,
-            expected_output,
+            actual_output, expected_output,
             "Rendering content at '{}' did not produce the expected output (\"{}\"), instead got \"{}\"",
-            route,
-            expected_output,
-            actual_output,
+            route, expected_output, actual_output,
         );
     }
 
@@ -980,12 +957,9 @@ mod tests {
         let actual_output = media_to_string(rendered);
 
         assert_eq!(
-            actual_output,
-            expected_output1,
+            actual_output, expected_output1,
             "Rendering content at '{}' did not produce the expected output (\"{}\"), instead got \"{}\"",
-            route1,
-            expected_output1,
-            actual_output,
+            route1, expected_output1, actual_output,
         );
 
         let route2 = route("/subdirectory/pwd");
@@ -1003,12 +977,9 @@ mod tests {
         let actual_output = media_to_string(rendered);
 
         assert_eq!(
-            actual_output,
-            expected_output2,
+            actual_output, expected_output2,
             "Rendering content at '{}' did not produce the expected output (\"{}\"), instead got \"{}\"",
-            route2,
-            expected_output2,
-            actual_output,
+            route2, expected_output2, actual_output,
         );
     }
 
@@ -1099,12 +1070,9 @@ mod tests {
         let actual_output = media_to_string(rendered);
 
         assert_eq!(
-            actual_output,
-            expected_output,
+            actual_output, expected_output,
             "Rendering content at '{}' did not produce the expected output (\"{}\"), instead got \"{}\"",
-            route,
-            expected_output,
-            actual_output,
+            route, expected_output, actual_output,
         );
     }
 

src/content/content_index.rs

@@ -82,7 +82,7 @@ impl ContentIndexEntries {
                                 failed_route: route.clone(),
                                 message: format!(
                                     "There is already a resource at '{conficting_route}', but that needs to be a directory to accommodate the new route.",
-                                )
+                                ),
                             });
                         }
                     };

src/content/content_item.rs

@@ -284,9 +284,9 @@ impl Executable {
 mod tests {
     use super::super::test_lib::*;
     use super::*;
+    use crate::ServerInfo;
     use crate::content::content_index::ContentIndexEntries;
     use crate::test_lib::*;
-    use crate::ServerInfo;
     use ::mime;
     use maplit::hashmap;
     use std::fs;

src/content/content_registry.rs

@@ -91,7 +91,7 @@ impl Render for ContentRepresentations {
                                 )))
                             } else {
                                 Ok(rendered)
-                            }
+                            };
                         }
                         Err(error) => {
                             log::warn!("Rendering failure: {error}");

src/content/handlebars_helpers/get.rs

@@ -122,12 +122,16 @@ where
                 let modified_context_data_as_json =
                     mem::take(Rc::make_mut(modified_context).data_mut());
                 match modified_context_data_as_json {
-                    serde_json::Value::Object(modified_context_data_as_json_map) => modified_context_data_as_json_map,
+                    serde_json::Value::Object(modified_context_data_as_json_map) => {
+                        modified_context_data_as_json_map
+                    }
                     _ => {
-                        return Err(handlebars::RenderError::from(handlebars::RenderErrorReason::Other(format!(
-                            "The `get \"{route}\"` helper call failed because the pre-existing handlebars render context \
+                        return Err(handlebars::RenderError::from(
+                            handlebars::RenderErrorReason::Other(format!(
+                                "The `get \"{route}\"` helper call failed because the pre-existing handlebars render context \
                             was not an object (it was `{modified_context_data_as_json}`)."
-                        ))))
+                            )),
+                        ));
                     }
                 }
             }

src/http.rs

@@ -2,9 +2,9 @@ use crate::content::*;
 use crate::*;
 use actix_rt::System;
 use actix_web::error::QueryPayloadError;
-use actix_web::http::header::{self, Header, HeaderMap};
 use actix_web::http::HeaderValue;
-use actix_web::{http, web, App, HttpRequest, HttpResponse, HttpServer};
+use actix_web::http::header::{self, Header, HeaderMap};
+use actix_web::{App, HttpRequest, HttpResponse, HttpServer, http, web};
 use futures::TryStreamExt;
 use mime_guess::MimeGuess;
 use std::cmp::Ordering;
@@ -1266,7 +1266,8 @@ mod tests {
             "Response status was not 404"
         );
         assert_eq!(
-            response_body, "404 /not/a/real/path/so/this/should/404\nquery parameters:\nrequest headers:\n  accept: text/plain",
+            response_body,
+            "404 /not/a/real/path/so/this/should/404\nquery parameters:\nrequest headers:\n  accept: text/plain",
             "Response body was incorrect"
         );
     }

tests/integration_tests.rs

@@ -2,7 +2,7 @@
 mod lib;
 
 use actix_web::client::Client as HttpClient;
-use actix_web::http::{uri, Method, StatusCode};
+use actix_web::http::{Method, StatusCode, uri};
 use lib::*;
 use operator::content::ContentDirectory;
 use operator::test_lib::*;