Auto merge of #14668 - dacianpascu06:bump, r=epage

bors · bors · commit a4600184b8d6 · 2024-10-10T20:27:06.000Z
chore(deps): update rust crate pulldown-cmark to 0.12.0 ### What does this PR try to resolve? Closes #14667 ### How should we test and review this PR? Cargo build-man stopped giving errors after updating pulldown-cmark ### Additional information
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -76,7 +76,7 @@ pathdiff = "0.2.1"
 percent-encoding = "2.3.1"
 pkg-config = "0.3.30"
 proptest = "1.5.0"
-pulldown-cmark = { version = "0.11.0", default-features = false, features = ["html"] }
+pulldown-cmark = { version = "0.12.0", default-features = false, features = ["html"] }
 rand = "0.8.5"
 regex = "1.10.5"
 rusqlite = { version = "0.32.0", features = ["bundled"] }
diff --git a/crates/mdman/src/format/man.rs b/crates/mdman/src/format/man.rs
@@ -140,7 +140,7 @@ impl<'e> ManRenderer<'e> {
                                 suppress_paragraph = true;
                             }
                         }
-                        Tag::BlockQuote(_kind) => {
+                        Tag::BlockQuote(..) => {
                             self.flush();
                             // .RS = move left margin over 3
                             // .ll = shrink line length
@@ -256,14 +256,18 @@ impl<'e> ManRenderer<'e> {
                         Tag::Image { .. } => {
                             bail!("images are not currently supported")
                         }
-                        Tag::HtmlBlock { .. } | Tag::MetadataBlock { .. } => {}
+                        Tag::HtmlBlock { .. }
+                        | Tag::MetadataBlock { .. }
+                        | Tag::DefinitionList
+                        | Tag::DefinitionListTitle
+                        | Tag::DefinitionListDefinition => {}
                     }
                 }
                 Event::End(tag_end) => {
                     match &tag_end {
                         TagEnd::Paragraph => self.flush(),
                         TagEnd::Heading(..) => {}
-                        TagEnd::BlockQuote => {
+                        TagEnd::BlockQuote(..) => {
                             self.flush();
                             // restore left margin, restore line length
                             self.output.push_str(".br\n.RE\n.ll\n");
@@ -317,7 +321,12 @@ impl<'e> ManRenderer<'e> {
                                 write!(self.output, "<{}>", escape(&dest_url)?)?;
                             }
                         }
-                        TagEnd::Image | TagEnd::HtmlBlock | TagEnd::MetadataBlock(..) => {}
+                        TagEnd::Image
+                        | TagEnd::HtmlBlock
+                        | TagEnd::MetadataBlock(..)
+                        | TagEnd::DefinitionListDefinition
+                        | TagEnd::DefinitionListTitle
+                        | TagEnd::DefinitionList => {}
                     }
                 }
                 Event::Text(t) => {
diff --git a/crates/mdman/src/format/text.rs b/crates/mdman/src/format/text.rs
@@ -222,7 +222,11 @@ impl<'e> TextRenderer<'e> {
                         Tag::Image { .. } => {
                             bail!("images are not currently supported")
                         }
-                        Tag::HtmlBlock { .. } | Tag::MetadataBlock { .. } => {}
+                        Tag::HtmlBlock { .. }
+                        | Tag::MetadataBlock { .. }
+                        | Tag::DefinitionList
+                        | Tag::DefinitionListTitle
+                        | Tag::DefinitionListDefinition => {}
                     }
                 }
                 Event::End(tag_end) => match &tag_end {
@@ -231,7 +235,7 @@ impl<'e> TextRenderer<'e> {
                         self.hard_break();
                     }
                     TagEnd::Heading(..) => {}
-                    TagEnd::BlockQuote => {
+                    TagEnd::BlockQuote(..) => {
                         self.indent -= 3;
                     }
                     TagEnd::CodeBlock => {
@@ -274,7 +278,12 @@ impl<'e> TextRenderer<'e> {
                             write!(self.word, "<{}>", dest_url)?;
                         }
                     }
-                    TagEnd::Image | TagEnd::HtmlBlock | TagEnd::MetadataBlock(..) => {}
+                    TagEnd::HtmlBlock { .. }
+                    | TagEnd::MetadataBlock { .. }
+                    | TagEnd::DefinitionList
+                    | TagEnd::DefinitionListTitle
+                    | TagEnd::Image
+                    | TagEnd::DefinitionListDefinition => {}
                 },
                 Event::Text(t) | Event::Code(t) => {
                     if wrap_text {

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ impl<'e> ManRenderer<'e> {`
`140`	`140`	`suppress_paragraph = true;`
`141`	`141`	`}`
`142`	`142`	`}`
`143`		`- Tag::BlockQuote(_kind) => {`
	`143`	`+ Tag::BlockQuote(..) => {`
`144`	`144`	`self.flush();`
`145`	`145`	`// .RS = move left margin over 3`
`146`	`146`	`// .ll = shrink line length`
`@@ -256,14 +256,18 @@ impl<'e> ManRenderer<'e> {`
`256`	`256`	`Tag::Image { .. } => {`
`257`	`257`	`bail!("images are not currently supported")`
`258`	`258`	`}`
`259`		`- Tag::HtmlBlock { .. } \| Tag::MetadataBlock { .. } => {}`
	`259`	`+ Tag::HtmlBlock { .. }`
	`260`	`+ \| Tag::MetadataBlock { .. }`
	`261`	`+ \| Tag::DefinitionList`
	`262`	`+ \| Tag::DefinitionListTitle`
	`263`	`+ \| Tag::DefinitionListDefinition => {}`
`260`	`264`	`}`
`261`	`265`	`}`
`262`	`266`	`Event::End(tag_end) => {`
`263`	`267`	`match &tag_end {`
`264`	`268`	`TagEnd::Paragraph => self.flush(),`
`265`	`269`	`TagEnd::Heading(..) => {}`
`266`		`- TagEnd::BlockQuote => {`
	`270`	`+ TagEnd::BlockQuote(..) => {`
`267`	`271`	`self.flush();`
`268`	`272`	`// restore left margin, restore line length`
`269`	`273`	`self.output.push_str(".br\n.RE\n.ll\n");`
`@@ -317,7 +321,12 @@ impl<'e> ManRenderer<'e> {`
`317`	`321`	`write!(self.output, "<{}>", escape(&dest_url)?)?;`
`318`	`322`	`}`
`319`	`323`	`}`
`320`		`- TagEnd::Image \| TagEnd::HtmlBlock \| TagEnd::MetadataBlock(..) => {}`
	`324`	`+ TagEnd::Image`
	`325`	`+ \| TagEnd::HtmlBlock`
	`326`	`+ \| TagEnd::MetadataBlock(..)`
	`327`	`+ \| TagEnd::DefinitionListDefinition`
	`328`	`+ \| TagEnd::DefinitionListTitle`
	`329`	`+ \| TagEnd::DefinitionList => {}`
`321`	`330`	`}`
`322`	`331`	`}`
`323`	`332`	`Event::Text(t) => {`
Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,11 @@ impl<'e> TextRenderer<'e> {`
`222`	`222`	`Tag::Image { .. } => {`
`223`	`223`	`bail!("images are not currently supported")`
`224`	`224`	`}`
`225`		`- Tag::HtmlBlock { .. } \| Tag::MetadataBlock { .. } => {}`
	`225`	`+ Tag::HtmlBlock { .. }`
	`226`	`+ \| Tag::MetadataBlock { .. }`
	`227`	`+ \| Tag::DefinitionList`
	`228`	`+ \| Tag::DefinitionListTitle`
	`229`	`+ \| Tag::DefinitionListDefinition => {}`
`226`	`230`	`}`
`227`	`231`	`}`
`228`	`232`	`Event::End(tag_end) => match &tag_end {`
`@@ -231,7 +235,7 @@ impl<'e> TextRenderer<'e> {`
`231`	`235`	`self.hard_break();`
`232`	`236`	`}`
`233`	`237`	`TagEnd::Heading(..) => {}`
`234`		`- TagEnd::BlockQuote => {`
	`238`	`+ TagEnd::BlockQuote(..) => {`
`235`	`239`	`self.indent -= 3;`
`236`	`240`	`}`
`237`	`241`	`TagEnd::CodeBlock => {`
`@@ -274,7 +278,12 @@ impl<'e> TextRenderer<'e> {`
`274`	`278`	`write!(self.word, "<{}>", dest_url)?;`
`275`	`279`	`}`
`276`	`280`	`}`
`277`		`- TagEnd::Image \| TagEnd::HtmlBlock \| TagEnd::MetadataBlock(..) => {}`
	`281`	`+ TagEnd::HtmlBlock { .. }`
	`282`	`+ \| TagEnd::MetadataBlock { .. }`
	`283`	`+ \| TagEnd::DefinitionList`
	`284`	`+ \| TagEnd::DefinitionListTitle`
	`285`	`+ \| TagEnd::Image`
	`286`	`+ \| TagEnd::DefinitionListDefinition => {}`
`278`	`287`	`},`
`279`	`288`	`Event::Text(t) \| Event::Code(t) => {`
`280`	`289`	`if wrap_text {`