Merge pull request #633 from kivikakk/push-rwluopptxlqw

Remove needless clones and reborrows.

Author: kivikakk

examples/syntax_highlighter.rs

@@ -2,6 +2,7 @@
 
 use comrak::adapters::SyntaxHighlighterAdapter;
 use comrak::{markdown_to_html_with_plugins, Options, Plugins};
+use std::borrow::Cow;
 use std::collections::HashMap;
 use std::fmt::{self, Write};
 
@@ -35,7 +36,7 @@ impl SyntaxHighlighterAdapter for PotatoSyntaxAdapter {
     fn write_pre_tag(
         &self,
         output: &mut dyn Write,
-        attributes: HashMap<String, String>,
+        attributes: HashMap<&'static str, Cow<str>>,
     ) -> fmt::Result {
         if attributes.contains_key("lang") {
             write!(output, "<pre lang=\"{}\">", attributes["lang"])
@@ -47,7 +48,7 @@ impl SyntaxHighlighterAdapter for PotatoSyntaxAdapter {
     fn write_code_tag(
         &self,
         output: &mut dyn Write,
-        attributes: HashMap<String, String>,
+        attributes: HashMap<&'static str, Cow<str>>,
     ) -> fmt::Result {
         if attributes.contains_key("class") {
             write!(output, "<code class=\"{}\">", attributes["class"])

src/adapters.rs

@@ -2,6 +2,7 @@
 //!
 //! Each plugin has to implement one of the traits available in this module.
 
+use std::borrow::Cow;
 use std::collections::HashMap;
 use std::fmt;
 
@@ -24,20 +25,20 @@ pub trait SyntaxHighlighterAdapter: Send + Sync {
     /// `<pre>` tag possibly with some HTML attribute pre-filled.
     ///
     /// `attributes`: A map of HTML attributes provided by comrak.
-    fn write_pre_tag(
+    fn write_pre_tag<'s>(
         &self,
         output: &mut dyn fmt::Write,
-        attributes: HashMap<String, String>,
+        attributes: HashMap<&'static str, Cow<'s, str>>,
     ) -> fmt::Result;
 
     /// Generates the opening `<code>` tag. Some syntax highlighter libraries might include their own
     /// `<code>` tag possibly with some HTML attribute pre-filled.
     ///
     /// `attributes`: A map of HTML attributes provided by comrak.
-    fn write_code_tag(
+    fn write_code_tag<'s>(
         &self,
         output: &mut dyn fmt::Write,
-        attributes: HashMap<String, String>,
+        attributes: HashMap<&'static str, Cow<'s, str>>,
     ) -> fmt::Result;
 }