diff options
| -rw-r--r-- | src/document_tree/elements.rs | 2 | ||||
| -rw-r--r-- | src/parser/conversion/block.rs | 10 | ||||
| -rw-r--r-- | src/parser/conversion/inline.rs | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/document_tree/elements.rs b/src/document_tree/elements.rs index e1f0245..72f10e8 100644 --- a/src/document_tree/elements.rs +++ b/src/document_tree/elements.rs @@ -54,6 +54,7 @@ macro_rules! impl_element { ($name:ident) => ( macro_rules! impl_children { ($name:ident, $childtype:ident) => ( impl HasChildren<$childtype> for $name { + #[allow(clippy::needless_update)] fn with_children(children: Vec<$childtype>) -> $name { $name { children: children, ..Default::default() } } fn children (& self) -> & Vec<$childtype> { & self.children } fn children_mut(&mut self) -> &mut Vec<$childtype> { &mut self.children } @@ -62,6 +63,7 @@ macro_rules! impl_children { ($name:ident, $childtype:ident) => ( macro_rules! impl_extra { ($name:ident $($more:tt)*) => ( impl ExtraAttributes<extra_attributes::$name> for $name { + #[allow(clippy::needless_update)] fn with_extra(extra: extra_attributes::$name) -> $name { $name { common: Default::default(), extra: extra $($more)* } } fn extra (& self) -> & extra_attributes::$name { & self.extra } fn extra_mut(&mut self) -> &mut extra_attributes::$name { &mut self.extra } diff --git a/src/parser/conversion/block.rs b/src/parser/conversion/block.rs index eba50b1..f3ef923 100644 --- a/src/parser/conversion/block.rs +++ b/src/parser/conversion/block.rs @@ -5,7 +5,6 @@ use crate::document_tree::{ Element,HasChildren,ExtraAttributes, elements as e, element_categories as c, - attribute_types::{ID,NameToken}, extra_attributes as a, }; @@ -62,9 +61,8 @@ fn convert_target(pair: Pair<Rule>) -> Result<e::Target, Error> { for p in pair.into_inner() { match p.as_rule() { Rule::target_name_uq | Rule::target_name_qu => { - //TODO: abstract away - attrs.refid = Some( ID(p.as_str().to_owned().replace(' ', "-"))); - attrs.refname.push(NameToken(p.as_str().to_owned())); + attrs.refid = Some(p.as_str().into()); + attrs.refname.push(p.as_str().into()); }, Rule::link_target => attrs.refuri = Some(p.parse()?), rule => panic!("Unexpected rule in target: {:?}", rule), @@ -82,7 +80,7 @@ fn convert_substitution_def(pair: Pair<Rule>) -> Result<e::SubstitutionDefinitio rule => panic!("Unknown substitution rule {:?}", rule), }; let mut subst_def = e::SubstitutionDefinition::with_children(vec![inner]); - subst_def.names_mut().push(NameToken(name.to_owned())); + subst_def.names_mut().push(name.into()); Ok(subst_def) } @@ -99,7 +97,7 @@ fn convert_image<I>(pair: Pair<Rule>) -> Result<I, Error> where I: Element + Ext let opt_val = opt_iter.next().unwrap(); match opt_name.as_str() { "class" => image.classes_mut().push(opt_val.as_str().to_owned()), - "name" => image.names_mut().push(NameToken(opt_val.as_str().to_owned())), + "name" => image.names_mut().push(opt_val.as_str().into()), "alt" => image.extra_mut().alt = Some(opt_val.as_str().to_owned()), "height" => image.extra_mut().height = Some(opt_val.parse()?), "width" => image.extra_mut().width = Some(opt_val.parse()?), diff --git a/src/parser/conversion/inline.rs b/src/parser/conversion/inline.rs index 1697a06..8e4ce1f 100644 --- a/src/parser/conversion/inline.rs +++ b/src/parser/conversion/inline.rs @@ -23,10 +23,10 @@ pub fn convert_inline(pair: Pair<Rule>) -> Result<c::TextOrInlineElement, Error> } fn convert_reference(pair: Pair<Rule>) -> Result<e::Reference, Error> { - let mut name = None; - let /*mut*/ refuri = None; - let mut refid = None; - let /*mut*/ refname = vec![]; + let name; + let refuri = None; + let refid; + let refname = vec![]; let concrete = pair.into_inner().next().unwrap(); match concrete.as_rule() { Rule::reference_target => { |