Dashes ain't idents

Author: Kixiron

src/lib.rs

@@ -35,11 +35,7 @@ pub(crate) static GLOBAL_ALERT: Option<GlobalAlert> = Some(GlobalAlert {
     url: "https://blog.rust-lang.org/2019/09/18/upcoming-docsrs-changes.html",
     text: "Upcoming docs.rs breaking changes!",
     css_class: "error",
-<<<<<<< HEAD
-    fa_icon: "warning",
-=======
     fa_icon: "exclamation-triangle",
->>>>>>> 6e25e2c... Pause for upstream
 });
 */
 

src/web/page/templates.rs

@@ -286,7 +286,7 @@ impl tera::Filter for IconType {
             .and_then(|l| l.as_str())
             .map(|label| {
                 aria_hidden = false;
-                format!(r#" aria-label="{}""#, tera::escape_html(label))
+                format!(r#" aria_label="{}""#, tera::escape_html(label))
             })
             .unwrap_or_default();
         let id = args

templates/header/package_navigation.html

@@ -21,7 +21,7 @@ <h1 id="crate-title">
                     {{ title }}
                 {%- else -%}
                     {{ metadata.name }} {{ metadata.version }}
-                    {{ "copy" | far(id="clipboard", aria-label="Copy crate name and version information", fa=true) }}
+                    {{ "copy" | far(id="clipboard", aria_label="Copy crate name and version information", fa=true) }}
                 {%- endif -%}
             </h1>
 

templates/rustdoc/body.html

@@ -33,7 +33,7 @@
                             <ul class="pure-menu-list menu-item-divided">
                                 <li class="pure-menu-heading" id="crate-title">
                                     {{ krate.name }} {{ krate.version }}
-                                    {{ "copy" | far(id="clipboard", aria-label="Copy crate name and version information", fw=true) }}
+                                    {{ "copy" | far(id="clipboard", aria_label="Copy crate name and version information", fw=true) }}
                                 </li>
 
                                 <li class="pure-menu-item">

templates/rustdoc/head.html

@@ -3,12 +3,7 @@
             media="all" />
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/pure/0.6.0/grids-min.css" type="text/css"
             media="all" />
-<<<<<<< HEAD
-        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.6.3/css/font-awesome.min.css"
-            type="text/css" media="all" />
-=======
         <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.14.0/css/all.css" />
->>>>>>> 6e25e2c... Pause for upstream
         <link rel="stylesheet" href="/style.css?{{ docsrs_version() | slugify }}" type="text/css" media="all" />
 
         <link rel="search" href="/opensearch.xml" type="application/opensearchdescription+xml" title="Docs.rs">