Skip to content

Commit b8e2db7

Browse files
committed
Reuse existing impl
1 parent 21194f4 commit b8e2db7

File tree

1 file changed

+5
-35
lines changed

1 file changed

+5
-35
lines changed

src/writer/events.rs

Lines changed: 5 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -257,42 +257,12 @@ impl<'a> From<StartElementBuilder<'a>> for XmlEvent<'a> {
257257
}
258258

259259
impl<'a> TryFrom<&'a crate::reader::XmlEvent> for XmlEvent<'a> {
260-
type Error = ();
260+
type Error = crate::reader::Error;
261261

262262
fn try_from(event: &crate::reader::XmlEvent) -> Result<XmlEvent<'_>, Self::Error> {
263-
match event {
264-
crate::reader::XmlEvent::StartDocument {
265-
version,
266-
encoding,
267-
standalone,
268-
} => Ok(XmlEvent::StartDocument {
269-
version: version.clone(),
270-
encoding: Some(&encoding),
271-
standalone: standalone.clone(),
272-
}),
273-
crate::reader::XmlEvent::EndDocument => Err(()),
274-
crate::reader::XmlEvent::ProcessingInstruction { name, data } => {
275-
Ok(XmlEvent::ProcessingInstruction {
276-
name: &name,
277-
data: data.as_deref(),
278-
})
279-
}
280-
crate::reader::XmlEvent::StartElement {
281-
name,
282-
attributes,
283-
namespace,
284-
} => Ok(XmlEvent::StartElement {
285-
name: name.borrow(),
286-
attributes: Cow::Owned(attributes.iter().map(|attr| attr.borrow()).collect()),
287-
namespace: namespace.borrow(),
288-
}),
289-
crate::reader::XmlEvent::EndElement { name } => Ok(XmlEvent::EndElement {
290-
name: Some(name.borrow()),
291-
}),
292-
crate::reader::XmlEvent::CData(chars) => Ok(XmlEvent::CData(chars)),
293-
crate::reader::XmlEvent::Comment(chars) => Ok(XmlEvent::Comment(chars)),
294-
crate::reader::XmlEvent::Characters(chars) => Ok(XmlEvent::Characters(chars)),
295-
crate::reader::XmlEvent::Whitespace(chars) => Ok(XmlEvent::Characters(chars)),
296-
}
263+
event.as_writer_event().ok_or(crate::reader::Error {
264+
pos: crate::common::TextPosition::new(),
265+
kind: crate::reader::ErrorKind::UnexpectedEof,
266+
})
297267
}
298268
}

0 commit comments

Comments
 (0)