summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Beyer <mail@beyermatthias.de>2022-08-09 13:14:12 +0200
committerMatthias Beyer <mail@beyermatthias.de>2022-08-09 13:27:13 +0200
commit94a1ff2ea9552f1855c7d26d043d1f183b53918d (patch)
tree8fec1145b7aed405df18d8081bd1c7d936a6de5f
parent745e6b6d9981f3acabe2488f352cebb9227b5031 (diff)
cargo-fix for edition
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
-rw-r--r--src/failable/filter.rs18
-rw-r--r--src/failable/ops/and.rs2
-rw-r--r--src/failable/ops/bool.rs2
-rw-r--r--src/failable/ops/map.rs2
-rw-r--r--src/failable/ops/not.rs2
-rw-r--r--src/failable/ops/or.rs2
-rw-r--r--src/failable/ops/xor.rs2
-rw-r--r--src/filter.rs20
-rw-r--r--src/iter.rs2
-rw-r--r--src/ops/and.rs2
-rw-r--r--src/ops/bool.rs2
-rw-r--r--src/ops/failable.rs4
-rw-r--r--src/ops/map.rs2
-rw-r--r--src/ops/not.rs2
-rw-r--r--src/ops/or.rs2
-rw-r--r--src/ops/xor.rs2
16 files changed, 34 insertions, 34 deletions
diff --git a/src/failable/filter.rs b/src/failable/filter.rs
index f2654f8..fef191c 100644
--- a/src/failable/filter.rs
+++ b/src/failable/filter.rs
@@ -6,12 +6,12 @@
use std::borrow::Borrow;
-pub use failable::ops::and::FailableAnd;
-pub use failable::ops::bool::FailableBool;
-pub use failable::ops::map::{FailableMapErr, FailableMapInput};
-pub use failable::ops::not::FailableNot;
-pub use failable::ops::or::FailableOr;
-pub use failable::ops::xor::FailableXOr;
+pub use crate::failable::ops::and::FailableAnd;
+pub use crate::failable::ops::bool::FailableBool;
+pub use crate::failable::ops::map::{FailableMapErr, FailableMapInput};
+pub use crate::failable::ops::not::FailableNot;
+pub use crate::failable::ops::or::FailableOr;
+pub use crate::failable::ops::xor::FailableXOr;
/// Trait for converting something into a Filter
pub trait IntoFailableFilter<N> {
@@ -419,7 +419,7 @@ mod tests {
#[test]
fn test_both_filter_types() {
- use filter::Filter;
+ use crate::filter::Filter;
let a = |_: &i32| -> Result<bool, StupError> { Ok(true) };
let b = |_: &i32| -> bool { true };
@@ -436,8 +436,8 @@ mod tests {
#[test]
fn test_both_filter_types_in_one_scope() {
- use failable::filter::FailableFilter;
- use filter::Filter;
+ use crate::failable::filter::FailableFilter;
+ use crate::filter::Filter;
let failable = |_: &i32| -> Result<bool, StupError> { Ok(true) };
let unfailable = |_: &i32| -> bool { true };
diff --git a/src/failable/ops/and.rs b/src/failable/ops/and.rs
index 977a405..f8d4636 100644
--- a/src/failable/ops/and.rs
+++ b/src/failable/ops/and.rs
@@ -10,7 +10,7 @@
//! shouldn't be necessary.
//!
-use failable::filter::FailableFilter;
+use crate::failable::filter::FailableFilter;
#[must_use = "filters are lazy and do nothing unless consumed"]
#[derive(Clone)]
diff --git a/src/failable/ops/bool.rs b/src/failable/ops/bool.rs
index ae6fc45..e0186f1 100644
--- a/src/failable/ops/bool.rs
+++ b/src/failable/ops/bool.rs
@@ -10,7 +10,7 @@
//! shouldn't be necessary.
//!
-use failable::filter::FailableFilter;
+use crate::failable::filter::FailableFilter;
#[must_use = "filters are lazy and do nothing unless consumed"]
#[derive(Clone)]
diff --git a/src/failable/ops/map.rs b/src/failable/ops/map.rs
index 751c2e6..5b28c03 100644
--- a/src/failable/ops/map.rs
+++ b/src/failable/ops/map.rs
@@ -12,7 +12,7 @@
use std::borrow::Borrow;
use std::marker::PhantomData;
-use failable::filter::FailableFilter;
+use crate::failable::filter::FailableFilter;
#[must_use = "filters are lazy and do nothing unless consumed"]
#[derive(Clone)]
diff --git a/src/failable/ops/not.rs b/src/failable/ops/not.rs
index 1108205..3297605 100644
--- a/src/failable/ops/not.rs
+++ b/src/failable/ops/not.rs
@@ -10,7 +10,7 @@
//! shouldn't be necessary.
//!
-use failable::filter::FailableFilter;
+use crate::failable::filter::FailableFilter;
#[must_use = "filters are lazy and do nothing unless consumed"]
#[derive(Clone)]
diff --git a/src/failable/ops/or.rs b/src/failable/ops/or.rs
index 0ccb469..6927af9 100644
--- a/src/failable/ops/or.rs
+++ b/src/failable/ops/or.rs
@@ -10,7 +10,7 @@
//! shouldn't be necessary.
//!
-use failable::filter::FailableFilter;
+use crate::failable::filter::FailableFilter;
#[must_use = "filters are lazy and do nothing unless consumed"]
#[derive(Clone)]
diff --git a/src/failable/ops/xor.rs b/src/failable/ops/xor.rs
index 74084ae..8b8dbbd 100644
--- a/src/failable/ops/xor.rs
+++ b/src/failable/ops/xor.rs
@@ -10,7 +10,7 @@
//! shouldn't be necessary.
//!
-use failable::filter::FailableFilter;
+use crate::failable::filter::FailableFilter;
#[must_use = "filters are lazy and do nothing unless consumed"]
#[derive(Clone)]
diff --git a/src/filter.rs b/src/filter.rs
index a74be28..c53088d 100644
--- a/src/filter.rs
+++ b/src/filter.rs
@@ -8,13 +8,13 @@
//!
use std::borrow::Borrow;
-pub use ops::and::And;
-pub use ops::bool::Bool;
-pub use ops::failable::{AsFailable, IntoFailable};
-pub use ops::map::MapInput;
-pub use ops::not::Not;
-pub use ops::or::Or;
-pub use ops::xor::XOr;
+pub use crate::ops::and::And;
+pub use crate::ops::bool::Bool;
+pub use crate::ops::failable::{AsFailable, IntoFailable};
+pub use crate::ops::map::MapInput;
+pub use crate::ops::not::Not;
+pub use crate::ops::or::Or;
+pub use crate::ops::xor::XOr;
/// Trait for converting something into a Filter
pub trait IntoFilter<N> {
@@ -328,9 +328,9 @@ macro_rules! make_filter {
#[cfg(test)]
mod test {
- use filter::Filter;
- use ops::and::And;
- use ops::bool::Bool;
+ use crate::filter::Filter;
+ use crate::ops::and::And;
+ use crate::ops::bool::Bool;
#[test]
fn closures() {
diff --git a/src/iter.rs b/src/iter.rs
index fbd7fd3..4dbe1cc 100644
--- a/src/iter.rs
+++ b/src/iter.rs
@@ -4,7 +4,7 @@
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
//
-use filter::Filter;
+use crate::filter::Filter;
pub struct FilteredIterator<T, F, I>(F, I)
where
diff --git a/src/ops/and.rs b/src/ops/and.rs
index ce3f284..47dfc3f 100644
--- a/src/ops/and.rs
+++ b/src/ops/and.rs
@@ -9,7 +9,7 @@
//! Will be automatically included when including `filter::Filter`, so importing this module
//! shouldn't be necessary.
//!
-use filter::Filter;
+use crate::filter::Filter;
#[must_use = "filters are lazy and do nothing unless consumed"]
#[derive(Clone)]
diff --git a/src/ops/bool.rs b/src/ops/bool.rs
index fcf8e7f..7192a59 100644
--- a/src/ops/bool.rs
+++ b/src/ops/bool.rs
@@ -9,7 +9,7 @@
//! Will be automatically included when including `filter::Filter`, so importing this module
//! shouldn't be necessary.
//!
-use filter::Filter;
+use crate::filter::Filter;
#[must_use = "filters are lazy and do nothing unless consumed"]
#[derive(Clone)]
diff --git a/src/ops/failable.rs b/src/ops/failable.rs
index 0e734d8..cca2509 100644
--- a/src/ops/failable.rs
+++ b/src/ops/failable.rs
@@ -10,8 +10,8 @@
//! shouldn't be necessary.
//!
-use failable::filter::FailableFilter;
-use filter::Filter;
+use crate::failable::filter::FailableFilter;
+use crate::filter::Filter;
#[must_use = "filters are lazy and do nothing unless consumed"]
#[derive(Clone)]
diff --git a/src/ops/map.rs b/src/ops/map.rs
index 5726327..5a3e516 100644
--- a/src/ops/map.rs
+++ b/src/ops/map.rs
@@ -12,7 +12,7 @@
use std::borrow::Borrow;
use std::marker::PhantomData;
-use filter::Filter;
+use crate::filter::Filter;
#[must_use = "filters are lazy and do nothing unless consumed"]
#[derive(Clone)]
diff --git a/src/ops/not.rs b/src/ops/not.rs
index 98e1971..15cdeab 100644
--- a/src/ops/not.rs
+++ b/src/ops/not.rs
@@ -9,7 +9,7 @@
//! Will be automatically included when including `filter::Filter`, so importing this module
//! shouldn't be necessary.
//!
-use filter::Filter;
+use crate::filter::Filter;
#[must_use = "filters are lazy and do nothing unless consumed"]
#[derive(Clone)]
diff --git a/src/ops/or.rs b/src/ops/or.rs
index b80022c..6256409 100644
--- a/src/ops/or.rs
+++ b/src/ops/or.rs
@@ -9,7 +9,7 @@
//! Will be automatically included when including `filter::Filter`, so importing this module
//! shouldn't be necessary.
//!
-use filter::Filter;
+use crate::filter::Filter;
#[must_use = "filters are lazy and do nothing unless consumed"]
#[derive(Clone)]
diff --git a/src/ops/xor.rs b/src/ops/xor.rs
index af3dd08..ce4fc08 100644
--- a/src/ops/xor.rs
+++ b/src/ops/xor.rs
@@ -9,7 +9,7 @@
//! Will be automatically included when including `filter::Filter`, so importing this module
//! shouldn't be necessary.
//!
-use filter::Filter;
+use crate::filter::Filter;
#[must_use = "filters are lazy and do nothing unless consumed"]
#[derive(Clone)]