Update to pulldown-cmark 0.5.1.

ehuss · May 21, 2019 · 6c8769f · 6c8769f
1 parent 397c3b1
commit 6c8769f
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 12 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -22,7 +22,7 @@ serde = "1.0"
 serde_derive = "1.0"
 error-chain = "0.12"
 serde_json = "1.0"
-pulldown-cmark = "0.4.1"
+pulldown-cmark = "0.5"
 lazy_static = "1.0"
 log = "0.4"
 env_logger = "0.5"

diff --git a/src/book/summary.rs b/src/book/summary.rs
@@ -475,7 +475,7 @@ fn stringify_events(events: Vec<Event>) -> String {
     events
         .into_iter()
         .filter_map(|t| match t {
-            Event::Text(text) => Some(text.into_string()),
+            Event::Text(text) | Event::Code(text) => Some(text.into_string()),
             _ => None,
         }).collect()
 }

diff --git a/src/renderer/html_handlebars/helpers/toc.rs b/src/renderer/html_handlebars/helpers/toc.rs
@@ -4,7 +4,7 @@ use std::path::Path;
 use utils;
 
 use handlebars::{Context, Handlebars, Helper, HelperDef, Output, RenderContext, RenderError};
-use pulldown_cmark::{html, Event, Parser, Tag};
+use pulldown_cmark::{html, Event, Parser};
 use serde_json;
 
 // Handlebars helper to construct TOC
@@ -118,8 +118,7 @@ impl HelperDef for RenderToc {
 
                 // filter all events that are not inline code blocks
                 let parser = Parser::new(name).filter(|event| match *event {
-                    Event::Start(Tag::Code)
-                    | Event::End(Tag::Code)
+                    Event::Code(_)
                     | Event::InlineHtml(_)
                     | Event::Text(_) => true,
                     _ => false,

diff --git a/src/renderer/html_handlebars/search.rs b/src/renderer/html_handlebars/search.rs
@@ -145,7 +145,7 @@ fn render_item(
                     body.push(' ');
                 }
             }
-            Event::Text(text) => {
+            Event::Text(text) | Event::Code(text) => {
                 if in_header {
                     heading.push_str(&text);
                 } else {

diff --git a/src/utils/mod.rs b/src/utils/mod.rs
@@ -140,11 +140,11 @@ impl EventQuoteConverter {
         }
 
         match event {
-            Event::Start(Tag::CodeBlock(_)) | Event::Start(Tag::Code) => {
+            Event::Start(Tag::CodeBlock(_)) => {
                 self.convert_text = false;
                 event
             }
-            Event::End(Tag::CodeBlock(_)) | Event::End(Tag::Code) => {
+            Event::End(Tag::CodeBlock(_)) => {
                 self.convert_text = true;
                 event
             }