Merge branch 'main' into logging

.github/workflows/ci.yml

@@ -126,15 +126,3 @@ jobs:
         run: cargo +beta test --all-features --all-targets --workspace
       - name: Test (nightly)
         run: cargo +nightly test --all-features --all-targets --workspace
-
-  # just a simple job that requires all other jobs to pass for it to pass
-  # used for branch protection rules requiring ci pass (to avoid listing every matrix permutation)
-  ci:
-    name: CI Pass
-    runs-on: ubuntu-latest
-    needs:
-      - clippy
-      - fmt
-      - test
-    steps:
-      - run: echo "dummy message because github requires all jobs to have at least 1 step"

src/main.rs

@@ -14,7 +14,11 @@ use std::{env, fs};
 
 macro_rules! unwrap {
     ($x:expr, $($fmt:tt)+) => {
-        anyhow::Context::with_context($x, || format!($($fmt)+))?
+        // dont use ? because we don't need the implicit .into() and it breaks some inference
+        match anyhow::Context::with_context($x, || format!($($fmt)+)) {
+            Ok(x) => x,
+            Err(e) => return Err(e),
+        }
     };
 }