Skip to content

impl Input for &[T] where T : Clone #1831

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

impl Input for &[T] where T : Clone #1831

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 12 additions & 13 deletions src/traits.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
//! Traits input types have to implement to work with nom combinators
use core::iter::Enumerate;
use core::iter::{Cloned, Enumerate};
use core::str::CharIndices;

use crate::error::{ErrorKind, ParseError};
use crate::internal::{Err, IResult, Needed};
use crate::lib::std::iter::Copied;
use crate::lib::std::ops::{
Bound, Range, RangeBounds, RangeFrom, RangeFull, RangeInclusive, RangeTo, RangeToInclusive,
};
Expand Down Expand Up @@ -190,9 +189,9 @@ pub trait Input: Clone + Sized {
}
}

impl<'a> Input for &'a [u8] {
type Item = u8;
type Iter = Copied<Iter<'a, u8>>;
impl<'a, T> Input for &'a [T] where T : Clone {
type Item = T;
type Iter = Cloned<Iter<'a, T>>;
type IterIndices = Enumerate<Self::Iter>;

fn input_len(&self) -> usize {
Expand All @@ -218,12 +217,12 @@ impl<'a> Input for &'a [u8] {
where
P: Fn(Self::Item) -> bool,
{
self.iter().position(|b| predicate(*b))
self.iter().position(|b| predicate(b.clone()))
}

#[inline]
fn iter_elements(&self) -> Self::Iter {
self.iter().copied()
self.iter().cloned()
}

#[inline]
Expand All @@ -245,7 +244,7 @@ impl<'a> Input for &'a [u8] {
where
P: Fn(Self::Item) -> bool,
{
match self.iter().position(|c| predicate(*c)) {
match self.iter().position(|c| predicate(c.clone())) {
Some(i) => Ok(self.take_split(i)),
None => Err(Err::Incomplete(Needed::new(1))),
}
Expand All @@ -260,7 +259,7 @@ impl<'a> Input for &'a [u8] {
where
P: Fn(Self::Item) -> bool,
{
match self.iter().position(|c| predicate(*c)) {
match self.iter().position(|c| predicate(c.clone())) {
Some(0) => Err(Err::Error(E::from_error_kind(self, e))),
Some(i) => Ok(self.take_split(i)),
None => Err(Err::Incomplete(Needed::new(1))),
Expand All @@ -274,7 +273,7 @@ impl<'a> Input for &'a [u8] {
where
P: Fn(Self::Item) -> bool,
{
match self.iter().position(|c| predicate(*c)) {
match self.iter().position(|c| predicate(c.clone())) {
Some(i) => Ok(self.take_split(i)),
None => Ok(self.take_split(self.len())),
}
Expand All @@ -289,7 +288,7 @@ impl<'a> Input for &'a [u8] {
where
P: Fn(Self::Item) -> bool,
{
match self.iter().position(|c| predicate(*c)) {
match self.iter().position(|c| predicate(c.clone())) {
Some(0) => Err(Err::Error(E::from_error_kind(self, e))),
Some(i) => Ok(self.take_split(i)),
None => {
Expand All @@ -311,7 +310,7 @@ impl<'a> Input for &'a [u8] {
where
P: Fn(Self::Item) -> bool,
{
match self.iter().position(|c| predicate(*c)) {
match self.iter().position(|c| predicate(c.clone())) {
Some(n) => Ok((self.take_from(n), OM::Output::bind(|| self.take(n)))),
None => {
if OM::Incomplete::is_streaming() {
Expand All @@ -336,7 +335,7 @@ impl<'a> Input for &'a [u8] {
where
P: Fn(Self::Item) -> bool,
{
match self.iter().position(|c| predicate(*c)) {
match self.iter().position(|c| predicate(c.clone())) {
Some(0) => Err(Err::Error(OM::Error::bind(|| E::from_error_kind(self, e)))),
Some(n) => Ok((self.take_from(n), OM::Output::bind(|| self.take(n)))),
None => {
Expand Down