Skip to content

Commit 2a4ec9f

Browse files
committed
Update pulldown-cmark to next breaking version.
1 parent 02d7942 commit 2a4ec9f

File tree

7 files changed

+23
-33
lines changed

7 files changed

+23
-33
lines changed

Diff for: crates/mdman/Cargo.lock

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: crates/mdman/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ description = "Creates a man page page from markdown."
88
[dependencies]
99
anyhow = "1.0.31"
1010
handlebars = { version = "3.2.1", features = ["dir_source"] }
11-
pulldown-cmark = { version = "0.7.2", default-features = false }
11+
pulldown-cmark = { version = "0.9.2", default-features = false }
1212
same-file = "1.0.6"
1313
serde_json = "1.0.56"
1414
url = "2.2.2"

Diff for: crates/mdman/src/format/man.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
use crate::util::{header_text, parse_name_and_section};
44
use crate::EventIter;
55
use anyhow::{bail, Error};
6-
use pulldown_cmark::{Alignment, Event, LinkType, Tag};
6+
use pulldown_cmark::{Alignment, Event, HeadingLevel, LinkType, Tag};
77
use std::fmt::Write;
88
use url::Url;
99

@@ -122,10 +122,10 @@ impl<'e> ManRenderer<'e> {
122122
self.output.push_str(".sp\n");
123123
}
124124
}
125-
Tag::Heading(n) => {
126-
if n == 1 {
125+
Tag::Heading(level, ..) => {
126+
if level == HeadingLevel::H1 {
127127
self.push_top_header()?;
128-
} else if n == 2 {
128+
} else if level == HeadingLevel::H2 {
129129
// Section header
130130
let text = header_text(&mut self.parser)?;
131131
self.flush();
@@ -255,7 +255,7 @@ impl<'e> ManRenderer<'e> {
255255
Event::End(tag) => {
256256
match &tag {
257257
Tag::Paragraph => self.flush(),
258-
Tag::Heading(_n) => {}
258+
Tag::Heading(..) => {}
259259
Tag::BlockQuote => {
260260
self.flush();
261261
// restore left margin, restore line length

Diff for: crates/mdman/src/format/text.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
use crate::util::{header_text, unwrap};
44
use crate::EventIter;
55
use anyhow::{bail, Error};
6-
use pulldown_cmark::{Alignment, Event, LinkType, Tag};
6+
use pulldown_cmark::{Alignment, Event, HeadingLevel, LinkType, Tag};
77
use std::fmt::Write;
88
use std::mem;
99
use url::Url;
@@ -116,24 +116,24 @@ impl<'e> TextRenderer<'e> {
116116
self.flush();
117117
}
118118
}
119-
Tag::Heading(n) => {
119+
Tag::Heading(level, ..) => {
120120
self.flush();
121-
if n == 1 {
121+
if level == HeadingLevel::H1 {
122122
let text = header_text(&mut self.parser)?;
123123
self.push_to_line(&text.to_uppercase());
124124
self.hard_break();
125125
self.hard_break();
126-
} else if n == 2 {
126+
} else if level == HeadingLevel::H2 {
127127
let text = header_text(&mut self.parser)?;
128128
self.push_to_line(&text.to_uppercase());
129129
self.flush();
130130
self.indent = 7;
131131
} else {
132132
let text = header_text(&mut self.parser)?;
133-
self.push_indent((n as usize - 2) * 3);
133+
self.push_indent((level as usize - 2) * 3);
134134
self.push_to_line(&text);
135135
self.flush();
136-
self.indent = (n as usize - 1) * 3 + 1;
136+
self.indent = (level as usize - 1) * 3 + 1;
137137
}
138138
}
139139
Tag::BlockQuote => {
@@ -223,7 +223,7 @@ impl<'e> TextRenderer<'e> {
223223
self.flush();
224224
self.hard_break();
225225
}
226-
Tag::Heading(_n) => {}
226+
Tag::Heading(..) => {}
227227
Tag::BlockQuote => {
228228
self.indent -= 3;
229229
}

Diff for: crates/mdman/src/util.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ pub fn header_text<'e>(parser: &mut EventIter<'e>) -> Result<CowStr<'e>, Error>
3131
e => bail!("expected plain text in man header, got {:?}", e),
3232
};
3333
match parser.next() {
34-
Some((Event::End(Tag::Heading(_)), _range)) => {
34+
Some((Event::End(Tag::Heading(..)), _range)) => {
3535
return Ok(text);
3636
}
3737
e => bail!("expected plain text in man header, got {:?}", e),

Diff for: crates/mdman/tests/compare/expected/formatting.1

+2-8
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,8 @@ With a second paragraph inside it
6666
.sp
6767
.RS 4
6868
\h'-04'\(bu\h'+02'Milk
69-
.sp
70-
.RS 4
71-
\h'-04' 5.\h'+01'Don't start at one.
72-
.RE
73-
.sp
74-
.RS 4
75-
\h'-04' 6.\h'+01'tamarind
76-
.RE
69+
5. Don't start at one.
70+
6. tamarind
7771
.RE
7872
.RE
7973
.sp

Diff for: crates/mdman/tests/compare/expected/formatting.txt

+1-5
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,7 @@ LISTS
4343

4444
o Eggs
4545

46-
o Milk
47-
48-
5. Don't start at one.
49-
50-
6. tamarind
46+
o Milk 5. Don't start at one. 6. tamarind
5147

5248
2. Second element
5349

0 commit comments

Comments
 (0)