From c8e567ddc82bed8aac617741b799d24184358fcd Mon Sep 17 00:00:00 2001
From: Guillaume Gomez <guillaume1.gomez@gmail.com>
Date: Wed, 12 Feb 2020 14:39:22 +0100
Subject: [PATCH] Minify CSS rules to be able to handle minified theme files as
 well

---
 src/librustdoc/theme.rs | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/librustdoc/theme.rs b/src/librustdoc/theme.rs
index af1c50acb0a3..eb8eabe1c03e 100644
--- a/src/librustdoc/theme.rs
+++ b/src/librustdoc/theme.rs
@@ -179,20 +179,23 @@ fn get_previous_positions(events: &[Events], mut pos: usize) -> Vec<usize> {
 }
 
 fn build_rule(v: &[u8], positions: &[usize]) -> String {
-    positions
-        .chunks(2)
-        .map(|x| ::std::str::from_utf8(&v[x[0]..x[1]]).unwrap_or(""))
-        .collect::<String>()
-        .trim()
-        .replace("\n", " ")
-        .replace("/", "")
-        .replace("\t", " ")
-        .replace("{", "")
-        .replace("}", "")
-        .split(' ')
-        .filter(|s| s.len() > 0)
-        .collect::<Vec<&str>>()
-        .join(" ")
+    minifier::css::minify(
+        &positions
+            .chunks(2)
+            .map(|x| ::std::str::from_utf8(&v[x[0]..x[1]]).unwrap_or(""))
+            .collect::<String>()
+            .trim()
+            .replace("\n", " ")
+            .replace("/", "")
+            .replace("\t", " ")
+            .replace("{", "")
+            .replace("}", "")
+            .split(' ')
+            .filter(|s| s.len() > 0)
+            .collect::<Vec<&str>>()
+            .join(" "),
+    )
+    .unwrap_or_else(|_| String::new())
 }
 
 fn inner(v: &[u8], events: &[Events], pos: &mut usize) -> FxHashSet<CssPath> {