Renamed BlockQuote to Blockquote

wooorm · Sep 16, 2024 · 323607c · 323607c
1 parent bf4d60d
commit 323607c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 22 deletions.
diff --git a/readme.md b/readme.md
@@ -254,18 +254,15 @@ The following bash scripts are useful when working on this project:
     ```
 *   format:
     ```sh
-    cargo fmt && cargo fix --all-targets
+    cargo fmt && cargo fix --all-targets --all-features
     ```
 *   lint:
     ```sh
-    cargo fmt --check && cargo clippy --examples --tests --benches --all-features
+    cargo fmt --check && cargo clippy --examples --tests --benches --all-features --all-features
     ```
 *   test:
     ```sh
-    RUST_BACKTRACE=1 cargo test
-    ```
-    ```sh
-    RUST_BACKTRACE=1 cargo test --features json
+    RUST_BACKTRACE=1 cargo test --all-features
     ```
 *   docs:
     ```sh

diff --git a/src/mdast.rs b/src/mdast.rs
@@ -95,7 +95,7 @@ pub enum Node {
 
     // Container:
     /// Block quote.
-    BlockQuote(BlockQuote),
+    Blockquote(Blockquote),
     /// Footnote definition.
     FootnoteDefinition(FootnoteDefinition),
     /// MDX: JSX element (container).
@@ -183,7 +183,7 @@ impl fmt::Debug for Node {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
             Node::Root(x) => x.fmt(f),
-            Node::BlockQuote(x) => x.fmt(f),
+            Node::Blockquote(x) => x.fmt(f),
             Node::FootnoteDefinition(x) => x.fmt(f),
             Node::MdxJsxFlowElement(x) => x.fmt(f),
             Node::List(x) => x.fmt(f),
@@ -231,7 +231,7 @@ impl ToString for Node {
         match self {
             // Parents.
             Node::Root(x) => children_to_string(&x.children),
-            Node::BlockQuote(x) => children_to_string(&x.children),
+            Node::Blockquote(x) => children_to_string(&x.children),
             Node::FootnoteDefinition(x) => children_to_string(&x.children),
             Node::MdxJsxFlowElement(x) => children_to_string(&x.children),
             Node::List(x) => children_to_string(&x.children),
@@ -280,7 +280,7 @@ impl Node {
             Node::Root(x) => Some(&x.children),
             Node::Paragraph(x) => Some(&x.children),
             Node::Heading(x) => Some(&x.children),
-            Node::BlockQuote(x) => Some(&x.children),
+            Node::Blockquote(x) => Some(&x.children),
             Node::List(x) => Some(&x.children),
             Node::ListItem(x) => Some(&x.children),
             Node::Emphasis(x) => Some(&x.children),
@@ -305,7 +305,7 @@ impl Node {
             Node::Root(x) => Some(&mut x.children),
             Node::Paragraph(x) => Some(&mut x.children),
             Node::Heading(x) => Some(&mut x.children),
-            Node::BlockQuote(x) => Some(&mut x.children),
+            Node::Blockquote(x) => Some(&mut x.children),
             Node::List(x) => Some(&mut x.children),
             Node::ListItem(x) => Some(&mut x.children),
             Node::Emphasis(x) => Some(&mut x.children),
@@ -328,7 +328,7 @@ impl Node {
     pub fn position(&self) -> Option<&Position> {
         match self {
             Node::Root(x) => x.position.as_ref(),
-            Node::BlockQuote(x) => x.position.as_ref(),
+            Node::Blockquote(x) => x.position.as_ref(),
             Node::FootnoteDefinition(x) => x.position.as_ref(),
             Node::MdxJsxFlowElement(x) => x.position.as_ref(),
             Node::List(x) => x.position.as_ref(),
@@ -367,7 +367,7 @@ impl Node {
     pub fn position_mut(&mut self) -> Option<&mut Position> {
         match self {
             Node::Root(x) => x.position.as_mut(),
-            Node::BlockQuote(x) => x.position.as_mut(),
+            Node::Blockquote(x) => x.position.as_mut(),
             Node::FootnoteDefinition(x) => x.position.as_mut(),
             Node::MdxJsxFlowElement(x) => x.position.as_mut(),
             Node::List(x) => x.position.as_mut(),
@@ -406,7 +406,7 @@ impl Node {
     pub fn position_set(&mut self, position: Option<Position>) {
         match self {
             Node::Root(x) => x.position = position,
-            Node::BlockQuote(x) => x.position = position,
+            Node::Blockquote(x) => x.position = position,
             Node::FootnoteDefinition(x) => x.position = position,
             Node::MdxJsxFlowElement(x) => x.position = position,
             Node::List(x) => x.position = position,
@@ -575,7 +575,7 @@ pub struct ThematicBreak {
 /// ```
 #[derive(Clone, Debug, Eq, PartialEq)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-pub struct BlockQuote {
+pub struct Blockquote {
     // Parent.
     /// Content model.
     pub children: Vec<Node>,
@@ -1712,14 +1712,14 @@ mod tests {
 
     #[test]
     fn block_quote() {
-        let mut node = Node::BlockQuote(BlockQuote {
+        let mut node = Node::Blockquote(Blockquote {
             position: None,
             children: vec![],
         });
 
         assert_eq!(
             format!("{:?}", node),
-            "BlockQuote { children: [], position: None }",
+            "Blockquote { children: [], position: None }",
             "should support `Debug`"
         );
         assert_eq!(node.to_string(), "", "should support `ToString`");
@@ -1734,7 +1734,7 @@ mod tests {
         node.position_set(Some(Position::new(1, 1, 0, 1, 2, 1)));
         assert_eq!(
             format!("{:?}", node),
-            "BlockQuote { children: [], position: Some(1:1-1:2 (0-1)) }",
+            "Blockquote { children: [], position: Some(1:1-1:2 (0-1)) }",
             "should support `position_set`"
         );
     }

diff --git a/src/to_mdast.rs b/src/to_mdast.rs
@@ -2,7 +2,7 @@
 
 use crate::event::{Event, Kind, Name};
 use crate::mdast::{
-    AttributeContent, AttributeValue, AttributeValueExpression, BlockQuote, Break, Code,
+    AttributeContent, AttributeValue, AttributeValueExpression, Blockquote, Break, Code,
     Definition, Delete, Emphasis, FootnoteDefinition, FootnoteReference, Heading, Html, Image,
     ImageReference, InlineCode, InlineMath, Link, LinkReference, List, ListItem, Math,
     MdxFlowExpression, MdxJsxAttribute, MdxJsxFlowElement, MdxJsxTextElement, MdxTextExpression,
@@ -470,7 +470,7 @@ fn on_enter_autolink(context: &mut CompileContext) {
 
 /// Handle [`Enter`][Kind::Enter]:[`BlockQuote`][Name::BlockQuote].
 fn on_enter_block_quote(context: &mut CompileContext) {
-    context.tail_push(Node::BlockQuote(BlockQuote {
+    context.tail_push(Node::Blockquote(Blockquote {
         children: vec![],
         position: None,
     }));

diff --git a/tests/block_quote.rs b/tests/block_quote.rs
@@ -1,5 +1,5 @@
 use markdown::{
-    mdast::{BlockQuote, Node, Paragraph, Root, Text},
+    mdast::{Blockquote, Node, Paragraph, Root, Text},
     message, to_html, to_html_with_options, to_mdast,
     unist::Position,
     Constructs, Options, ParseOptions,
@@ -221,7 +221,7 @@ fn block_quote() -> Result<(), message::Message> {
     assert_eq!(
         to_mdast("> a", &Default::default())?,
         Node::Root(Root {
-            children: vec![Node::BlockQuote(BlockQuote {
+            children: vec![Node::Blockquote(Blockquote {
                 children: vec![Node::Paragraph(Paragraph {
                     children: vec![Node::Text(Text {
                         value: "a".into(),