From 2885724931cb5620cc79402b12086a02293ee120 Mon Sep 17 00:00:00 2001
From: Wilson Lin <code@wilsonl.in>
Date: Sat, 7 Aug 2021 14:56:20 +1000
Subject: [PATCH] Make Cfg values all default false

---
 src/cfg/mod.rs        | 26 ++++++++++++++++++------
 src/lib.rs            | 13 +++---------
 src/minify/comment.rs |  2 +-
 src/minify/element.rs |  7 +++----
 src/parse/element.rs  |  3 +--
 src/tests/mod.rs      | 46 +++++++------------------------------------
 6 files changed, 35 insertions(+), 62 deletions(-)

diff --git a/src/cfg/mod.rs b/src/cfg/mod.rs
index 88f194d..fe40d72 100644
--- a/src/cfg/mod.rs
+++ b/src/cfg/mod.rs
@@ -15,14 +15,28 @@ pub struct Cfg {
     /// enabled; otherwise, this value has no effect.
     pub minify_css: bool,
 
-    /// Omit closing tags when possible.
-    pub omit_closing_tags: bool,
-    /// Remove spaces between attributes when possible (may result in invalid HTML).
-    pub remove_spaces_between_attributes: bool,
-    /// Remove all comments.
-    pub remove_comments: bool,
+    /// Do not omit closing tags when possible.
+    pub keep_closing_tags: bool,
+    /// Keep spaces between attributes when possible to conform to HTML standards.
+    pub keep_spaces_between_attributes: bool,
+    /// Keep all comments.
+    pub keep_comments: bool,
     /// Remove all bangs.
     pub remove_bangs: bool,
     /// Remove all processing_instructions.
     pub remove_processing_instructions: bool,
 }
+
+impl Cfg {
+    pub fn new() -> Cfg {
+        Cfg {
+            keep_closing_tags: false,
+            keep_comments: false,
+            keep_spaces_between_attributes: false,
+            minify_css: false,
+            minify_js: false,
+            remove_bangs: false,
+            remove_processing_instructions: false,
+        }
+    }
+}
diff --git a/src/lib.rs b/src/lib.rs
index 46ac75a..9a3c7b2 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -30,16 +30,9 @@ mod whitespace;
 /// use minify_html::{Cfg, minify};
 ///
 /// let mut code: &[u8] = b"<p>  Hello, world!  </p>";
-/// let cfg = &Cfg {
-///     minify_css: false,
-///     minify_js: false,
-///     omit_closing_tags: true,
-///     remove_bangs: false,
-///     remove_comments: true,
-///     remove_processing_instructions: false,
-///     remove_spaces_between_attributes: true,
-/// };
-/// let minified = minify(&code, cfg);
+/// let mut cfg = Cfg::new();
+/// cfg.keep_comments = true;
+/// let minified = minify(&code, &cfg);
 /// assert_eq!(minified, b"<p>Hello, world!".to_vec());
 /// ```
 pub fn minify(src: &[u8], cfg: &Cfg) -> Vec<u8> {
diff --git a/src/minify/comment.rs b/src/minify/comment.rs
index 0ab2733..317fb04 100644
--- a/src/minify/comment.rs
+++ b/src/minify/comment.rs
@@ -1,7 +1,7 @@
 use crate::cfg::Cfg;
 
 pub fn minify_comment(cfg: &Cfg, out: &mut Vec<u8>, code: &[u8], ended: bool) {
-    if !cfg.remove_comments {
+    if cfg.keep_comments {
         out.extend_from_slice(b"<!--");
         out.extend_from_slice(code);
         if ended {
diff --git a/src/minify/element.rs b/src/minify/element.rs
index cb8a515..0efdfb0 100644
--- a/src/minify/element.rs
+++ b/src/minify/element.rs
@@ -23,7 +23,7 @@ pub fn minify_element(
     closing_tag: ElementClosingTag,
     children: Vec<NodeData>,
 ) {
-    let can_omit_closing_tag = cfg.omit_closing_tags
+    let can_omit_closing_tag = !cfg.keep_closing_tags
         && (can_omit_as_before(tag_name, next_sibling_as_element_tag_name)
             || (is_last_child_text_or_element_node && can_omit_as_last_node(parent, tag_name)));
 
@@ -37,7 +37,7 @@ pub fn minify_element(
         if min.typ() == AttrType::Redundant {
             continue;
         };
-        if !cfg.remove_spaces_between_attributes || last_attr != AttrType::Quoted {
+        if cfg.keep_spaces_between_attributes || last_attr != AttrType::Quoted {
             out.push(b' ');
         };
         out.extend_from_slice(&name);
@@ -70,8 +70,7 @@ pub fn minify_element(
         children,
     );
 
-    if closing_tag != ElementClosingTag::Present || (cfg.omit_closing_tags && can_omit_closing_tag)
-    {
+    if closing_tag != ElementClosingTag::Present || can_omit_closing_tag {
         return;
     };
     out.extend_from_slice(b"</");
diff --git a/src/parse/element.rs b/src/parse/element.rs
index def223b..486f072 100644
--- a/src/parse/element.rs
+++ b/src/parse/element.rs
@@ -164,8 +164,7 @@ pub fn parse_element(code: &mut Code, ns: Namespace, parent: &[u8]) -> NodeData
         closing_tag_omitted,
         children,
     } = match elem_name.as_slice() {
-        // TODO to_vec call allocates every time?
-        b"script" => match attributes.get(&b"type".to_vec()) {
+        b"script" => match attributes.get(b"type".as_ref()) {
             Some(mime) if !JAVASCRIPT_MIME_TYPES.contains(mime.as_slice()) => {
                 parse_script_content(code, ScriptOrStyleLang::Data)
             }
diff --git a/src/tests/mod.rs b/src/tests/mod.rs
index 7654784..0399f0b 100644
--- a/src/tests/mod.rs
+++ b/src/tests/mod.rs
@@ -8,53 +8,21 @@ fn _eval(src: &'static [u8], expected: &'static [u8], cfg: &super::Cfg) {
 }
 
 fn eval(src: &'static [u8], expected: &'static [u8]) {
-    _eval(
-        src,
-        expected,
-        &super::Cfg {
-            minify_css: false,
-            minify_js: false,
-            omit_closing_tags: true,
-            remove_bangs: false,
-            remove_comments: true,
-            remove_processing_instructions: false,
-            remove_spaces_between_attributes: true,
-        },
-    );
+    _eval(src, expected, &super::Cfg::new());
 }
 
 #[cfg(feature = "js-esbuild")]
 fn eval_with_js_min(src: &'static [u8], expected: &'static [u8]) -> () {
-    _eval(
-        src,
-        expected,
-        &super::Cfg {
-            minify_js: true,
-            minify_css: false,
-            omit_closing_tags: true,
-            remove_bangs: false,
-            remove_comments: true,
-            remove_processing_instructions: false,
-            remove_spaces_between_attributes: true,
-        },
-    );
+    let mut cfg = super::Cfg::new();
+    cfg.minify_js = true;
+    _eval(src, expected, &cfg);
 }
 
 #[cfg(feature = "js-esbuild")]
 fn eval_with_css_min(src: &'static [u8], expected: &'static [u8]) -> () {
-    _eval(
-        src,
-        expected,
-        &super::Cfg {
-            minify_js: false,
-            minify_css: true,
-            omit_closing_tags: true,
-            remove_bangs: false,
-            remove_comments: true,
-            remove_processing_instructions: false,
-            remove_spaces_between_attributes: true,
-        },
-    );
+    let mut cfg = super::Cfg::new();
+    cfg.minify_css = true;
+    _eval(src, expected, &cfg);
 }
 
 #[test]