Remove the SetSource trait.
It was only being used for creating paragraphs of specific text, so I just adjusted the of_text function to handle it.
This commit is contained in:
@@ -22,7 +22,6 @@ use super::CenterBlock;
|
||||
use super::Drawer;
|
||||
use super::GetStandardProperties;
|
||||
use super::QuoteBlock;
|
||||
use super::SetSource;
|
||||
use super::SpecialBlock;
|
||||
use super::StandardProperties;
|
||||
|
||||
@@ -55,38 +54,6 @@ pub enum Element<'s> {
|
||||
LatexEnvironment(LatexEnvironment<'s>),
|
||||
}
|
||||
|
||||
impl<'s> SetSource<'s> for Element<'s> {
|
||||
#[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
|
||||
fn set_source(&mut self, source: &'s str) {
|
||||
match self {
|
||||
Element::Paragraph(obj) => obj.source = source,
|
||||
Element::PlainList(obj) => obj.source = source,
|
||||
Element::CenterBlock(obj) => obj.source = source,
|
||||
Element::QuoteBlock(obj) => obj.source = source,
|
||||
Element::SpecialBlock(obj) => obj.source = source,
|
||||
Element::DynamicBlock(obj) => obj.source = source,
|
||||
Element::FootnoteDefinition(obj) => obj.source = source,
|
||||
Element::Comment(obj) => obj.source = source,
|
||||
Element::Drawer(obj) => obj.source = source,
|
||||
Element::PropertyDrawer(obj) => obj.source = source,
|
||||
Element::Table(obj) => obj.source = source,
|
||||
Element::VerseBlock(obj) => obj.source = source,
|
||||
Element::CommentBlock(obj) => obj.source = source,
|
||||
Element::ExampleBlock(obj) => obj.source = source,
|
||||
Element::ExportBlock(obj) => obj.source = source,
|
||||
Element::SrcBlock(obj) => obj.source = source,
|
||||
Element::Clock(obj) => obj.source = source,
|
||||
Element::DiarySexp(obj) => obj.source = source,
|
||||
Element::Planning(obj) => obj.source = source,
|
||||
Element::FixedWidthArea(obj) => obj.source = source,
|
||||
Element::HorizontalRule(obj) => obj.source = source,
|
||||
Element::Keyword(obj) => obj.source = source,
|
||||
Element::BabelCall(obj) => obj.source = source,
|
||||
Element::LatexEnvironment(obj) => obj.source = source,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl<'s> GetStandardProperties<'s> for Element<'s> {
|
||||
fn get_standard_properties<'b>(&'b self) -> &'b dyn StandardProperties<'s> {
|
||||
match self {
|
||||
|
||||
@@ -169,11 +169,11 @@ impl<'s> Paragraph<'s> {
|
||||
/// Generate a paragraph of the passed in text with no additional properties.
|
||||
///
|
||||
/// This is used for elements that support an "empty" content like greater blocks.
|
||||
pub(crate) fn of_text(input: &'s str) -> Self {
|
||||
pub(crate) fn of_text(source: &'s str, body: &'s str) -> Self {
|
||||
Paragraph {
|
||||
source: input,
|
||||
source,
|
||||
affiliated_keywords: AffiliatedKeywords::default(),
|
||||
children: vec![Object::PlainText(PlainText { source: input })],
|
||||
children: vec![Object::PlainText(PlainText { source: body })],
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,7 +7,6 @@ mod greater_element;
|
||||
mod lesser_element;
|
||||
mod macros;
|
||||
mod object;
|
||||
mod source;
|
||||
mod standard_properties;
|
||||
mod util;
|
||||
pub use affiliated_keyword::AffiliatedKeyword;
|
||||
@@ -113,5 +112,4 @@ pub use object::WarningDelay;
|
||||
pub use object::WarningDelayType;
|
||||
pub use object::Year;
|
||||
pub use object::YearInner;
|
||||
pub(crate) use source::SetSource;
|
||||
pub use standard_properties::StandardProperties;
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
pub(crate) trait SetSource<'s> {
|
||||
fn set_source(&mut self, source: &'s str);
|
||||
}
|
||||
Reference in New Issue
Block a user