Fix warnings

1 files changed, 4 insertions, 6 deletions

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()?),