From a0b2809dccdd9b86bfa26fd5c1cf7137dff8dbde Mon Sep 17 00:00:00 2001
From: lise <liz.henry@ouvaton.org>
Date: Sun, 27 May 2018 15:57:30 +0200
Subject: [PATCH] Fix type annotations stuff for latest nightly

---
 src/lib/epub.rs  |  2 +-
 src/lib/html.rs  |  8 ++++----
 src/lib/latex.rs | 12 ++++++------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/lib/epub.rs b/src/lib/epub.rs
index 53926d9..d237b58 100644
--- a/src/lib/epub.rs
+++ b/src/lib/epub.rs
@@ -441,7 +441,7 @@ impl<'a> EpubRenderer<'a> {
                 let content = if html.verbatim {
                     Cow::Borrowed(text.as_ref())
                 } else {
-                    escape::html(html.book.clean(text.as_ref(), false))
+                    escape::html(html.book.clean(text.as_str(), false))
                 };
                 let mut content = if html.first_letter {
                     html.first_letter = false;
diff --git a/src/lib/html.rs b/src/lib/html.rs
index 1a0d025..41c39ec 100644
--- a/src/lib/html.rs
+++ b/src/lib/html.rs
@@ -1,4 +1,4 @@
-// Copyright (C) 2016-2017 Élisabeth HENRY.
+// Copyright (C) 2016, 2017, 2018 Élisabeth HENRY.
 //
 // This file is part of Crowbook.
 //
@@ -448,7 +448,7 @@ impl<'a> HtmlRenderer<'a> {
                 let mut content = if this.as_ref().verbatim {
                     Cow::Borrowed(text.as_ref())
                 } else {
-                    escape::html(this.as_ref().book.clean(text.as_ref(), false))
+                    escape::html(this.as_ref().book.clean(text.as_str(), false))
                 };
                 if this.as_ref().first_letter {
                     this.as_mut().first_letter = false;
@@ -533,7 +533,7 @@ impl<'a> HtmlRenderer<'a> {
             }
             Token::Item(ref vec) => Ok(format!("<li>{}</li>\n", this.render_vec(vec)?)),
             Token::Link(ref url, ref title, ref vec) => {
-                let url = escape::html(url.as_ref());
+                let url = escape::html(url.as_str());
                 let url = if ResourceHandler::is_local(&url) {
                     Cow::Owned(this.as_ref().handler.get_link(&url).to_owned())
                 } else {
@@ -553,7 +553,7 @@ impl<'a> HtmlRenderer<'a> {
             Token::StandaloneImage(ref url, ref title, ref alt) => {
                 let content = this.render_vec(alt)?;
                 let html: &mut HtmlRenderer = this.as_mut();
-                let url = html.handler.map_image(&html.source, url.as_ref())?;
+                let url = html.handler.map_image(&html.source, url.as_str())?;
 
                 if token.is_image() {
                     Ok(format!("<img src = \"{}\" title = \"{}\" alt = \"{}\" />",
diff --git a/src/lib/latex.rs b/src/lib/latex.rs
index da63c03..54ef107 100644
--- a/src/lib/latex.rs
+++ b/src/lib/latex.rs
@@ -137,7 +137,7 @@ impl<'a> LatexRenderer<'a> {
         }
 
         for (i, chapter) in self.book.chapters.iter().enumerate() {
-            self.handler.add_link(chapter.filename.as_ref(), format!("chapter-{}", i));
+            self.handler.add_link(chapter.filename.as_str(), format!("chapter-{}", i));
         }
         
         for (i, chapter) in self.book.chapters.iter().enumerate() {
@@ -264,9 +264,9 @@ impl<'a> Renderer for LatexRenderer<'a> {
         match *token {
             Token::Str(ref text) => {
                 let content = if self.escape {
-                    self.book.clean(escape::tex(text.as_ref()), true)
+                    self.book.clean(escape::tex(text.as_str()), true)
                 } else {
-                    Cow::Borrowed(text.as_ref())
+                    Cow::Borrowed(text.as_str())
                 };
                 if self.first_letter {
                     self.first_letter = false;
@@ -432,7 +432,7 @@ impl<'a> Renderer for LatexRenderer<'a> {
                 if self.hyperref && self.handler.contains_link(url) {
                     Ok(format!("\\hyperref[{}]{{{}}}", escape::tex(self.handler.get_link(url)), content))
                 } else {
-                    let url = escape::tex(url.as_ref());
+                    let url = escape::tex(url.as_str());
                     if &content == &url {
                         Ok(format!("\\url{{{}}}", content))
                     } else if self.book.options.get_bool("tex.links_as_footnotes").unwrap() {
@@ -447,7 +447,7 @@ impl<'a> Renderer for LatexRenderer<'a> {
             }
             Token::StandaloneImage(ref url, _, _) => {
                 if ResourceHandler::is_local(url) {
-                    let img = self.handler.map_image(&self.source, url.as_ref())?;
+                    let img = self.handler.map_image(&self.source, url.as_str())?;
                     Ok(format!("\\mdstandaloneimage{{{}}}\n",
                                img))
 
@@ -462,7 +462,7 @@ impl<'a> Renderer for LatexRenderer<'a> {
             Token::Image(ref url, _, _) => {
                 if ResourceHandler::is_local(url) {
                     Ok(format!("\\mdimage{{{}}}",
-                               self.handler.map_image(&self.source, url.as_ref())?))
+                               self.handler.map_image(&self.source, url.as_str())?))
                 } else {
                     debug!("{}", lformat!("LaTeX ({source}): image '{url}' doesn't seem to be \
                                            local; ignoring it.",