Merge branch 'main' into test/unordered-and-ordered-list

Signed-off-by: Titus <[email protected]>

Author: wooorm

Untitled.txt

@@ -6,7 +6,6 @@ micromark.js: `atLineEnding` in html (text) should always eat arbitrary whitespa
 ```rs
 // ---------------------
 // Useful helper:
-extern crate std;
 use std::println;
 use alloc::string::String;
 

benches/bench.rs

@@ -1,6 +1,4 @@
-#[macro_use]
-extern crate criterion;
-use criterion::{BenchmarkId, Criterion};
+use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
 use std::fs;
 
 fn readme(c: &mut Criterion) {

build.rs

@@ -1,4 +1,3 @@
-extern crate reqwest;
 use regex::Regex;
 use std::fs;
 
@@ -67,7 +66,6 @@ async fn commonmark() {
 // > 👉 **Important**: this module is generated by `build.rs`.
 // > It is generate from the latest CommonMark website.
 
-extern crate markdown;
 use markdown::{{to_html_with_options, CompileOptions, Options}};
 use pretty_assertions::assert_eq;
 

examples/lib.rs

@@ -1,5 +1,3 @@
-extern crate markdown;
-
 fn main() -> Result<(), String> {
     // Turn on debugging.
     // You can show it with `RUST_LOG=debug cargo run --example lib`

fuzz/fuzz_targets/markdown.rs

@@ -1,14 +1,10 @@
 #![no_main]
 use libfuzzer_sys::fuzz_target;
-extern crate markdown;
 
 fuzz_target!(|data: &[u8]| {
     if let Ok(s) = std::str::from_utf8(data) {
         let _ = markdown::to_html(s);
-        let _ = markdown::to_html_with_options(
-            s,
-            &markdown::Options::gfm()
-        );
+        let _ = markdown::to_html_with_options(s, &markdown::Options::gfm());
         let _ = markdown::to_mdast(s, &markdown::ParseOptions::default());
         let _ = markdown::to_mdast(s, &markdown::ParseOptions::gfm());
     }

readme.md

@@ -90,8 +90,6 @@ cargo add [email protected]
 ## Use
 
 ```rs
-extern crate markdown;
-
 fn main() {
     println!("{}", markdown::to_html("## Hello, *world*!"));
 }
@@ -106,8 +104,6 @@ Yields:
 Extensions (in this case GFM):
 
 ```rs
-extern crate markdown;
-
 fn main() -> Result<(), String> {
     println!(
         "{}",
@@ -136,8 +132,6 @@ Yields:
 Syntax tree ([mdast][]):
 
 ```rs
-extern crate markdown;
-
 fn main() -> Result<(), String> {
     println!(
         "{:?}",

src/configuration.rs

@@ -1236,7 +1236,6 @@ impl Options {
 
 #[cfg(test)]
 mod tests {
-    extern crate std;
     use super::*;
     use crate::util::mdx::Signal;
     use alloc::format;

src/construct/attention.rs

@@ -92,8 +92,10 @@ use alloc::{vec, vec::Vec};
 struct Sequence {
     /// Marker as a byte (`u8`) used in this sequence.
     marker: u8,
-    /// The depth in events where this sequence resides.
-    balance: usize,
+    /// We track whether sequences are in balanced events, and where those
+    /// events start, so that one attention doesn’t start in say, one link, and
+    /// end in another.
+    stack: Vec<usize>,
     /// The index into events where this sequence’s `Enter` currently resides.
     index: usize,
     /// The (shifted) point where this sequence starts.
@@ -172,7 +174,7 @@ pub fn resolve(tokenizer: &mut Tokenizer) -> Option<Subresult> {
                 // An opener matching our closer:
                 if sequence_open.open
                     && sequence_close.marker == sequence_open.marker
-                    && sequence_close.balance == sequence_open.balance
+                    && sequence_close.stack == sequence_open.stack
                 {
                     // If the opening can close or the closing can open,
                     // and the close size *is not* a multiple of three,
@@ -219,23 +221,20 @@ pub fn resolve(tokenizer: &mut Tokenizer) -> Option<Subresult> {
     }
 
     tokenizer.map.consume(&mut tokenizer.events);
-
     None
 }
 
 /// Get sequences.
 fn get_sequences(tokenizer: &mut Tokenizer) -> Vec<Sequence> {
     let mut index = 0;
-    let mut balance = 0;
+    let mut stack = vec![];
     let mut sequences = vec![];
 
     while index < tokenizer.events.len() {
         let enter = &tokenizer.events[index];
 
-        if enter.kind == Kind::Enter {
-            balance += 1;
-
-            if enter.name == Name::AttentionSequence {
+        if enter.name == Name::AttentionSequence {
+            if enter.kind == Kind::Enter {
                 let end = index + 1;
                 let exit = &tokenizer.events[end];
 
@@ -255,7 +254,7 @@ fn get_sequences(tokenizer: &mut Tokenizer) -> Vec<Sequence> {
 
                 sequences.push(Sequence {
                     index,
-                    balance,
+                    stack: stack.clone(),
                     start_point: enter.point.clone(),
                     end_point: exit.point.clone(),
                     size: exit.point.index - enter.point.index,
@@ -272,8 +271,10 @@ fn get_sequences(tokenizer: &mut Tokenizer) -> Vec<Sequence> {
                     marker,
                 });
             }
+        } else if enter.kind == Kind::Enter {
+            stack.push(index);
         } else {
-            balance -= 1;
+            stack.pop();
         }
 
         index += 1;

src/construct/document.rs

@@ -423,7 +423,7 @@ pub fn flow_end(tokenizer: &mut Tokenizer) -> State {
     if !document_lazy_continuation_current && !child.events.is_empty() {
         let before = skip::opt_back(&child.events, child.events.len() - 1, &[Name::LineEnding]);
         let name = &child.events[before].name;
-        if name == &Name::Content {
+        if name == &Name::Content || name == &Name::HeadingSetextUnderline {
             document_lazy_continuation_current = true;
         }
     }

src/construct/gfm_autolink_literal.rs

@@ -334,7 +334,7 @@ pub fn www_prefix_inside(tokenizer: &mut Tokenizer) -> State {
 /// ```
 pub fn www_prefix_after(tokenizer: &mut Tokenizer) -> State {
     // If there is *anything*, we can link.
-    if tokenizer.current == None {
+    if tokenizer.current.is_none() {
         State::Nok
     } else {
         State::Ok