Make assert_that a little more ergonomico

Stop testing with `--all-targets` to ensure doctests run
(seems like rust-lang/cargo#5178 might still
exist).

.github/workflows/corewa_rs-ci.yml

@@ -57,4 +57,4 @@ jobs:
         with:
           toolchain: ${{ matrix.toolchain }}
       - name: Build and run tests
-        run: cargo test --color=always --workspace --all-targets --all-features
+        run: cargo test --color=always --workspace --all-features

.vscode/tasks.json

@@ -43,7 +43,6 @@
             "command": "test",
             "args": [
                 "--all-features",
-                "--all-targets",
                 "--workspace"
             ],
             "group": {

corewa_rs/src/testutil.rs

@@ -1,37 +1,33 @@
 pub use predicates;
 pub use predicates_tree;
 
-/// Simple macro to panic with a prettier error message
+/// Simple macro to make assertions with a better error message.
 ///
 /// # Examples
 ///
 /// ```
-/// use predicates::prelude::*;
-/// use testutil::assert_that;
+/// extern crate corewa_rs;
+/// use corewa_rs::assert_that;
 ///
-/// assert_that!(
-///     "Hello World",
-///     str::similar("Hello World"),
-/// );
+/// assert_that!("Hello World", str::similar("Hello World"));
 ///
+/// assert_that!("Hello World", str::diff("Goodbye World"));
+///
+/// // Can be used with more complex predicates
 /// assert_that!(
-///     "Hello World",
-///     str::diff("Goodbye World"),
+///     &1234,
+///     ge(-5).and(le(i16::MAX))
 /// );
-///
-/// assert_that!("Hello World", eq("Goodbye World"));
 /// ```
 #[macro_export]
 macro_rules! assert_that {
-    (
-        $value:expr,
-        $($pred:tt)+ ( $args:tt ) $(,)?
-    ) => {{
-        use predicate::*;
+    ($value:expr, $pred:expr $(,)?) => {{
         use $crate::predicates::prelude::*;
         use $crate::predicates_tree::CaseTreeExt;
 
-        if let Some(case) = $($pred)+ rgo ($args).find_case(false, $value) {
+        use predicate::*;
+
+        if let Some(case) = $pred.find_case(false, $value) {
             panic!("{}", case.tree());
         };
     }};

corewa_rs/tests/dump_test.rs

@@ -12,7 +12,7 @@ fn run_test(input: &str, expected_output: &'static str) {
         .resolve()
         .unwrap_or_else(|e| panic!("{}", e));
 
-    assert_that!(&parsed_core.to_string(), str::similar(expected_output),);
+    assert_that!(&parsed_core.to_string(), str::similar(expected_output));
 }
 
 #[test]