update dependencies

Cargo.toml

@@ -22,20 +22,20 @@ include = [
 license = "CC0-1.0"
 
 [dependencies]
-atty = "0.2" # Used for highlighting network errors
+atty = "0.2.14" # Used for highlighting network errors
 base64 = "0.13.0"
 chrono = "0.4.19" # Used for formatting creation timestamp
 clap = "2.33.3"
 cssparser = "0.28.1"
 html5ever = "0.24.1"
-regex = "1.4.3" # Used for parsing srcset
+regex = "1.5.4" # Used for parsing srcset and NOSCRIPT
-sha2 = "0.9.2" # Used for calculating checksums during integrity checks
+sha2 = "0.9.5" # Used for calculating checksums during integrity checks
-url = "2.2.0"
+url = "2.2.2"
 
 [dependencies.reqwest]
-version = "0.11.0"
+version = "0.11.3"
 default-features = false
 features = ["default-tls", "blocking", "gzip"]
 
 [dev-dependencies]
-assert_cmd = "1.0.2"
+assert_cmd = "1.0.4"

src/tests/cli/basic.rs

@@ -80,12 +80,8 @@ mod passing {
                 {file_url_css}\n \
                 {file_url_css}\n\
                 ",
-                file_url_html = Url::from_file_path(fs::canonicalize(&path_html).unwrap())
+                file_url_html = Url::from_file_path(fs::canonicalize(&path_html).unwrap()).unwrap(),
-                    .unwrap()
+                file_url_css = Url::from_file_path(fs::canonicalize(&path_css).unwrap()).unwrap(),
-                    .into_string(),
-                file_url_css = Url::from_file_path(fs::canonicalize(&path_css).unwrap())
-                    .unwrap()
-                    .into_string(),
             )
         );
 

src/tests/cli/local_files.rs

@@ -105,9 +105,7 @@ mod passing {
             std::str::from_utf8(&out.stderr).unwrap(),
             format!(
                 "{file_url_html}\n",
-                file_url_html = Url::from_file_path(fs::canonicalize(&path_html).unwrap())
+                file_url_html = Url::from_file_path(fs::canonicalize(&path_html).unwrap()).unwrap(),
-                    .unwrap()
-                    .into_string(),
             )
         );
 
@@ -197,12 +195,8 @@ mod passing {
                 {file_url_html}\n \
                 {file_url_svg}\n\
                 ",
-                file_url_html = Url::from_file_path(fs::canonicalize(&path_html).unwrap())
+                file_url_html = Url::from_file_path(fs::canonicalize(&path_html).unwrap()).unwrap(),
-                    .unwrap()
+                file_url_svg = Url::from_file_path(fs::canonicalize(&path_svg).unwrap()).unwrap(),
-                    .into_string(),
-                file_url_svg = Url::from_file_path(fs::canonicalize(&path_svg).unwrap())
-                    .unwrap()
-                    .into_string(),
             )
         );
 

src/tests/cli/noscript.rs

@@ -36,12 +36,8 @@ mod passing {
                 {file_url_html}\n \
                 {file_url_svg}\n\
                 ",
-                file_url_html = Url::from_file_path(fs::canonicalize(&path_html).unwrap())
+                file_url_html = Url::from_file_path(fs::canonicalize(&path_html).unwrap()).unwrap(),
-                    .unwrap()
+                file_url_svg = Url::from_file_path(fs::canonicalize(&path_svg).unwrap()).unwrap(),
-                    .into_string(),
-                file_url_svg = Url::from_file_path(fs::canonicalize(&path_svg).unwrap())
-                    .unwrap()
-                    .into_string(),
             )
         );
 
@@ -71,12 +67,8 @@ mod passing {
                 {file_url_html}\n \
                 {file_url_svg}\n\
                 ",
-                file_url_html = Url::from_file_path(fs::canonicalize(&path_html).unwrap())
+                file_url_html = Url::from_file_path(fs::canonicalize(&path_html).unwrap()).unwrap(),
-                    .unwrap()
+                file_url_svg = Url::from_file_path(fs::canonicalize(&path_svg).unwrap()).unwrap(),
-                    .into_string(),
-                file_url_svg = Url::from_file_path(fs::canonicalize(&path_svg).unwrap())
-                    .unwrap()
-                    .into_string(),
             )
         );
 
@@ -106,12 +98,8 @@ mod passing {
                 {file_url_html}\n \
                 {file_url_svg}\n\
                 ",
-                file_url_html = Url::from_file_path(fs::canonicalize(&path_html).unwrap())
+                file_url_html = Url::from_file_path(fs::canonicalize(&path_html).unwrap()).unwrap(),
-                    .unwrap()
+                file_url_svg = Url::from_file_path(fs::canonicalize(&path_svg).unwrap()).unwrap(),
-                    .into_string(),
-                file_url_svg = Url::from_file_path(fs::canonicalize(&path_svg).unwrap())
-                    .unwrap()
-                    .into_string(),
             )
         );
 
@@ -148,12 +136,8 @@ mod passing {
                 {file_url_html}\n \
                 {file_url_svg}\n\
                 ",
-                file_url_html = Url::from_file_path(fs::canonicalize(&path_html).unwrap())
+                file_url_html = Url::from_file_path(fs::canonicalize(&path_html).unwrap()).unwrap(),
-                    .unwrap()
+                file_url_svg = Url::from_file_path(fs::canonicalize(&path_svg).unwrap()).unwrap(),
-                    .into_string(),
-                file_url_svg = Url::from_file_path(fs::canonicalize(&path_svg).unwrap())
-                    .unwrap()
-                    .into_string(),
             )
         );