You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
71 lines
3.0 KiB
71 lines
3.0 KiB
From 7d8af9889d8bcef4031ca1373819342480c681ab Mon Sep 17 00:00:00 2001
|
|
From: Igor Raits <i.gnatenko.brain@gmail.com>
|
|
Date: Sat, 22 Feb 2020 19:03:02 +0100
|
|
Subject: [PATCH 2/2] chore: Update pulldown-cmark to 0.7
|
|
|
|
---
|
|
src/lib.rs | 12 ++++++------
|
|
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/src/lib.rs b/src/lib.rs
|
|
index 557459d..eff9a12 100644
|
|
--- a/src/lib.rs
|
|
+++ b/src/lib.rs
|
|
@@ -5,7 +5,7 @@ extern crate glob;
|
|
extern crate pulldown_cmark as cmark;
|
|
extern crate tempfile;
|
|
|
|
-use cmark::{Event, Parser, Tag};
|
|
+use cmark::{CodeBlockKind, Event, Parser, Tag};
|
|
use std::collections::HashMap;
|
|
use std::env;
|
|
use std::fs::File;
|
|
@@ -199,7 +199,7 @@ fn extract_tests_from_file(path: &Path) -> Result<DocTest, IoError> {
|
|
fn extract_tests_from_string(s: &str, file_stem: &str) -> (Vec<Test>, Option<String>) {
|
|
let mut tests = Vec::new();
|
|
let mut buffer = Buffer::None;
|
|
- let mut parser = Parser::new(s);
|
|
+ let parser = Parser::new(s);
|
|
let mut section = None;
|
|
let mut code_block_start = 0;
|
|
// Oh this isn't actually a test but a legacy template
|
|
@@ -217,7 +217,7 @@ fn extract_tests_from_string(s: &str, file_stem: &str) -> (Vec<Test>, Option<Str
|
|
section = Some(sanitize_test_name(§));
|
|
}
|
|
}
|
|
- Event::Start(Tag::CodeBlock(ref info)) => {
|
|
+ Event::Start(Tag::CodeBlock(CodeBlockKind::Fenced(ref info))) => {
|
|
let code_block_info = parse_code_block_info(info);
|
|
if code_block_info.is_rust {
|
|
buffer = Buffer::Code(Vec::new());
|
|
@@ -233,7 +233,7 @@ fn extract_tests_from_string(s: &str, file_stem: &str) -> (Vec<Test>, Option<Str
|
|
buf.push_str(&*text);
|
|
}
|
|
}
|
|
- Event::End(Tag::CodeBlock(ref info)) => {
|
|
+ Event::End(Tag::CodeBlock(CodeBlockKind::Fenced(ref info))) => {
|
|
let code_block_info = parse_code_block_info(info);
|
|
if let Buffer::Code(buf) = mem::replace(&mut buffer, Buffer::None) {
|
|
if code_block_info.is_old_template {
|
|
@@ -282,7 +282,7 @@ fn load_templates(path: &Path) -> Result<HashMap<String, String>, IoError> {
|
|
|
|
for event in parser {
|
|
match event {
|
|
- Event::Start(Tag::CodeBlock(ref info)) => {
|
|
+ Event::Start(Tag::CodeBlock(CodeBlockKind::Fenced(ref info))) => {
|
|
let code_block_info = parse_code_block_info(info);
|
|
if code_block_info.is_rust {
|
|
code_buffer = Some(Vec::new());
|
|
@@ -293,7 +293,7 @@ fn load_templates(path: &Path) -> Result<HashMap<String, String>, IoError> {
|
|
buf.push(text.to_string());
|
|
}
|
|
}
|
|
- Event::End(Tag::CodeBlock(ref info)) => {
|
|
+ Event::End(Tag::CodeBlock(CodeBlockKind::Fenced(ref info))) => {
|
|
let code_block_info = parse_code_block_info(info);
|
|
if let Some(buf) = code_buffer.take() {
|
|
if let Some(t) = code_block_info.template {
|
|
--
|
|
2.30.0.rc2
|
|
|