Skip to content

feat!: support dynamically composed Expression #33

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.

Sign up for GitHub

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

Merged
haraldmaida merged 1 commit into from
May 10, 2025
Merged

feat!: support dynamically composed Expression #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/boolean/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ impl Expectation<bool> for IsTrue {
*subject
}

fn message(&self, expression: Expression<'_>, actual: &bool, format: &DiffFormat) -> String {
fn message(&self, expression: &Expression<'_>, actual: &bool, format: &DiffFormat) -> String {
let marked_actual = mark_unexpected(actual, format);
let marked_expected = mark_missing(&true, format);
format!(
Expand All @@ -40,7 +40,7 @@ impl Expectation<bool> for IsFalse {
!*subject
}

fn message(&self, expression: Expression<'_>, actual: &bool, format: &DiffFormat) -> String {
fn message(&self, expression: &Expression<'_>, actual: &bool, format: &DiffFormat) -> String {
let marked_actual = mark_unexpected(actual, format);
let marked_expected = mark_missing(&false, format);
format!(
Expand Down
12 changes: 6 additions & 6 deletions src/char_count.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ where
subject.char_count_property() == self.expected_char_count
}

fn message(&self, expression: Expression<'_>, actual: &S, format: &DiffFormat) -> String {
fn message(&self, expression: &Expression<'_>, actual: &S, format: &DiffFormat) -> String {
let marked_actual = mark_unexpected(&actual.char_count_property(), format);
let marked_expected = mark_missing(&self.expected_char_count, format);
format!(
Expand All @@ -83,7 +83,7 @@ where
self.expected_range.contains(&subject.char_count_property())
}

fn message(&self, expression: Expression<'_>, actual: &S, format: &DiffFormat) -> String {
fn message(&self, expression: &Expression<'_>, actual: &S, format: &DiffFormat) -> String {
let marked_actual = mark_unexpected(&actual.char_count_property(), format);
let marked_expected = mark_missing(&self.expected_range, format);
format!(
Expand All @@ -101,7 +101,7 @@ where
subject.char_count_property() < self.expected_char_count
}

fn message(&self, expression: Expression<'_>, actual: &S, format: &DiffFormat) -> String {
fn message(&self, expression: &Expression<'_>, actual: &S, format: &DiffFormat) -> String {
let marked_actual = mark_unexpected(&actual.char_count_property(), format);
let marked_expected = mark_missing(&self.expected_char_count, format);
format!(
Expand All @@ -119,7 +119,7 @@ where
subject.char_count_property() > self.expected_char_count
}

fn message(&self, expression: Expression<'_>, actual: &S, format: &DiffFormat) -> String {
fn message(&self, expression: &Expression<'_>, actual: &S, format: &DiffFormat) -> String {
let marked_actual = mark_unexpected(&actual.char_count_property(), format);
let marked_expected = mark_missing(&self.expected_char_count, format);
format!(
Expand All @@ -137,7 +137,7 @@ where
subject.char_count_property() <= self.expected_char_count
}

fn message(&self, expression: Expression<'_>, actual: &S, format: &DiffFormat) -> String {
fn message(&self, expression: &Expression<'_>, actual: &S, format: &DiffFormat) -> String {
let marked_actual = mark_unexpected(&actual.char_count_property(), format);
let marked_expected = mark_missing(&self.expected_char_count, format);
format!(
Expand All @@ -155,7 +155,7 @@ where
subject.char_count_property() >= self.expected_char_count
}

fn message(&self, expression: Expression<'_>, actual: &S, format: &DiffFormat) -> String {
fn message(&self, expression: &Expression<'_>, actual: &S, format: &DiffFormat) -> String {
let marked_actual = mark_unexpected(&actual.char_count_property(), format);
let marked_expected = mark_missing(&self.expected_char_count, format);
format!(
Expand Down
4 changes: 2 additions & 2 deletions src/equality.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ where
subject == &self.expected
}

fn message(&self, expression: Expression<'_>, actual: &S, format: &DiffFormat) -> String {
fn message(&self, expression: &Expression<'_>, actual: &S, format: &DiffFormat) -> String {
let expected = &self.expected;
let (marked_actual, marked_expected) = mark_diff(actual, expected, format);
format!(
Expand All @@ -49,7 +49,7 @@ where
subject != &self.expected
}

fn message(&self, expression: Expression<'_>, actual: &S, _format: &DiffFormat) -> String {
fn message(&self, expression: &Expression<'_>, actual: &S, _format: &DiffFormat) -> String {
format!(
"expected {expression} is not equal to {:?}\n but was: {actual:?}\n expected: {:?}",
&self.expected, &self.expected
Expand Down
18 changes: 14 additions & 4 deletions src/float/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,12 @@ mod cmp {
subject.approx_eq(self.expected, self.margin)
}

fn message(&self, expression: Expression<'_>, actual: &f32, format: &DiffFormat) -> String {
fn message(
&self,
expression: &Expression<'_>,
actual: &f32,
format: &DiffFormat,
) -> String {
let (marked_actual, marked_expected) = mark_diff(actual, &self.expected, format);
format!("expected {expression} is close to {:?}\n within a margin of epsilon={:e} and ulps={}\n but was: {marked_actual}\n expected: {marked_expected}",
&self.expected, self.margin.epsilon, self.margin.ulps
Expand All @@ -160,7 +165,7 @@ mod cmp {

fn message(
&self,
expression: Expression<'_>,
expression: &Expression<'_>,
actual: &f32,
_format: &DiffFormat,
) -> String {
Expand All @@ -175,7 +180,12 @@ mod cmp {
subject.approx_eq(self.expected, self.margin)
}

fn message(&self, expression: Expression<'_>, actual: &f64, format: &DiffFormat) -> String {
fn message(
&self,
expression: &Expression<'_>,
actual: &f64,
format: &DiffFormat,
) -> String {
let (marked_actual, marked_expected) = mark_diff(actual, &self.expected, format);
format!("expected {expression} is close to {:?}\n within a margin of epsilon={:e} and ulps={}\n but was: {marked_actual}\n expected: {marked_expected}",
&self.expected, self.margin.epsilon, self.margin.ulps
Expand All @@ -190,7 +200,7 @@ mod cmp {

fn message(
&self,
expression: Expression<'_>,
expression: &Expression<'_>,
actual: &f64,
_format: &DiffFormat,
) -> String {
Expand Down
22 changes: 11 additions & 11 deletions src/iterator/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ where
subject.iter().any(|e| e == &self.expected)
}

fn message(&self, expression: Expression<'_>, actual: &Vec<T>, format: &DiffFormat) -> String {
fn message(&self, expression: &Expression<'_>, actual: &Vec<T>, format: &DiffFormat) -> String {
let marked_actual = mark_all_items_in_collection(actual, format, mark_unexpected);
let marked_expected = mark_missing(&self.expected, format);
format!(
Expand Down Expand Up @@ -112,7 +112,7 @@ where
extra.is_empty() && missing.is_empty()
}

fn message(&self, expression: Expression<'_>, actual: &Vec<T>, format: &DiffFormat) -> String {
fn message(&self, expression: &Expression<'_>, actual: &Vec<T>, format: &DiffFormat) -> String {
let missing = collect_selected_values(&self.missing, &self.expected);
let extra = collect_selected_values(&self.extra, actual);
let marked_actual =
Expand Down Expand Up @@ -145,7 +145,7 @@ where
false
}

fn message(&self, expression: Expression<'_>, actual: &Vec<T>, format: &DiffFormat) -> String {
fn message(&self, expression: &Expression<'_>, actual: &Vec<T>, format: &DiffFormat) -> String {
let marked_actual = mark_all_items_in_collection(actual, format, mark_unexpected);
let marked_expected = mark_all_items_in_collection(&self.expected, format, mark_missing);
format!(
Expand Down Expand Up @@ -174,7 +174,7 @@ where
missing.is_empty()
}

fn message(&self, expression: Expression<'_>, actual: &Vec<T>, format: &DiffFormat) -> String {
fn message(&self, expression: &Expression<'_>, actual: &Vec<T>, format: &DiffFormat) -> String {
let mut extra = HashSet::new();
for (actual_index, actual) in actual.iter().enumerate() {
if !self.expected.iter().any(|expected| actual == expected) {
Expand Down Expand Up @@ -214,7 +214,7 @@ where
extra.is_empty()
}

fn message(&self, expression: Expression<'_>, actual: &Vec<T>, format: &DiffFormat) -> String {
fn message(&self, expression: &Expression<'_>, actual: &Vec<T>, format: &DiffFormat) -> String {
let mut missing = HashSet::new();
for (expected_index, expected) in self.expected.iter().enumerate() {
if !actual.iter().any(|value| value == expected) {
Expand Down Expand Up @@ -259,7 +259,7 @@ where
duplicates.is_empty() && extra.is_empty()
}

fn message(&self, expression: Expression<'_>, actual: &Vec<T>, format: &DiffFormat) -> String {
fn message(&self, expression: &Expression<'_>, actual: &Vec<T>, format: &DiffFormat) -> String {
let actual_duplicates_and_extras = self.duplicates.union(&self.extra).copied().collect();
let marked_actual = mark_selected_items_in_collection(
actual,
Expand Down Expand Up @@ -378,7 +378,7 @@ where
out_of_order.is_empty() && extra.is_empty() && missing.is_empty()
}

fn message(&self, expression: Expression<'_>, actual: &Vec<T>, format: &DiffFormat) -> String {
fn message(&self, expression: &Expression<'_>, actual: &Vec<T>, format: &DiffFormat) -> String {
let out_of_order = collect_selected_values(&self.out_of_order, actual);
let mut expected_indices = self.missing.clone();
for (expected_index, expected) in self.expected.iter().enumerate() {
Expand Down Expand Up @@ -477,7 +477,7 @@ where
false
}

fn message(&self, expression: Expression<'_>, actual: &Vec<T>, format: &DiffFormat) -> String {
fn message(&self, expression: &Expression<'_>, actual: &Vec<T>, format: &DiffFormat) -> String {
let marked_actual =
mark_selected_items_in_collection(actual, &self.extra, format, mark_unexpected);
let marked_expected =
Expand Down Expand Up @@ -519,7 +519,7 @@ where
missing.is_empty()
}

fn message(&self, expression: Expression<'_>, actual: &Vec<T>, format: &DiffFormat) -> String {
fn message(&self, expression: &Expression<'_>, actual: &Vec<T>, format: &DiffFormat) -> String {
let marked_expected =
mark_selected_items_in_collection(&self.expected, &self.missing, format, mark_missing);
let missing = collect_selected_values(&self.missing, &self.expected);
Expand Down Expand Up @@ -562,7 +562,7 @@ where
extra.is_empty() && missing.is_empty()
}

fn message(&self, expression: Expression<'_>, actual: &Vec<T>, format: &DiffFormat) -> String {
fn message(&self, expression: &Expression<'_>, actual: &Vec<T>, format: &DiffFormat) -> String {
let marked_actual =
mark_selected_items_in_collection(actual, &self.extra, format, mark_unexpected);
let marked_expected =
Expand Down Expand Up @@ -609,7 +609,7 @@ where
extra.is_empty() && missing.is_empty()
}

fn message(&self, expression: Expression<'_>, actual: &Vec<T>, format: &DiffFormat) -> String {
fn message(&self, expression: &Expression<'_>, actual: &Vec<T>, format: &DiffFormat) -> String {
let marked_actual =
mark_selected_items_in_collection(actual, &self.extra, format, mark_unexpected);
let marked_expected =
Expand Down
16 changes: 8 additions & 8 deletions src/length.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ where
subject.is_empty_property()
}

fn message(&self, expression: Expression<'_>, actual: &S, format: &DiffFormat) -> String {
fn message(&self, expression: &Expression<'_>, actual: &S, format: &DiffFormat) -> String {
let marked_actual = mark_unexpected(actual, format);
format!("expected {expression} is empty\n but was: {marked_actual}\n expected: <empty>")
}
Expand All @@ -48,7 +48,7 @@ where
!subject.is_empty_property()
}

fn message(&self, expression: Expression<'_>, actual: &S, format: &DiffFormat) -> String {
fn message(&self, expression: &Expression<'_>, actual: &S, format: &DiffFormat) -> String {
let marked_actual = mark_unexpected(actual, format);
format!(
"expected {expression} is not empty\n but was: {marked_actual}\n expected: <non-empty>",
Expand Down Expand Up @@ -97,7 +97,7 @@ where
subject.length_property() == self.expected_length
}

fn message(&self, expression: Expression<'_>, actual: &S, format: &DiffFormat) -> String {
fn message(&self, expression: &Expression<'_>, actual: &S, format: &DiffFormat) -> String {
let marked_actual = mark_unexpected(&actual.length_property(), format);
let marked_expected = mark_missing(&self.expected_length, format);
format!(
Expand All @@ -116,7 +116,7 @@ where
self.expected_range.contains(&subject.length_property())
}

fn message(&self, expression: Expression<'_>, actual: &S, format: &DiffFormat) -> String {
fn message(&self, expression: &Expression<'_>, actual: &S, format: &DiffFormat) -> String {
let marked_actual = mark_unexpected(&actual.length_property(), format);
let marked_expected = mark_missing(&self.expected_range, format);
format!(
Expand All @@ -134,7 +134,7 @@ where
subject.length_property() < self.expected_length
}

fn message(&self, expression: Expression<'_>, actual: &S, format: &DiffFormat) -> String {
fn message(&self, expression: &Expression<'_>, actual: &S, format: &DiffFormat) -> String {
let marked_actual = mark_unexpected(&actual.length_property(), format);
let marked_expected = mark_missing(&self.expected_length, format);
format!(
Expand All @@ -152,7 +152,7 @@ where
subject.length_property() > self.expected_length
}

fn message(&self, expression: Expression<'_>, actual: &S, format: &DiffFormat) -> String {
fn message(&self, expression: &Expression<'_>, actual: &S, format: &DiffFormat) -> String {
let marked_actual = mark_unexpected(&actual.length_property(), format);
let marked_expected = mark_missing(&self.expected_length, format);
format!(
Expand All @@ -170,7 +170,7 @@ where
subject.length_property() <= self.expected_length
}

fn message(&self, expression: Expression<'_>, actual: &S, format: &DiffFormat) -> String {
fn message(&self, expression: &Expression<'_>, actual: &S, format: &DiffFormat) -> String {
let marked_actual = mark_unexpected(&actual.length_property(), format);
let marked_expected = mark_missing(&self.expected_length, format);
format!(
Expand All @@ -188,7 +188,7 @@ where
subject.length_property() >= self.expected_length
}

fn message(&self, expression: Expression<'_>, actual: &S, format: &DiffFormat) -> String {
fn message(&self, expression: &Expression<'_>, actual: &S, format: &DiffFormat) -> String {
let marked_actual = mark_unexpected(&actual.length_property(), format);
let marked_expected = mark_missing(&self.expected_length, format);
format!(
Expand Down
8 changes: 4 additions & 4 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@
//! }
//! }
//!
//! fn message(&self, expression: Expression<'_>, actual: &Either<L, R>, _format: &DiffFormat) -> String {
//! fn message(&self, expression: &Expression<'_>, actual: &Either<L, R>, _format: &DiffFormat) -> String {
//! format!(
//! "expected {expression} is {:?}\n but was: {actual:?}\n expected: {:?}",
//! Either::Left::<_, Unknown>(Unknown),
Expand Down Expand Up @@ -446,7 +446,7 @@
//! # }
//! # }
//! #
//! # fn message(&self, expression: Expression<'_>, actual: &Either<L, R>, _format: &DiffFormat) -> String {
//! # fn message(&self, expression: &Expression<'_>, actual: &Either<L, R>, _format: &DiffFormat) -> String {
//! # format!(
//! # "expected {expression} is {:?}\n but was: {actual:?}\n expected: {:?}",
//! # Either::Left::<_, Unknown>(Unknown),
Expand Down Expand Up @@ -493,7 +493,7 @@
//! # }
//! # }
//! #
//! # fn message(&self, expression: Expression<'_>, actual: &Either<L, R>, _format: &DiffFormat) -> String {
//! # fn message(&self, expression: &Expression<'_>, actual: &Either<L, R>, _format: &DiffFormat) -> String {
//! # format!(
//! # "expected {expression} is {:?}\n but was: {actual:?}\n expected: {:?}",
//! # Either::Left::<_, Unknown>(Unknown),
Expand Down Expand Up @@ -547,7 +547,7 @@
//! # }
//! # }
//! #
//! # fn message(&self, expression: Expression<'_>, actual: &Either<L, R>, _format: &DiffFormat) -> String {
//! # fn message(&self, expression: &Expression<'_>, actual: &Either<L, R>, _format: &DiffFormat) -> String {
//! # format!(
//! # "expected {expression} is {:?}\n but was: {actual:?}\n expected: {:?}",
//! # Either::Left::<_, Unknown>(Unknown),
Expand Down
Loading
Loading