fnmain/jotdown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

stuufff

Browse source
This commit is contained in:
Noah Hellman 2022-12-18 07:59:11 +01:00
parent 5ac05d1919
commit be333b8715
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/lib.rs
View file

@ -60,7 +60,7 @@ pub enum Container<'s> {
Span, Span,
/// An inline link with a destination URL. /// An inline link with a destination URL.
Link(CowStr<'s>, LinkType), Link(CowStr<'s>, LinkType),
/// An inline image with a source URL. /// An inline image with a source URL. Inner Str objects compose the alternative text.
Image(CowStr<'s>, SpanLinkType), Image(CowStr<'s>, SpanLinkType),
/// An inline verbatim string. /// An inline verbatim string.
Verbatim, Verbatim,
@ -251,8 +251,8 @@ impl<'s> Container<'s> {
} }
} }
// Attributes are rare, better to pay 8 bytes always and sometimes an extra indirection instead of // Attributes are relatively rare, we choose to pay 8 bytes always and sometimes an extra
// always 24 bytes. // indirection instead of always 24 bytes.
#[derive(Debug, Clone, PartialEq, Eq)] #[derive(Debug, Clone, PartialEq, Eq)]
pub struct Attributes<'s>(Option<Box<Vec<(&'s str, &'s str)>>>); pub struct Attributes<'s>(Option<Box<Vec<(&'s str, &'s str)>>>);
@ -280,7 +280,6 @@ struct InlineChars<'s, 't> {
} }
// Implement inlines.flat_map(|sp| sp.of(self.src).chars()) // Implement inlines.flat_map(|sp| sp.of(self.src).chars())
// Is there a better way to do this?
impl<'s, 't> InlineChars<'s, 't> { impl<'s, 't> InlineChars<'s, 't> {
fn new(src: &'s str, inlines: &'t [Span]) -> Self { fn new(src: &'s str, inlines: &'t [Span]) -> Self {
Self { Self {
@ -346,11 +345,17 @@ impl<'s> Parser<'s> {
inline::Container::SingleQuoted => Container::SingleQuoted, inline::Container::SingleQuoted => Container::SingleQuoted,
inline::Container::DoubleQuoted => Container::DoubleQuoted, inline::Container::DoubleQuoted => Container::DoubleQuoted,
inline::Container::InlineLink => Container::Link( inline::Container::InlineLink => Container::Link(
self.inline_str(inline.span).replace('\n', "").into(), match self.inline_str(inline.span) {
CowStr::Owned(s) => s.replace('\n', "").into(),
s @ CowStr::Borrowed(_) => s,
},
LinkType::Span(SpanLinkType::Inline), LinkType::Span(SpanLinkType::Inline),
), ),
inline::Container::InlineImage => Container::Image( inline::Container::InlineImage => Container::Image(
self.inline_str(inline.span).replace('\n', "").into(), match self.inline_str(inline.span) {
CowStr::Owned(s) => s.replace('\n', "").into(),
s @ CowStr::Borrowed(_) => s,
},
SpanLinkType::Inline, SpanLinkType::Inline,
), ),
_ => todo!("{:?}", c), _ => todo!("{:?}", c),