Merge branch 'main' into fork/robgjansen/attr

Author: JonathanBrouwer

.github/workflows/rust.yml

@@ -0,0 +1,30 @@
+name: Rust
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Install latest stable
+      uses: actions-rs/toolchain@v1
+      with:
+          toolchain: stable
+          override: true
+          components: rustfmt, clippy
+    - name: Build
+      run: cargo build
+    - name: Fmt
+      run: cargo fmt --check
+    - name: Run tests
+      run: cargo test --examples

examples/readme/main.rs

@@ -65,4 +65,3 @@ mod tests {
         test_each_file! { in "./examples/readme/duplicate_names/" => empty}
     }
 }
- 

src/lib.rs

@@ -1,12 +1,12 @@
 #![doc = include_str!("../README.md")]
 use proc_macro2::{Ident, Span, TokenStream};
 use quote::{format_ident, quote};
-use syn::token::Async;
 use std::collections::{HashMap, HashSet};
 use std::ffi::OsString;
 use std::path::{Path, PathBuf};
 use syn::parse::{Parse, ParseStream};
 use syn::punctuated::Punctuated;
+use syn::token::Async;
 use syn::{bracketed, parse_macro_input, Expr, LitStr, Meta, Token};
 use unicode_ident::{is_xid_continue, is_xid_start};
 
@@ -56,7 +56,7 @@ impl Parse for TestEachArgs {
                     abort!(async_span, "Expected at least one attribute (e.g., `#[tokio::test]`) when `async` is given.");
                 }
                 Some(token)
-            },
+            }
             Err(_) => None,
         };
 
@@ -241,11 +241,16 @@ fn generate_from_tree(
                 file.push(".");
                 file.push(extension);
                 let file: PathBuf = file.into();
-                
+
                 // Canonicalize the file path
                 let input = match file.canonicalize() {
                     Ok(path) => path,
-                    Err(e) => return Err(format!("Failed to read expected file {}.{extension}: {e}", file.display())),
+                    Err(e) => {
+                        return Err(format!(
+                            "Failed to read expected file {}.{extension}: {e}",
+                            file.display()
+                        ))
+                    }
                 };
                 let input = input.to_str().unwrap();