switch to Rust 2024

Author: snshn

Cargo.toml

@@ -9,7 +9,7 @@ authors = [
     "rhysd <lin90162@yahoo.co.jp>",
     "Andriy Rakhnin <a@rakhnin.com>",
 ]
-edition = "2021"
+edition = "2024"
 description = "CLI tool for saving web pages as a single HTML file"
 homepage = "https://github.com/Y2Z/monolith"
 repository = "https://github.com/Y2Z/monolith"

src/core.rs

@@ -8,7 +8,7 @@ use std::time::Duration;
 use encoding_rs::Encoding;
 use markup5ever_rcdom::RcDom;
 use reqwest::blocking::Client;
-use reqwest::header::{HeaderMap, HeaderValue, CONTENT_TYPE, COOKIE, REFERER, USER_AGENT};
+use reqwest::header::{CONTENT_TYPE, COOKIE, HeaderMap, HeaderValue, REFERER, USER_AGENT};
 use url::Url;
 
 use crate::cache::Cache;

src/css.rs

@@ -1,12 +1,12 @@
 use cssparser::{
-    serialize_identifier, serialize_string, ParseError, Parser, ParserInput, SourcePosition, Token,
+    ParseError, Parser, ParserInput, SourcePosition, Token, serialize_identifier, serialize_string,
 };
 use reqwest::blocking::Client;
 use url::Url;
 
 use crate::cache::Cache;
-use crate::core::{retrieve_asset, Options};
-use crate::url::{create_data_url, resolve_url, EMPTY_IMAGE_DATA_URL};
+use crate::core::{Options, retrieve_asset};
+use crate::url::{EMPTY_IMAGE_DATA_URL, create_data_url, resolve_url};
 
 const CSS_PROPS_WITH_IMAGE_URLS: &[&str] = &[
     // Universal

src/html.rs

@@ -3,23 +3,23 @@ use chrono::prelude::*;
 use encoding_rs::Encoding;
 use html5ever::interface::QualName;
 use html5ever::parse_document;
-use html5ever::serialize::{serialize, SerializeOpts};
-use html5ever::tendril::{format_tendril, TendrilSink};
+use html5ever::serialize::{SerializeOpts, serialize};
+use html5ever::tendril::{TendrilSink, format_tendril};
 use html5ever::tree_builder::{Attribute, TreeSink};
-use html5ever::{local_name, namespace_url, ns, LocalName};
+use html5ever::{LocalName, local_name, namespace_url, ns};
 use markup5ever_rcdom::{Handle, NodeData, RcDom, SerializableHandle};
 use regex::Regex;
-use reqwest::blocking::Client;
 use reqwest::Url;
+use reqwest::blocking::Client;
 use sha2::{Digest, Sha256, Sha384, Sha512};
 use std::default::Default;
 
 use crate::cache::Cache;
-use crate::core::{parse_content_type, retrieve_asset, Options};
+use crate::core::{Options, parse_content_type, retrieve_asset};
 use crate::css::embed_css;
 use crate::js::attr_is_event_handler;
 use crate::url::{
-    clean_url, create_data_url, is_url_and_has_protocol, resolve_url, EMPTY_IMAGE_DATA_URL,
+    EMPTY_IMAGE_DATA_URL, clean_url, create_data_url, is_url_and_has_protocol, resolve_url,
 };
 
 #[derive(PartialEq, Eq)]
@@ -139,7 +139,7 @@ pub fn create_metadata_tag(url: &Url) -> String {
     format!(
         "<!-- Saved from {} at {} using {} v{} -->",
         if clean_url.scheme() == "http" || clean_url.scheme() == "https" {
-            &clean_url.as_str()
+            clean_url.as_str()
         } else {
             "local source"
         },
@@ -357,7 +357,7 @@ pub fn get_child_node_by_name(parent: &Handle, node_name: &str) -> Option<Handle
 
 pub fn get_node_attr(node: &Handle, attr_name: &str) -> Option<String> {
     match &node.data {
-        NodeData::Element { ref attrs, .. } => {
+        NodeData::Element { attrs, .. } => {
             for attr in attrs.borrow().iter() {
                 if &*attr.name.local == attr_name {
                     return Some(attr.value.to_string());
@@ -371,7 +371,7 @@ pub fn get_node_attr(node: &Handle, attr_name: &str) -> Option<String> {
 
 pub fn get_node_name(node: &Handle) -> Option<&'_ str> {
     match &node.data {
-        NodeData::Element { ref name, .. } => Some(name.local.as_ref()),
+        NodeData::Element { name, .. } => Some(name.local.as_ref()),
         _ => None,
     }
 }
@@ -534,7 +534,7 @@ pub fn set_charset(mut dom: RcDom, desired_charset: String) -> RcDom {
 
 pub fn set_node_attr(node: &Handle, attr_name: &str, attr_value: Option<String>) {
     match &node.data {
-        NodeData::Element { ref attrs, .. } => {
+        NodeData::Element { attrs, .. } => {
             let attrs_mut = &mut attrs.borrow_mut();
             let mut i = 0;
             let mut found_existing_attr: bool = false;

src/main.rs

@@ -8,7 +8,7 @@ use tempfile::Builder;
 
 use monolith::cache::Cache;
 use monolith::cookies::parse_cookie_file_contents;
-use monolith::core::{create_monolithic_document, Options};
+use monolith::core::{Options, create_monolithic_document};
 
 enum Output {
     Stdout(io::Stdout),

tests/cli/local_files.rs

@@ -10,7 +10,7 @@ mod passing {
     use assert_cmd::prelude::*;
     use std::env;
     use std::fs;
-    use std::path::{Path, MAIN_SEPARATOR};
+    use std::path::{MAIN_SEPARATOR, Path};
     use std::process::Command;
     use url::Url;
 

tests/core/retrieve_asset.rs

@@ -7,12 +7,12 @@
 
 #[cfg(test)]
 mod passing {
-    use reqwest::blocking::Client;
     use reqwest::Url;
+    use reqwest::blocking::Client;
     use std::env;
 
     use monolith::cache::Cache;
-    use monolith::core::{retrieve_asset, Options};
+    use monolith::core::{Options, retrieve_asset};
     use monolith::url;
 
     #[test]
@@ -99,11 +99,11 @@ mod passing {
 
 #[cfg(test)]
 mod failing {
-    use reqwest::blocking::Client;
     use reqwest::Url;
+    use reqwest::blocking::Client;
 
     use monolith::cache::Cache;
-    use monolith::core::{retrieve_asset, Options};
+    use monolith::core::{Options, retrieve_asset};
 
     #[test]
     fn read_local_file_with_data_url_parent() {

tests/css/embed_css.rs

@@ -7,8 +7,8 @@
 
 #[cfg(test)]
 mod passing {
-    use reqwest::blocking::Client;
     use reqwest::Url;
+    use reqwest::blocking::Client;
 
     use monolith::cache::Cache;
     use monolith::core::Options;

tests/html/add_favicon.rs

@@ -7,7 +7,7 @@
 
 #[cfg(test)]
 mod passing {
-    use html5ever::serialize::{serialize, SerializeOpts};
+    use html5ever::serialize::{SerializeOpts, serialize};
     use markup5ever_rcdom::SerializableHandle;
 
     use monolith::html;

tests/html/compose_csp.rs

@@ -78,6 +78,9 @@ mod passing {
         options.no_images = true;
         let csp_content = html::compose_csp(&options);
 
-        assert_eq!(csp_content, "default-src 'unsafe-eval' 'unsafe-inline' data:; style-src 'none'; font-src 'none'; frame-src 'none'; child-src 'none'; script-src 'none'; img-src data:;");
+        assert_eq!(
+            csp_content,
+            "default-src 'unsafe-eval' 'unsafe-inline' data:; style-src 'none'; font-src 'none'; frame-src 'none'; child-src 'none'; script-src 'none'; img-src data:;"
+        );
     }
 }