Skip to content

Commit 236086f

Browse files
committed
Remove EntityResolver's unnessisary lifetime
1 parent 17d2c1a commit 236086f

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/de/mod.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1963,7 +1963,7 @@ impl<'a> PayloadEvent<'a> {
19631963
/// An intermediate reader that consumes [`PayloadEvent`]s and produces final [`DeEvent`]s.
19641964
/// [`PayloadEvent::Text`] events, that followed by any event except
19651965
/// [`PayloadEvent::Text`] or [`PayloadEvent::CData`], are trimmed from the end.
1966-
struct XmlReader<'i, R: XmlRead<'i>, E: EntityResolver<'i> = DefaultEntityResolver> {
1966+
struct XmlReader<'i, R: XmlRead<'i>, E: EntityResolver = DefaultEntityResolver> {
19671967
/// A source of low-level XML events
19681968
reader: R,
19691969
/// Intermediate event, that could be returned by the next call to `next()`.
@@ -1975,7 +1975,7 @@ struct XmlReader<'i, R: XmlRead<'i>, E: EntityResolver<'i> = DefaultEntityResolv
19751975
entity_resolver: E
19761976
}
19771977

1978-
impl<'i, R: XmlRead<'i>, E: EntityResolver<'i>> XmlReader<'i, R, E> {
1978+
impl<'i, R: XmlRead<'i>, E: EntityResolver> XmlReader<'i, R, E> {
19791979
fn new(reader: R) -> Self
19801980
where E: Default {
19811981
Self::with_resolver(reader, E::default())
@@ -2184,7 +2184,7 @@ where
21842184
////////////////////////////////////////////////////////////////////////////////////////////////////
21852185

21862186
/// A structure that deserializes XML into Rust values.
2187-
pub struct Deserializer<'de, R, S: EntityResolver<'de> = DefaultEntityResolver>
2187+
pub struct Deserializer<'de, R, S: EntityResolver = DefaultEntityResolver>
21882188
where
21892189
R: XmlRead<'de>,
21902190
{
@@ -2579,7 +2579,7 @@ where
25792579
}
25802580

25812581

2582-
impl<'de, R, E: EntityResolver<'de>> Deserializer<'de, IoReader<R>, E>
2582+
impl<'de, R, E: EntityResolver> Deserializer<'de, IoReader<R>, E>
25832583
where
25842584
R: BufRead,
25852585
{

src/resolver.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
use crate::events::BytesText;
55

66
/// Used to resolve unknown entities while parsing
7-
pub trait EntityResolver<'entity_out> {
7+
pub trait EntityResolver {
88
/// Called on contents of [`Event::DocType`] to capture declared entities.
99
/// Can be called multiple times, for each parsed `<!DOCTYPE >` declaration.
1010
fn capture(&mut self, doctype: BytesText);
@@ -20,7 +20,7 @@ pub trait EntityResolver<'entity_out> {
2020
#[derive(Default, Copy, Clone)]
2121
pub struct DefaultEntityResolver;
2222

23-
impl<'entity_out> EntityResolver<'entity_out> for DefaultEntityResolver{
23+
impl<'entity_out> EntityResolver for DefaultEntityResolver{
2424
fn resolve<'entity>(&'entity self, _: &str) -> Option<&'entity str> {
2525
None
2626
}

0 commit comments

Comments
 (0)