Merge pull request #675 from kivikakk/push-xsrxvrqonwlk

Factor out inlines::Scanner, and Other Such Cleanups.

Author: kivikakk

fuzz/fuzz_targets/quadratic.rs

@@ -200,6 +200,7 @@ struct FuzzExtensionOptions {
     spoiler: bool,
     greentext: bool,
     alerts: bool,
+    inline_footnotes: bool,
 }
 
 impl FuzzExtensionOptions {
@@ -212,6 +213,7 @@ impl FuzzExtensionOptions {
             tasklist: self.tasklist,
             superscript: self.superscript,
             footnotes: self.footnotes,
+            inline_footnotes: self.inline_footnotes,
             description_lists: self.description_lists,
             multiline_block_quotes: self.multiline_block_quotes,
             math_dollars: self.math_dollars,

src/cm.rs

@@ -2,7 +2,6 @@ use std::cmp::max;
 use std::collections::HashSet;
 use std::fmt::{self, Write};
 use std::str;
-use typed_arena::Arena;
 
 use crate::ctype::{isalpha, isdigit, ispunct, ispunct_char, isspace, isspace_char};
 use crate::node_matches;
@@ -15,6 +14,7 @@ use crate::parser::options::{Options, Plugins, WikiLinksMode};
 use crate::parser::shortcodes::NodeShortCode;
 use crate::scanners;
 use crate::strings::trim_start_match;
+use crate::Arena;
 
 /// Formats an AST as CommonMark, modified by the given options.
 pub fn format_document<'a>(

src/lib.rs

@@ -94,10 +94,12 @@ pub use html::Anchorizer;
 pub use nodes::Node;
 pub use parser::options;
 pub use parser::{parse_document, Options, ResolvedReference};
-pub use typed_arena::Arena;
 pub use xml::format_document as format_xml;
 pub use xml::format_document_with_plugins as format_xml_with_plugins;
 
+/// Convenience type alias for arena used to hold nodes.
+pub type Arena<'a> = typed_arena::Arena<nodes::AstNode<'a>>;
+
 #[deprecated(
     since = "0.45.0",
     note = "use `comrak::options::Extension` instead of `comrak::ExtensionOptions`"

src/nodes.rs

@@ -724,6 +724,12 @@ impl std::fmt::Display for Sourcepos {
     }
 }
 
+impl From<(LineColumn, LineColumn)> for Sourcepos {
+    fn from((start, end): (LineColumn, LineColumn)) -> Sourcepos {
+        Sourcepos { start, end }
+    }
+}
+
 impl From<(usize, usize, usize, usize)> for Sourcepos {
     fn from(sp: (usize, usize, usize, usize)) -> Sourcepos {
         Sourcepos {
@@ -827,7 +833,7 @@ impl Ast {
 ///
 /// ```rust
 /// # use comrak::{nodes::{AstNode, NodeValue}, Arena};
-/// # let arena = Arena::<AstNode>::new();
+/// # let arena = Arena::new();
 /// let node_in_arena = arena.alloc(NodeValue::Document.into());
 /// ```
 pub type AstNode<'a> = arena_tree::Node<'a, RefCell<Ast>>;

src/parser/autolink.rs

@@ -1,17 +1,18 @@
+use std::borrow::Cow;
 use std::str;
-use typed_arena::Arena;
 use unicode_categories::UnicodeCategories;
 
 use crate::character_set::character_set;
 use crate::ctype::{isalnum, isalpha, isspace};
-use crate::nodes::{AstNode, Node, NodeLink, NodeValue, Sourcepos};
-use crate::parser::inlines::Subject;
-use crate::parser::{inlines::make_inline, Spx};
+use crate::nodes::{Node, NodeLink, NodeValue, Sourcepos};
+use crate::parser::inlines::{make_inline, Subject};
+use crate::parser::Spx;
+use crate::Arena;
 
 pub(crate) fn process_email_autolinks<'a>(
-    arena: &'a Arena<AstNode<'a>>,
+    arena: &'a Arena<'a>,
     node: Node<'a>,
-    contents: &mut String,
+    contents: &mut Cow<'static, str>,
     relaxed_autolinks: bool,
     sourcepos: &mut Sourcepos,
     spx: &mut Spx,
@@ -69,7 +70,7 @@ pub(crate) fn process_email_autolinks<'a>(
 
             let nsp_end_col = spx.consume(skip);
 
-            contents.truncate(i);
+            contents.to_mut().truncate(i);
 
             let nsp: Sourcepos = (
                 sourcepos.end.line,
@@ -95,26 +96,20 @@ pub(crate) fn process_email_autolinks<'a>(
                 post.insert_after(after);
 
                 let after_ast = &mut after.data_mut();
-                process_email_autolinks(
-                    arena,
-                    after,
-                    match after_ast.value {
-                        NodeValue::Text(ref mut t) => t.to_mut(),
-                        _ => unreachable!(),
-                    },
-                    relaxed_autolinks,
-                    &mut asp,
-                    spx,
-                );
+                let NodeValue::Text(ref mut text) = after_ast.value else {
+                    unreachable!();
+                };
+                process_email_autolinks(arena, after, text, relaxed_autolinks, &mut asp, spx);
                 after_ast.sourcepos = asp;
             }
 
             return;
         }
     }
 }
+
 fn email_match<'a>(
-    arena: &'a Arena<AstNode<'a>>,
+    arena: &'a Arena<'a>,
     contents: &str,
     i: usize,
     relaxed_autolinks: bool,
@@ -231,7 +226,7 @@ pub fn www_match<'a>(
     subject: &mut Subject<'a, '_, '_, '_, '_, '_>,
 ) -> Option<(Node<'a>, usize, usize)> {
     const WWW_DELIMS: [bool; 256] = character_set!(b"*_~([");
-    let i = subject.pos;
+    let i = subject.scanner.pos;
     let relaxed_autolinks = subject.options.parse.relaxed_autolinks;
     let bytes = subject.input.as_bytes();
 
@@ -397,7 +392,7 @@ pub fn url_match<'a>(
 ) -> Option<(Node<'a>, usize, usize)> {
     const SCHEMES: [&str; 3] = ["http", "https", "ftp"];
 
-    let i = subject.pos;
+    let i = subject.scanner.pos;
     let relaxed_autolinks = subject.options.parse.relaxed_autolinks;
     let bytes = subject.input.as_bytes();
     let size = subject.input.len();