From a1ce43e428754084474a7ecf88ae6debf88b9164 Mon Sep 17 00:00:00 2001 From: Titus Wormer Date: Tue, 14 Jun 2022 13:47:32 +0200 Subject: Reorganize to split util --- src/construct/character_reference.rs | 4 ++-- src/construct/code_fenced.rs | 6 +++--- src/construct/mod.rs | 1 - 3 files changed, 5 insertions(+), 6 deletions(-) (limited to 'src/construct') diff --git a/src/construct/character_reference.rs b/src/construct/character_reference.rs index 943d70f..ba2ad61 100644 --- a/src/construct/character_reference.rs +++ b/src/construct/character_reference.rs @@ -20,7 +20,7 @@ //! However, for security reasons, several numeric character references parse //! fine but are not rendered as their corresponding character and they are //! instead replaced by a U+FFFD REPLACEMENT CHARACTER (`�`). -//! See [`decode_numeric_character_reference`][decode_numeric] for more info. +//! See [`decode_numeric`][decode_numeric] for more info. //! //! To escape ASCII punctuation characters, use the terser //! [character escape][character_escape] construct instead (as in, `\&`). @@ -48,7 +48,7 @@ //! [string]: crate::content::string //! [text]: crate::content::text //! [character_escape]: crate::construct::character_reference -//! [decode_numeric]: crate::util::decode_numeric_character_reference +//! [decode_numeric]: crate::util::decode_character_reference::decode_numeric //! [character_reference_names]: crate::constant::CHARACTER_REFERENCE_NAMES //! [html]: https://html.spec.whatwg.org/multipage/parsing.html#character-reference-state //! diff --git a/src/construct/code_fenced.rs b/src/construct/code_fenced.rs index a440d40..c852e8d 100644 --- a/src/construct/code_fenced.rs +++ b/src/construct/code_fenced.rs @@ -91,7 +91,7 @@ use crate::constant::{CODE_FENCED_SEQUENCE_SIZE_MIN, TAB_SIZE}; use crate::construct::partial_whitespace::start as whitespace; use crate::tokenizer::{Code, State, StateFnResult, TokenType, Tokenizer}; -use crate::util::get_span; +use crate::util::span::from_exit_event; /// Kind of fences. #[derive(Debug, Clone, PartialEq)] @@ -147,7 +147,7 @@ fn before_sequence_open(tokenizer: &mut Tokenizer, code: Code) -> StateFnResult if let Some(event) = tail { if event.token_type == TokenType::Whitespace { - let span = get_span(&tokenizer.events, tokenizer.events.len() - 1); + let span = from_exit_event(&tokenizer.events, tokenizer.events.len() - 1); prefix = span.end_index - span.start_index; } } @@ -415,7 +415,7 @@ fn close_sequence_before(tokenizer: &mut Tokenizer, info: Info, code: Code) -> S if let Some(event) = tail { if event.token_type == TokenType::Whitespace { - let span = get_span(&tokenizer.events, tokenizer.events.len() - 1); + let span = from_exit_event(&tokenizer.events, tokenizer.events.len() - 1); prefix = span.end_index - span.start_index; } } diff --git a/src/construct/mod.rs b/src/construct/mod.rs index d2203d2..14f53a0 100644 --- a/src/construct/mod.rs +++ b/src/construct/mod.rs @@ -53,7 +53,6 @@ //! example `ascii_punctuation` refers to //! [`char::is_ascii_punctuation`][char::is_ascii_punctuation]. - pub mod autolink; pub mod blank_line; pub mod character_escape; -- cgit