From ab65b44f0db98031421a5b06e5ebf965daacf217 Mon Sep 17 00:00:00 2001
From: Emi Simpson <emi@alchemi.dev>
Date: Thu, 5 Dec 2019 20:20:09 -0500
Subject: [PATCH] Cleaned up some overcomplicated code

---
 src/html.rs  | 37 ++++++++++++++++---------------------
 src/utils.rs | 10 +++-------
 2 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/src/html.rs b/src/html.rs
index 56338f5..2f7fb8f 100644
--- a/src/html.rs
+++ b/src/html.rs
@@ -8,7 +8,6 @@ use html5ever::{local_name, namespace_url, ns};
 use http::retrieve_asset;
 use js::attr_is_event_handler;
 use std::fmt::Write as OtherWrite;
-use std::io::{stderr, Write};
 use std::collections::HashMap;
 use std::default::Default;
 use utils::{data_to_dataurl, is_valid_url, resolve_css_imports, resolve_url, url_has_protocol};
@@ -154,11 +153,10 @@ pub fn walk_and_embed_assets(
 
                                         // If a network error occured, warn
                                         Err(e) => {
-                                            writeln!(
-                                                stderr(),
+                                            eprintln!(
                                                 "Warning: {}",
                                                 e,
-                                            ).unwrap();
+                                            );
 
                                             //If failed to resolve, replace with absolute URL
                                             href_full_url
@@ -301,23 +299,20 @@ pub fn walk_and_embed_assets(
                         node.children.borrow_mut().clear();
                     } else {
                         for node in node.children.borrow_mut().iter_mut() {
-                            match node.data {
-                                NodeData::Text {ref contents} => {
-                                    let mut tendril = contents.borrow_mut();
-                                    let replacement = resolve_css_imports(
-                                        cache,
-                                        dbg!(tendril.as_ref()),
-                                        false,
-                                        &url,
-                                        opt_user_agent,
-                                        opt_silent,
-                                        opt_insecure,
-                                    );
-                                    tendril.clear();
-                                    tendril.write_str(&replacement)
-                                        .expect("Failed to update DOM");
-                                },
-                                _ => (),
+                            if let NodeData::Text{ref contents} = node.data {
+                                let mut tendril = contents.borrow_mut();
+                                let replacement = resolve_css_imports(
+                                    cache,
+                                    dbg!(tendril.as_ref()),
+                                    false,
+                                    &url,
+                                    opt_user_agent,
+                                    opt_silent,
+                                    opt_insecure,
+                                );
+                                tendril.clear();
+                                tendril.write_str(&replacement)
+                                    .expect("Failed to update DOM");
                             }
                         }
                     }
diff --git a/src/utils.rs b/src/utils.rs
index 0bd1fe0..e92edb8 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -4,10 +4,7 @@ use self::base64::encode;
 use http::retrieve_asset;
 use regex::Regex;
 use url::{ParseError, Url};
-use std::{
-    io::{stderr, Write},
-    collections::HashMap,
-};
+use std::collections::HashMap;
 
 lazy_static! {
     static ref HAS_PROTOCOL: Regex = Regex::new(r"^[a-z0-9]+:").unwrap();
@@ -137,11 +134,10 @@ pub fn resolve_css_imports(
                     ).map(|(a, _)| a),
 
         }.unwrap_or_else(|e| {
-            writeln!(
-                stderr(),
+            eprintln!(
                 "Warning: {}",
                 e,
-            ).unwrap();
+            );
 
             //If failed to resolve, replace with absolute URL
             embedded_url