From b847eb92850a04884361f6c9fd58308626efda21 Mon Sep 17 00:00:00 2001 From: PoiScript Date: Fri, 28 Jun 2019 16:40:16 +0800 Subject: [PATCH] fix(elements): don't export element parse function --- src/elements/block.rs | 2 +- src/elements/emphasis.rs | 2 +- src/elements/fn_def.rs | 2 +- src/elements/fn_ref.rs | 2 +- src/elements/list.rs | 2 +- src/elements/mod.rs | 3 ++- src/org.rs | 12 ++++++------ 7 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/elements/block.rs b/src/elements/block.rs index ab94463..1f334ac 100644 --- a/src/elements/block.rs +++ b/src/elements/block.rs @@ -12,7 +12,7 @@ pub struct Block<'a> { impl Block<'_> { #[inline] // return (block, contents-begin, contents-end, end) - pub fn parse(text: &str) -> Option<(Block<'_>, usize, usize, usize)> { + pub(crate) fn parse(text: &str) -> Option<(Block<'_>, usize, usize, usize)> { debug_assert!(text.starts_with("#+")); if text.len() <= 8 || text[2..8].to_uppercase() != "BEGIN_" { diff --git a/src/elements/emphasis.rs b/src/elements/emphasis.rs index d11d0b8..28c6bd8 100644 --- a/src/elements/emphasis.rs +++ b/src/elements/emphasis.rs @@ -2,7 +2,7 @@ use bytecount::count; use memchr::memchr; #[inline] -pub fn parse(text: &str, marker: u8) -> Option { +pub(crate) fn parse(text: &str, marker: u8) -> Option { debug_assert!(text.len() >= 3); let bytes = text.as_bytes(); diff --git a/src/elements/fn_def.rs b/src/elements/fn_def.rs index 48851a8..d535de5 100644 --- a/src/elements/fn_def.rs +++ b/src/elements/fn_def.rs @@ -9,7 +9,7 @@ pub struct FnDef<'a> { impl FnDef<'_> { #[inline] - pub fn parse(text: &str) -> Option<(FnDef<'_>, usize, usize)> { + pub(crate) fn parse(text: &str) -> Option<(FnDef<'_>, usize, usize)> { if text.starts_with("[fn:") { let (label, off) = memchr(b']', text.as_bytes()) .filter(|&i| { diff --git a/src/elements/fn_ref.rs b/src/elements/fn_ref.rs index b9c724a..d7198f4 100644 --- a/src/elements/fn_ref.rs +++ b/src/elements/fn_ref.rs @@ -13,7 +13,7 @@ pub struct FnRef<'a> { impl FnRef<'_> { #[inline] // return (fn_ref, offset) - pub fn parse(text: &str) -> Option<(FnRef<'_>, usize)> { + pub(crate) fn parse(text: &str) -> Option<(FnRef<'_>, usize)> { debug_assert!(text.starts_with("[fn:")); let bytes = text.as_bytes(); diff --git a/src/elements/list.rs b/src/elements/list.rs index ab49ddb..bd8ee81 100644 --- a/src/elements/list.rs +++ b/src/elements/list.rs @@ -69,7 +69,7 @@ pub struct ListItem<'a> { } impl ListItem<'_> { - pub fn parse(text: &str, indent: usize) -> (ListItem<'_>, usize, usize) { + pub(crate) fn parse(text: &str, indent: usize) -> (ListItem<'_>, usize, usize) { debug_assert!(&text[0..indent].trim().is_empty()); let off = &text[indent..].find(' ').unwrap() + 1 + indent; diff --git a/src/elements/mod.rs b/src/elements/mod.rs index 2490a44..9044599 100644 --- a/src/elements/mod.rs +++ b/src/elements/mod.rs @@ -5,6 +5,7 @@ mod clock; mod cookie; mod drawer; mod dyn_block; +mod emphasis; mod fn_def; mod fn_ref; mod headline; @@ -21,7 +22,7 @@ mod snippet; mod target; mod timestamp; -pub(crate) mod emphasis; +pub(crate) use emphasis::parse as parse_emphasis; pub use self::{ block::Block, diff --git a/src/org.rs b/src/org.rs index 51870ad..b31f342 100644 --- a/src/org.rs +++ b/src/org.rs @@ -652,7 +652,7 @@ impl<'a> Org<'a> { }) } } - b'*' => emphasis::parse(text, b'*').map(|off| { + b'*' => parse_emphasis(text, b'*').map(|off| { ( Element::Bold { begin, @@ -663,7 +663,7 @@ impl<'a> Org<'a> { off, ) }), - b'+' => emphasis::parse(text, b'+').map(|off| { + b'+' => parse_emphasis(text, b'+').map(|off| { ( Element::Strike { begin, @@ -674,7 +674,7 @@ impl<'a> Org<'a> { off, ) }), - b'/' => emphasis::parse(text, b'/').map(|off| { + b'/' => parse_emphasis(text, b'/').map(|off| { ( Element::Italic { begin, @@ -685,7 +685,7 @@ impl<'a> Org<'a> { off, ) }), - b'_' => emphasis::parse(text, b'_').map(|off| { + b'_' => parse_emphasis(text, b'_').map(|off| { ( Element::Underline { begin, @@ -696,7 +696,7 @@ impl<'a> Org<'a> { off, ) }), - b'=' => emphasis::parse(text, b'=').map(|off| { + b'=' => parse_emphasis(text, b'=').map(|off| { ( Element::Verbatim { begin, @@ -706,7 +706,7 @@ impl<'a> Org<'a> { off, ) }), - b'~' => emphasis::parse(text, b'~').map(|off| { + b'~' => parse_emphasis(text, b'~').map(|off| { ( Element::Code { begin,