Skip to content

Commit

Permalink
Merge pull request #1173 from cobalt-org/renovate/pulldown-cmark-0.x
Browse files Browse the repository at this point in the history
chore(deps): update rust crate pulldown-cmark to 0.10
  • Loading branch information
epage authored Mar 1, 2024
2 parents a703306 + 920fb01 commit 30d8157
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 10 deletions.
13 changes: 10 additions & 3 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ log = "0.4"
env_logger = "0.11"
rss = "2.0"
jsonfeed = "0.2"
pulldown-cmark = {version="0.9", default-features = false}
pulldown-cmark = {version="0.10", default-features = false, features = ["html"] }
engarde = { version = "0.1", path = "crates/engarde" }
regex = "1.10"
lazy_static = "1.4"
Expand Down
8 changes: 4 additions & 4 deletions src/syntax_highlight.rs
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ impl liquid_core::ParseBlock for CodeBlockParser {
}

pub struct DecoratedParser<'a> {
parser: cmark::Parser<'a, 'a>,
parser: cmark::Parser<'a>,
syntax: std::sync::Arc<SyntaxHighlight>,
theme: Option<&'a str>,
lang: Option<String>,
Expand All @@ -150,7 +150,7 @@ pub struct DecoratedParser<'a> {

impl<'a> DecoratedParser<'a> {
pub fn new(
parser: cmark::Parser<'a, 'a>,
parser: cmark::Parser<'a>,
syntax: std::sync::Arc<SyntaxHighlight>,
theme: Option<&'a str>,
) -> error::Result<Self> {
Expand Down Expand Up @@ -187,7 +187,7 @@ impl<'a> Iterator for DecoratedParser<'a> {
self.code = Some(vec![]);
Some(Text(pulldown_cmark::CowStr::Borrowed("")))
}
Some(End(cmark::Tag::CodeBlock(_))) => {
Some(End(cmark::TagEnd::CodeBlock)) => {
let html = if let Some(code) = self.code.as_deref() {
let code = code.iter().join("\n");
self.syntax.format(&code, self.lang.as_deref(), self.theme)
Expand All @@ -206,7 +206,7 @@ impl<'a> Iterator for DecoratedParser<'a> {
}

pub fn decorate_markdown<'a>(
parser: cmark::Parser<'a, 'a>,
parser: cmark::Parser<'a>,
syntax: std::sync::Arc<SyntaxHighlight>,
theme_name: Option<&'a str>,
) -> error::Result<DecoratedParser<'a>> {
Expand Down
4 changes: 2 additions & 2 deletions tests/cmd/errors.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ Commands:
help Print this message or the help of the given subcommand(s)

Options:
-v, --verbose... More output per occurrence
-q, --quiet... Less output per occurrence
-v, --verbose... Increase logging verbosity
-q, --quiet... Decrease logging verbosity
--color <WHEN> Controls when to use color [default: auto] [possible values: auto, always,
never]
-h, --help Print help
Expand Down

0 comments on commit 30d8157

Please sign in to comment.