summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Beyer <mail@beyermatthias.de>2020-04-24 11:37:20 +0200
committerMatthias Beyer <mail@beyermatthias.de>2020-04-24 11:37:20 +0200
commit1fc34da9b8848634eba77c3f705725ac1303d1b0 (patch)
treec2eae7522202cc004af29f56fbd923ca4a0e0750
parentfd84568c5f242d5766b2c9456232e70e8dc9e693 (diff)
parentcdbf5c95bb9788a867fa1039bd6dc35241a6a42b (diff)
Merge branch 'to-srht'
-rw-r--r--.builds/debian.yml18
-rw-r--r--.github/PULL_REQUEST_TEMPLATE.md10
-rw-r--r--src/failable/filter.rs2
-rw-r--r--src/failable/ops/and.rs2
-rw-r--r--src/failable/ops/or.rs2
-rw-r--r--src/failable/ops/xor.rs2
-rw-r--r--src/iter.rs12
7 files changed, 33 insertions, 15 deletions
diff --git a/.builds/debian.yml b/.builds/debian.yml
new file mode 100644
index 0000000..1510240
--- /dev/null
+++ b/.builds/debian.yml
@@ -0,0 +1,18 @@
+image: debian/stable
+sources:
+ - https://git.sr.ht/~matthiasbeyer/filters
+packages:
+ - curl
+ - openssl
+tasks:
+ - install: curl https://sh.rustup.rs -sSf | sh -s -- -y
+ - build: |
+ cd filters
+ PATH="$HOME/.cargo/bin:$PATH" cargo build --all
+ - test: |
+ cd filters
+ PATH="$HOME/.cargo/bin:$PATH" cargo test --all
+ - clippy: |
+ cd filters
+ PATH="$HOME/.cargo/bin:$PATH" rustup component add clippy
+ PATH="$HOME/.cargo/bin:$PATH" cargo clippy --all --all-targets -- -D warnings
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index ef4b5f0..9b8f367 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -2,11 +2,11 @@
IMPORTANT NOTICE
-Github is only used for CI right now, main development continues on the
-mailinglist.
+Github is only used for CI right now, main development continues on
+sourcehut.
-Please send issues and pull requests (either via `git request-pull` or `git
-format-patch` + `git send-email`) to
-[the imag mailinglist](https://imag-pim.org/mailinglist/).
+Please send patches to:
+
+ https://lists.sr.ht/~matthiasbeyer/filters
-->
diff --git a/src/failable/filter.rs b/src/failable/filter.rs
index 36440fe..3917a61 100644
--- a/src/failable/filter.rs
+++ b/src/failable/filter.rs
@@ -355,7 +355,7 @@ mod tests {
#[test]
fn compile_test() {
- let a = |r: &i32| -> Result<bool, StupError> { Ok(true) };
+ let a = |_: &i32| -> Result<bool, StupError> { Ok(true) };
assert!(a.filter(&1).unwrap());
}
diff --git a/src/failable/ops/and.rs b/src/failable/ops/and.rs
index 4568b71..f0a1584 100644
--- a/src/failable/ops/and.rs
+++ b/src/failable/ops/and.rs
@@ -31,7 +31,7 @@ impl<N, T, U, E> FailableFilter<N> for FailableAnd<T, U>
type Error = E;
fn filter(&self, e: &N) -> Result<bool, Self::Error> {
- Ok(try!(self.0.filter(e)) && try!(self.1.filter(e)))
+ Ok(self.0.filter(e)? && self.1.filter(e)?)
}
}
diff --git a/src/failable/ops/or.rs b/src/failable/ops/or.rs
index b482e63..9cebc75 100644
--- a/src/failable/ops/or.rs
+++ b/src/failable/ops/or.rs
@@ -31,7 +31,7 @@ impl<N, T, U, E> FailableFilter<N> for FailableOr<T, U>
type Error = E;
fn filter(&self, e: &N) -> Result<bool, Self::Error> {
- Ok(try!(self.0.filter(e)) || try!(self.1.filter(e)))
+ Ok(self.0.filter(e)? || self.1.filter(e)?)
}
}
diff --git a/src/failable/ops/xor.rs b/src/failable/ops/xor.rs
index 9ccfd8e..d8a83bb 100644
--- a/src/failable/ops/xor.rs
+++ b/src/failable/ops/xor.rs
@@ -31,7 +31,7 @@ impl<N, T, U, E> FailableFilter<N> for FailableXOr<T, U>
type Error = E;
fn filter(&self, e: &N) -> Result<bool, Self::Error> {
- Ok(try!(self.0.filter(e)) ^ try!(self.1.filter(e)))
+ Ok(self.0.filter(e)? ^ self.1.filter(e)?)
}
}
diff --git a/src/iter.rs b/src/iter.rs
index e5acb6e..14b64a8 100644
--- a/src/iter.rs
+++ b/src/iter.rs
@@ -134,11 +134,11 @@ mod test {
}
}
- let foo = Foo;
+ let f = Foo;
let v : Vec<u64> = vec![1, 2, 3, 4, 5, 6, 7, 8, 9, 0]
.into_iter()
- .filter_with(foo)
+ .filter_with(f)
.collect();
assert_eq!(v, vec![6, 7, 8, 9]);
@@ -153,12 +153,12 @@ mod test {
}
}
- let foo = Foo;
+ let f = Foo;
let v : Vec<Result<u64, u64>> =
vec![Ok(1), Err(2), Ok(3), Err(4), Ok(5), Err(6), Ok(7), Err(8), Ok(9), Err(0)]
.into_iter()
- .filter_oks(foo)
+ .filter_oks(f)
.collect();
assert_eq!(v, vec![Err(2), Err(4), Err(6), Ok(7), Err(8), Ok(9), Err(0)]);
@@ -173,12 +173,12 @@ mod test {
}
}
- let foo = Foo;
+ let f = Foo;
let v : Vec<Result<u64, u64>> =
vec![Ok(1), Err(2), Ok(3), Err(4), Ok(5), Err(6), Ok(7), Err(8), Ok(9), Err(0)]
.into_iter()
- .filter_errs(foo)
+ .filter_errs(f)
.collect();
assert_eq!(v, vec![Ok(1), Ok(3), Ok(5), Err(6), Ok(7), Err(8), Ok(9)]);