Fix rustdoc styles for very old docs

jyn514 · jyn514 · commit 829770a9f182 · 2020-09-19T02:29:04.000-04:00
Previously this used the selector
`link[type='text/css'][href*='normalize']` to inject the vendored HTML.
Unfortunately, this selector did not exist in very old versions of
rustdoc. Instead, this now adds the `vendored.css` stylesheet at the
start of the `&lt;head&gt;` tag.
diff --git a/src/utils/html.rs b/src/utils/html.rs
@@ -19,7 +19,6 @@ pub(crate) fn rewrite_lol(
 
     let templates = templates.templates.load();
     let tera_head = templates.render("rustdoc/head.html", &ctx).unwrap();
-    let tera_vendored_css = templates.render("rustdoc/vendored.html", &ctx).unwrap();
     let tera_body = templates.render("rustdoc/body.html", &ctx).unwrap();
     let tera_rustdoc_header = templates.render("rustdoc/header.html", &ctx).unwrap();
 
@@ -64,18 +63,7 @@ pub(crate) fn rewrite_lol(
         Ok(())
     };
 
-    // Append `vendored.css` before the first stylesheet (rustdoc's first stylesheet is `normalize.css`).
-    let first_stylesheet_handler = |head: &mut Element| {
-        head.before(&tera_vendored_css, ContentType::Html);
-
-        Ok(())
-    };
-
-    let (head_selector, body_selector, first_stylesheet_selector) = (
-        "head".parse().unwrap(),
-        "body".parse().unwrap(),
-        "link[type='text/css'][href*='normalize']".parse().unwrap(),
-    );
+    let (head_selector, body_selector) = ("head".parse().unwrap(), "body".parse().unwrap());
     let element_content_handlers = vec![
         (
             &head_selector,
@@ -85,10 +73,6 @@ pub(crate) fn rewrite_lol(
             &body_selector,
             ElementContentHandlers::default().element(body_handler),
         ),
-        (
-            &first_stylesheet_selector,
-            ElementContentHandlers::default().element(first_stylesheet_handler),
-        ),
     ];
     let settings = Settings {
         element_content_handlers,
diff --git a/templates/rustdoc/head.html b/templates/rustdoc/head.html
@@ -1,4 +1,5 @@
 {%- import "macros.html" as macros -%}
         <link rel="stylesheet" href="/-/static/style.css?{{ docsrs_version() | slugify }}" type="text/css" media="all" />
+        <link rel="stylesheet" href="/-/static/vendored.css?{{ docsrs_version() | slugify }}" type="text/css" media="all" />
 
         <link rel="search" href="/opensearch.xml" type="application/opensearchdescription+xml" title="Docs.rs">
diff --git a/templates/rustdoc/vendored.html b/templates/rustdoc/vendored.html
