-
Notifications
You must be signed in to change notification settings - Fork 13.5k
impl Pattern for char array #86336
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.
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
impl Pattern for char array #86336
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -22,6 +22,8 @@ | |
//! assert_eq!(s.find("you"), Some(4)); | ||
//! // char pattern | ||
//! assert_eq!(s.find('n'), Some(2)); | ||
//! // array of chars pattern | ||
//! assert_eq!(s.find(&['a', 'e', 'i', 'o', 'u']), Some(1)); | ||
//! // slice of chars pattern | ||
//! assert_eq!(s.find(&['a', 'e', 'i', 'o', 'u'][..]), Some(1)); | ||
//! // closure pattern | ||
|
@@ -79,6 +81,11 @@ use crate::slice::memchr; | |
/// assert_eq!("abaaa".find('b'), Some(1)); | ||
/// assert_eq!("abaaa".find('c'), None); | ||
/// | ||
/// // &[char; N] | ||
/// assert_eq!("ab".find(&['b', 'a']), Some(0)); | ||
/// assert_eq!("abaaa".find(&['a', 'z']), Some(0)); | ||
/// assert_eq!("abaaa".find(&['c', 'd']), None); | ||
/// | ||
/// // &[char] | ||
/// assert_eq!("ab".find(&['b', 'a'][..]), Some(0)); | ||
/// assert_eq!("abaaa".find(&['a', 'z'][..]), Some(0)); | ||
|
@@ -601,6 +608,20 @@ where | |
} | ||
} | ||
|
||
impl<const N: usize> MultiCharEq for [char; N] { | ||
#[inline] | ||
fn matches(&mut self, c: char) -> bool { | ||
self.iter().any(|&m| m == c) | ||
} | ||
} | ||
|
||
impl<const N: usize> MultiCharEq for &[char; N] { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This might be a silly question, but why There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Actually that's what I started with, but then I figured this is more flexible/performant for large arrays. Definitely open to discussion on that. Maybe add both? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think you do want the reference to solve those bugs where one intends to write a literal There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think both -- (I might just delegate both to the impl for slices, though, if there's an easy way to do that.) There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Okay, added both. Unfortunately lifetimes force a lot of separate structs and impls to satisfy |
||
#[inline] | ||
fn matches(&mut self, c: char) -> bool { | ||
self.iter().any(|&m| m == c) | ||
} | ||
} | ||
|
||
impl MultiCharEq for &[char] { | ||
#[inline] | ||
fn matches(&mut self, c: char) -> bool { | ||
|
@@ -752,6 +773,58 @@ macro_rules! searcher_methods { | |
}; | ||
} | ||
|
||
/// Associated type for `<[char; N] as Pattern<'a>>::Searcher`. | ||
#[derive(Clone, Debug)] | ||
pub struct CharArraySearcher<'a, const N: usize>( | ||
<MultiCharEqPattern<[char; N]> as Pattern<'a>>::Searcher, | ||
); | ||
|
||
/// Associated type for `<&[char; N] as Pattern<'a>>::Searcher`. | ||
#[derive(Clone, Debug)] | ||
pub struct CharArrayRefSearcher<'a, 'b, const N: usize>( | ||
<MultiCharEqPattern<&'b [char; N]> as Pattern<'a>>::Searcher, | ||
); | ||
|
||
/// Searches for chars that are equal to any of the [`char`]s in the array. | ||
/// | ||
/// # Examples | ||
/// | ||
/// ``` | ||
/// assert_eq!("Hello world".find(['l', 'l']), Some(2)); | ||
/// assert_eq!("Hello world".find(['l', 'l']), Some(2)); | ||
/// ``` | ||
impl<'a, const N: usize> Pattern<'a> for [char; N] { | ||
pattern_methods!(CharArraySearcher<'a, N>, MultiCharEqPattern, CharArraySearcher); | ||
} | ||
|
||
unsafe impl<'a, const N: usize> Searcher<'a> for CharArraySearcher<'a, N> { | ||
searcher_methods!(forward); | ||
} | ||
|
||
unsafe impl<'a, const N: usize> ReverseSearcher<'a> for CharArraySearcher<'a, N> { | ||
searcher_methods!(reverse); | ||
} | ||
|
||
/// Searches for chars that are equal to any of the [`char`]s in the array. | ||
/// | ||
/// # Examples | ||
/// | ||
/// ``` | ||
/// assert_eq!("Hello world".find(&['l', 'l']), Some(2)); | ||
/// assert_eq!("Hello world".find(&['l', 'l']), Some(2)); | ||
/// ``` | ||
impl<'a, 'b, const N: usize> Pattern<'a> for &'b [char; N] { | ||
pattern_methods!(CharArrayRefSearcher<'a, 'b, N>, MultiCharEqPattern, CharArrayRefSearcher); | ||
} | ||
|
||
unsafe impl<'a, 'b, const N: usize> Searcher<'a> for CharArrayRefSearcher<'a, 'b, N> { | ||
searcher_methods!(forward); | ||
} | ||
|
||
unsafe impl<'a, 'b, const N: usize> ReverseSearcher<'a> for CharArrayRefSearcher<'a, 'b, N> { | ||
searcher_methods!(reverse); | ||
} | ||
|
||
///////////////////////////////////////////////////////////////////////////// | ||
// Impl for &[char] | ||
///////////////////////////////////////////////////////////////////////////// | ||
|
Uh oh!
There was an error while loading. Please reload this page.