Skip to content

Commit

Permalink
Remove unnecessary lifetime for Read trait
Browse files Browse the repository at this point in the history
  • Loading branch information
bluk committed Apr 1, 2022
1 parent e98aa09 commit 2bcd59e
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
12 changes: 6 additions & 6 deletions src/de.rs
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ pub struct Deserializer<R> {
read: R,
}

impl<'de, R> Deserializer<R>
impl<R> Deserializer<R>
where
R: read::Read<'de>,
R: Read,
{
/// Constructs a Deserializer from a readable source.
pub fn new(read: R) -> Self {
Expand Down Expand Up @@ -316,7 +316,7 @@ macro_rules! forward_deserialize_unsigned_integer {
};
}

impl<'de, 'a, R: Read<'de>> de::Deserializer<'de> for &'a mut Deserializer<R> {
impl<'de, 'a, R: Read> de::Deserializer<'de> for &'a mut Deserializer<R> {
type Error = Error;

#[inline]
Expand Down Expand Up @@ -563,7 +563,7 @@ impl<'a, R: 'a> SeqAccess<'a, R> {
}
}

impl<'de, 'a, R: Read<'de> + 'a> de::SeqAccess<'de> for SeqAccess<'a, R> {
impl<'de, 'a, R: Read + 'a> de::SeqAccess<'de> for SeqAccess<'a, R> {
type Error = Error;

fn next_element_seed<T>(&mut self, seed: T) -> Result<Option<T::Value>>
Expand All @@ -588,7 +588,7 @@ impl<'a, R: 'a> MapAccess<'a, R> {
}
}

impl<'de, 'a, R: Read<'de> + 'a> de::MapAccess<'de> for MapAccess<'a, R> {
impl<'de, 'a, R: Read + 'a> de::MapAccess<'de> for MapAccess<'a, R> {
type Error = Error;

fn next_key_seed<K>(&mut self, seed: K) -> Result<Option<K::Value>>
Expand Down Expand Up @@ -617,7 +617,7 @@ struct MapKey<'a, R> {

impl<'de, 'a, R> de::Deserializer<'de> for MapKey<'a, R>
where
R: Read<'de>,
R: Read,
{
type Error = Error;

Expand Down
6 changes: 3 additions & 3 deletions src/read.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use std::io;
use crate::error::Result;

/// Trait used by the [`de::Deserializer`][crate::de::Deserializer] to read bytes.
pub trait Read<'de> {
pub trait Read {
/// Consumes and returns the next read byte.
fn next(&mut self) -> Option<Result<u8>>;
/// Returns the next byte but does not consume.
Expand Down Expand Up @@ -47,7 +47,7 @@ where
}

#[cfg(feature = "std")]
impl<'de, R> Read<'de> for IoRead<R>
impl<R> Read for IoRead<R>
where
R: io::Read,
{
Expand Down Expand Up @@ -108,7 +108,7 @@ impl<'a> SliceRead<'a> {
}
}

impl<'a> Read<'a> for SliceRead<'a> {
impl<'a> Read for SliceRead<'a> {
#[inline]
fn next(&mut self) -> Option<Result<u8>> {
if self.byte_offset < self.slice.len() {
Expand Down

0 comments on commit 2bcd59e

Please sign in to comment.