ggriffiniii/httptest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove contains. matches is more flexible.

Browse Source
This commit is contained in:
Glenn Griffin 2019-12-09 08:08:27 -08:00
parent 2206ddc520
commit e522e69578
1 changed files with 3 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/mappers.rs
View File

@ -48,27 +48,6 @@ impl<IN> Mapper<IN> for Any {
} }
} }
pub fn contains<T>(value: T) -> Contains<T>
where
T: AsRef<[u8]> + fmt::Debug + Send,
{
Contains(value)
}
#[derive(Debug)]
pub struct Contains<T>(T);
impl<IN, T> Mapper<IN> for Contains<T>
where
T: AsRef<[u8]> + fmt::Debug + Send,
IN: AsRef<[u8]> + ?Sized,
{
type Out = bool;
fn map(&mut self, input: &IN) -> bool {
use bstr::ByteSlice;
input.as_ref().contains_str(self.0.as_ref())
}
}
pub fn eq<T>(value: T) -> Eq<T> { pub fn eq<T>(value: T) -> Eq<T> {
Eq(value) Eq(value)
} }
@ -240,14 +219,6 @@ where
mod tests { mod tests {
use super::*; use super::*;
#[test]
fn test_contains() {
let mut c = contains("foo");
assert_eq!(true, c.map("foobar"));
assert_eq!(true, c.map("bazfoobar"));
assert_eq!(false, c.map("bar"));
}
#[test] #[test]
fn test_eq() { fn test_eq() {
let mut c = eq("foo"); let mut c = eq("foo");
@ -277,7 +248,7 @@ mod tests {
#[test] #[test]
fn test_all_of() { fn test_all_of() {
let mut c = all_of![contains("foo"), contains("bar")]; let mut c = all_of![matches("foo"), matches("bar")];
assert_eq!(true, c.map("foobar")); assert_eq!(true, c.map("foobar"));
assert_eq!(true, c.map("barfoo")); assert_eq!(true, c.map("barfoo"));
assert_eq!(false, c.map("foo")); assert_eq!(false, c.map("foo"));
@ -286,7 +257,7 @@ mod tests {
#[test] #[test]
fn test_any_of() { fn test_any_of() {
let mut c = any_of![contains("foo"), contains("bar")]; let mut c = any_of![matches("foo"), matches("bar")];
assert_eq!(true, c.map("foobar")); assert_eq!(true, c.map("foobar"));
assert_eq!(true, c.map("barfoo")); assert_eq!(true, c.map("barfoo"));
assert_eq!(true, c.map("foo")); assert_eq!(true, c.map("foo"));
@ -321,7 +292,7 @@ mod tests {
#[test] #[test]
fn test_lowercase() { fn test_lowercase() {
let mut c = lowercase(contains("foo")); let mut c = lowercase(matches("foo"));
assert_eq!(true, c.map("FOO")); assert_eq!(true, c.map("FOO"));
assert_eq!(true, c.map("FoOBar")); assert_eq!(true, c.map("FoOBar"));
assert_eq!(true, c.map("foobar")); assert_eq!(true, c.map("foobar"));