From 355d23b4ab1ec8dbe0479d546177061464a12f61 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 24 Apr 2020 10:50:29 +0200 Subject: github: Pull request template: We are on sourcehut now Signed-off-by: Matthias Beyer --- .github/PULL_REQUEST_TEMPLATE.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 --> -- cgit v1.2.3 From 6a67b236d202d243d4c8f74cf65d64955cb7c9ab Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 24 Apr 2020 11:14:50 +0200 Subject: Add srht build on debian Signed-off-by: Matthias Beyer --- .builds/debian.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .builds/debian.yml 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 -- cgit v1.2.3 From 61824fcd1db6912fb5173bb2045340948a3c900c Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 24 Apr 2020 11:19:12 +0200 Subject: Fix: Remove deprecated try!() macro usage Signed-off-by: Matthias Beyer --- src/failable/ops/and.rs | 2 +- src/failable/ops/or.rs | 2 +- src/failable/ops/xor.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 FailableFilter for FailableAnd type Error = E; fn filter(&self, e: &N) -> Result { - 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 FailableFilter for FailableOr type Error = E; fn filter(&self, e: &N) -> Result { - 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 FailableFilter for FailableXOr type Error = E; fn filter(&self, e: &N) -> Result { - Ok(try!(self.0.filter(e)) ^ try!(self.1.filter(e))) + Ok(self.0.filter(e)? ^ self.1.filter(e)?) } } -- cgit v1.2.3 From 8de13c0e66e8fd77e5a4f1ddd73dbfd238ace026 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 24 Apr 2020 11:21:55 +0200 Subject: Fix: Remove unused variable Signed-off-by: Matthias Beyer --- src/failable/filter.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 { Ok(true) }; + let a = |_: &i32| -> Result { Ok(true) }; assert!(a.filter(&1).unwrap()); } -- cgit v1.2.3 From cdbf5c95bb9788a867fa1039bd6dc35241a6a42b Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 24 Apr 2020 11:22:58 +0200 Subject: Fix: Rename to not use blacklisted variable name Signed-off-by: Matthias Beyer --- src/iter.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 = 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> = 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> = 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)]); -- cgit v1.2.3