Merge pull request #127 from mkantor/clippy-autofix

Apply all of clippy's autofixes.

Author: mkantor

src/content/content_directory.rs

@@ -148,17 +148,15 @@ impl ContentFile {
 
         let file = File::open(&absolute_content_file_path).map_err(|io_error| {
             ContentFileError(format!(
-                "Unable to open file '{}' in '{}' for reading: {}",
-                relative_path, root, io_error
+                "Unable to open file '{relative_path}' in '{root}' for reading: {io_error}"
             ))
         })?;
 
         let basename = absolute_content_file_path
             .file_name()
             .ok_or_else(|| {
                 ContentFileError(format!(
-                    "Unable to get basename of '{}' in '{}'",
-                    relative_path, root,
+                    "Unable to get basename of '{relative_path}' in '{root}'",
                 ))
             })?
             .to_str()

src/content/content_engine.rs

@@ -17,7 +17,7 @@ use thiserror::Error;
 #[derive(Error, Debug)]
 #[error(
   "Failed to register handlebars template{}.",
-  .source.name().map(|known_name| format!(" '{}'", known_name)).unwrap_or_default(),
+  .source.name().map(|known_name| format!(" '{known_name}'")).unwrap_or_default(),
 )]
 pub struct TemplateError {
     #[from]
@@ -257,8 +257,7 @@ where
                 let template_name = content.relative_path;
                 if handlebars_registry.has_template(&template_name) {
                     return Err(ContentLoadingError::Bug(format!(
-                        "More than one handlebars template has the name '{}'.",
-                        template_name,
+                        "More than one handlebars template has the name '{template_name}'.",
                     )));
                 }
                 handlebars_registry
@@ -313,8 +312,7 @@ where
                     // (not a directory). If it's the filesystem root then
                     // it is a directory.
                     ContentLoadingError::Bug(format!(
-                        "Failed to get a parent directory for the executable at '{}'.",
-                        absolute_path,
+                        "Failed to get a parent directory for the executable at '{absolute_path}'.",
                     ))
                 })?;
 

src/content/content_index.rs

@@ -70,7 +70,7 @@ impl ContentIndexEntries {
                         .0
                         // Non-leaf nodes in the index end with `/` (they
                         // represent directories).
-                        .entry(format!("{}/", path_component))
+                        .entry(format!("{path_component}/"))
                         .or_insert_with(|| ContentIndex::Directory(Self::new()));
 
                     node = match next_node {
@@ -81,8 +81,7 @@ impl ContentIndexEntries {
                             return Err(ContentIndexUpdateError {
                                 failed_route: route.clone(),
                                 message: format!(
-                                    "There is already a resource at '{}', but that needs to be a directory to accommodate the new route.",
-                                    conficting_route,
+                                    "There is already a resource at '{conficting_route}', but that needs to be a directory to accommodate the new route.",
                                 )
                             });
                         }
@@ -93,7 +92,7 @@ impl ContentIndexEntries {
                 match node.0.get(basename) {
                     Some(ContentIndex::Directory(..)) => Err(ContentIndexUpdateError {
                         failed_route: route.clone(),
-                        message: format!("There is already a directory at '{}'.", route),
+                        message: format!("There is already a directory at '{route}'."),
                     }),
                     Some(ContentIndex::Resource(..)) => {
                         // This route already exists, no need to do anything.

src/content/content_item.rs

@@ -249,8 +249,7 @@ impl Executable {
                     serde_json::Value::Object(base_render_data_as_json_map).to_string()
                 } else {
                     return Err(RenderingFailedError::Bug(format!(
-                        "Render data did not serialize to a JSON object, instead got `{}`.",
-                        base_render_data_as_json
+                        "Render data did not serialize to a JSON object, instead got `{base_render_data_as_json}`."
                     )));
                 }
             }
@@ -269,7 +268,7 @@ impl Executable {
             )
             .spawn()
             .map_err(|io_error| RenderingFailedError::ExecutableError {
-                message: format!("Unable to execute program: {}", io_error),
+                message: format!("Unable to execute program: {io_error}"),
                 program: self.program.clone(),
                 working_directory: self.working_directory.clone(),
             })?;

src/content/content_registry.rs

@@ -94,7 +94,7 @@ impl Render for ContentRepresentations {
                             }
                         }
                         Err(error) => {
-                            log::warn!("Rendering failure: {}", error);
+                            log::warn!("Rendering failure: {error}");
                             errors.push(error)
                         }
                     };

src/content/handlebars_helpers/get.rs

@@ -62,15 +62,13 @@ where
             .ok_or_else(|| {
                 handlebars::RenderErrorReason::Other(format!(
                     "The `get` helper's first argument must be a string (the route of the content \
-                    item to get), but it was `{}`.",
-                    param_0,
+                    item to get), but it was `{param_0}`.",
                 ))
             })?
             .parse::<Route>()
             .map_err(|error| {
                 handlebars::RenderErrorReason::Other(format!(
-                    "The `get` helper's first argument (`{}`) must be a valid route: {}",
-                    param_0, error,
+                    "The `get` helper's first argument (`{param_0}`) must be a valid route: {error}",
                 ))
             })?;
 
@@ -81,8 +79,7 @@ where
         let param_1_as_object = match param_1.map(|value| {
             value.as_object().ok_or_else(|| {
                 handlebars::RenderErrorReason::Other(format!(
-                    "Custom context provided to `get \"{}\"` must be an object, but it was `{}`.",
-                    route, value,
+                    "Custom context provided to `get \"{route}\"` must be an object, but it was `{value}`.",
                 ))
             })
         }) {
@@ -109,10 +106,7 @@ where
             });
 
         let content_item = content_engine.get_internal(&route).ok_or_else(|| {
-            handlebars::RenderErrorReason::Other(format!(
-                "No content found for `get \"{}\"`.",
-                route
-            ))
+            handlebars::RenderErrorReason::Other(format!("No content found for `get \"{route}\"`."))
         })?;
 
         let current_render_data = handlebars_context.data().as_object().ok_or_else(|| {
@@ -131,10 +125,8 @@ where
                     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 \"{}\"` helper call failed because the pre-existing handlebars render context \
-                            was not an object (it was `{}`).",
-                            route,
-                            modified_context_data_as_json
+                            "The `get \"{route}\"` helper call failed because the pre-existing handlebars render context \
+                            was not an object (it was `{modified_context_data_as_json}`)."
                         ))))
                     }
                 }
@@ -166,8 +158,7 @@ where
             .render(context, &[target_media_type.into_media_range()])
             .map_err(|render_error| {
                 handlebars::RenderErrorReason::Other(format!(
-                    "The `get \"{}\"` helper call failed because {} could not be rendered: {}",
-                    route, route, render_error,
+                    "The `get \"{route}\"` helper call failed because {route} could not be rendered: {render_error}",
                 ))
             })?;
 
@@ -183,11 +174,8 @@ where
         ))
         .map_err(|streaming_error| {
             handlebars::RenderErrorReason::Other(format!(
-                "The `get \"{}\"` helper call failed because there was an error collecting the rendered content \
-                for {}: {}",
-                route,
-                route,
-                streaming_error,
+                "The `get \"{route}\"` helper call failed because there was an error collecting the rendered content \
+                for {route}: {streaming_error}",
             ))
         })?;
         let rendered_content_as_string = String::from_utf8(bytes)?;
@@ -207,11 +195,9 @@ fn get_target_media_type(
         .and_then(|media_type_essence| media_type_essence.parse::<MediaType>().ok())
         .ok_or_else(|| {
             handlebars::RenderErrorReason::Other(format!(
-                "The `get \"{}\"` helper call failed because a valid target media type could not be found \
-                in the handlebars context. The context JSON must contain a property at `{}` whose value is \
+                "The `get \"{route}\"` helper call failed because a valid target media type could not be found \
+                in the handlebars context. The context JSON must contain a property at `{TARGET_MEDIA_TYPE_PROPERTY_NAME}` whose value is \
                 a valid media type essence string.",
-                route,
-                TARGET_MEDIA_TYPE_PROPERTY_NAME,
             ))
         })?;
     Ok(target_media_type)
@@ -227,11 +213,9 @@ fn get_optional_request_route(
             .and_then(|request_data| request_data.get(ROUTE_PROPERTY_NAME))
             .ok_or_else(|| {
                 handlebars::RenderErrorReason::Other(format!(
-                    "The `get \"{}\"` helper call failed because the request route could not be found in the \
-                    handlebars context. The context JSON must contain a property at `{}.{}` whose value is a \
-                    string or null.",
-                    route,
-                    REQUEST_DATA_PROPERTY_NAME, ROUTE_PROPERTY_NAME
+                    "The `get \"{route}\"` helper call failed because the request route could not be found in the \
+                    handlebars context. The context JSON must contain a property at `{REQUEST_DATA_PROPERTY_NAME}.{ROUTE_PROPERTY_NAME}` whose value is a \
+                    string or null."
                 ))
             })?;
 
@@ -241,19 +225,15 @@ fn get_optional_request_route(
             let request_route = request_route_value.as_str()
         .ok_or_else(|| {
             handlebars::RenderErrorReason::Other(format!(
-                "The `get \"{}\"` helper call failed because the request route in the handlebars context was \
-                not a string or null (it was `{}`).",
-                route,
-                request_route_value,
+                "The `get \"{route}\"` helper call failed because the request route in the handlebars context was \
+                not a string or null (it was `{request_route_value}`).",
             ))
         })?
         .parse::<Route>()
         .map_err(|error| {
             handlebars::RenderErrorReason::Other(format!(
-                "The `get \"{}\"` helper call failed because the request route in the handlebars context was \
-                invalid ({}).",
-                route,
-                error,
+                "The `get \"{route}\"` helper call failed because the request route in the handlebars context was \
+                invalid ({error}).",
             ))
         })?;
             Some(request_route)
@@ -271,19 +251,15 @@ fn get_query_parameters(
         .and_then(|request_data| request_data.get(QUERY_PARAMETERS_PROPERTY_NAME))
         .ok_or_else(|| {
             handlebars::RenderErrorReason::Other(format!(
-                "The `get \"{}\"` helper call failed because the query parameters could not be found in the \
-                handlebars context. The context JSON must contain a property at `{}.{}` whose value is a map.",
-                route,
-                REQUEST_DATA_PROPERTY_NAME,
-                QUERY_PARAMETERS_PROPERTY_NAME,
+                "The `get \"{route}\"` helper call failed because the query parameters could not be found in the \
+                handlebars context. The context JSON must contain a property at `{REQUEST_DATA_PROPERTY_NAME}.{QUERY_PARAMETERS_PROPERTY_NAME}` whose value is a map.",
             ))
         })?
         .as_object()
         .ok_or_else(|| {
             handlebars::RenderErrorReason::Other(format!(
-                "The `get \"{}\"` helper call failed because the query parameters in the handlebars context \
+                "The `get \"{route}\"` helper call failed because the query parameters in the handlebars context \
                 was not a map.",
-                route,
             ))
         })?
         .into_iter()
@@ -305,18 +281,14 @@ fn get_request_headers(
             .and_then(|request_data| request_data.get(REQUEST_HEADERS_PROPERTY_NAME))
             .ok_or_else(|| {
                 handlebars::RenderErrorReason::Other(format!(
-                    "The `get \"{}\"` helper call failed because the request headers could not be found in \
-                    the handlebars context. The context JSON must contain a property at `{}.{}` whose value \
-                    is a map.",
-                    route,
-                    REQUEST_DATA_PROPERTY_NAME,
-                    REQUEST_HEADERS_PROPERTY_NAME
+                    "The `get \"{route}\"` helper call failed because the request headers could not be found in \
+                    the handlebars context. The context JSON must contain a property at `{REQUEST_DATA_PROPERTY_NAME}.{REQUEST_HEADERS_PROPERTY_NAME}` whose value \
+                    is a map."
                 ))
             })?.as_object().ok_or_else(|| {
                 handlebars::RenderErrorReason::Other(format!(
-                    "The `get \"{}\"` helper call failed because the request headers in the handlebars context \
+                    "The `get \"{route}\"` helper call failed because the request headers in the handlebars context \
                     was not a map.",
-                    route,
                 ))
             })?
             .into_iter()

src/content/mime.rs

@@ -44,7 +44,7 @@ impl FromStr for MediaType {
     type Err = MediaTypeFromStrError;
     fn from_str(input: &str) -> Result<Self, Self::Err> {
         let mime = Mime::from_str(input)
-            .map_err(|error| MediaTypeFromStrError(format!("Malformed media type: {}", error)))?;
+            .map_err(|error| MediaTypeFromStrError(format!("Malformed media type: {error}")))?;
         MediaType::from_media_range(mime).ok_or_else(|| {
             MediaTypeFromStrError(String::from(
                 "Input is a valid media range, but not a specific media type",

src/content/mod.rs

@@ -72,10 +72,10 @@ pub enum StreamError {
     #[error(
         "Process exited with {}{}",
         match .exit_code {
-            Some(code) => format!("code {}", code),
+            Some(code) => format!("code {code}"),
             None => String::from("unknown code"),
         },
-        .stderr_contents.as_ref().map(|message| format!(": {}", message)).unwrap_or_default(),
+        .stderr_contents.as_ref().map(|message| format!(": {message}")).unwrap_or_default(),
     )]
     ExecutableExitedWithNonzero {
         pid: u32,

src/content/route.rs

@@ -21,7 +21,7 @@ fn canonicalize_route(route: &str) -> Result<String, InvalidRouteError> {
 
         let canonicalized_route = canonicalized_components.collect::<Vec<&str>>().join("/");
 
-        Ok(format!("/{}", canonicalized_route))
+        Ok(format!("/{canonicalized_route}"))
     }
 }