v0.1.13 release

Author: nrxus

.github/workflows/test.yml

@@ -16,10 +16,10 @@ jobs:
     - name: test stable --release
       run: cargo +stable test --release --verbose
     # MSRV
-    - uses: dtolnay/rust-toolchain@1.63.0
+    - uses: dtolnay/rust-toolchain@1.65.0
     - name: build MSRV
-      run: cargo +1.63.0 build --verbose
+      run: cargo +1.65.0 build --verbose
     - name: test MSRV
-      run: cargo +1.63.0 test --verbose
+      run: cargo +1.65.0 test --verbose
     - name: test MSRV --release
-      run: cargo +1.63.0 test --release --verbose
+      run: cargo +1.65.0 test --release --verbose

CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## v0.1.13
+* Add support methods that return Self as part of a tuple
+  * [test](/tests/return_self_tuple.rs)
+* Bumped MSRV to 1.65
+
 ## v0.1.12
 * Fix warnings about elided lifetimes already named in generated code
 

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "faux"
-version = "0.1.12"
+version = "0.1.13"
 authors = ["Andres <andresnrx@gmail.com>"]
 license = "MIT"
 description = "A library to mock structs"
@@ -9,10 +9,10 @@ repository = "https://github.com/nrxus/faux"
 edition = "2021"
 keywords = ["mock", "mocking", "test", "testing", "faux"]
 readme = "README.md"
-rust-version = "1.63"
+rust-version = "1.65"
 
 [dependencies]
-faux_macros = { path = "faux_macros", version = "0.1.12" }
+faux_macros = { path = "faux_macros", version = "0.1.13" }
 paste = "1.0.4"
 
 [dev-dependencies]

README.md

@@ -1,4 +1,4 @@
-# faux   [![Latest Version]][crates.io] [![rustc 1.63+]][Rust 1.63] [![docs]][api docs] ![][build]
+# faux   [![Latest Version]][crates.io] [![rustc 1.65+]][Rust 1.65] [![docs]][api docs] ![][build]
 
 A library to create [mocks] out of structs.
 
@@ -227,8 +227,8 @@ methods in structs.
 
 [Latest Version]: https://img.shields.io/crates/v/faux.svg
 [crates.io]: https://crates.io/crates/faux
-[rustc 1.63+]: https://img.shields.io/badge/rustc-1.63+-blue.svg
-[Rust 1.63]: https://blog.rust-lang.org/2022/08/11/Rust-1.63.0.html
+[rustc 1.65+]: https://img.shields.io/badge/rustc-1.65+-blue.svg
+[Rust 1.65]: https://blog.rust-lang.org/2022/11/03/Rust-1.65.0/
 [Latest Version]: https://img.shields.io/crates/v/faux.svg
 [docs]: https://img.shields.io/badge/api-docs-blue.svg
 [api docs]: https://docs.rs/faux/

faux_macros/Cargo.toml

@@ -1,20 +1,20 @@
 [package]
 name = "faux_macros"
-version = "0.1.12"
+version = "0.1.13"
 authors = ["Andres <andresnrx@gmail.com>"]
 edition = "2021"
 license = "MIT"
 description = "Implementations for #[create], #[methods], when!"
 homepage = "https://github.com/nrxus/faux"
 repository = "https://github.com/nrxus/faux"
 keywords = ["mock", "mocking", "test", "testing", "faux"]
-rust-version = "1.63"
+rust-version = "1.65"
 
 [dependencies]
 syn = { version = "2", features = ["full", "extra-traits"] }
 quote = "1"
 proc-macro2 = "1"
-darling = "0.20"
+darling = "0.21"
 uuid = { version = "1", features = ["v4"] }
 
 [dev-dependencies]

faux_macros/src/methods/morphed.rs

@@ -182,7 +182,8 @@ impl<'a> Signature<'a> {
         }
 
         if let Some(output) = self.output {
-            if let Some(wrapped_self) = Self::wrap_self(output, morphed_ty, real_self, &proxy_real)? {
+            if let Some(wrapped_self) = Self::wrap_self(output, morphed_ty, real_self, &proxy_real)?
+            {
                 proxy_real = wrapped_self;
             }
         }
@@ -275,7 +276,7 @@ impl<'a> Signature<'a> {
             syn::Type::Path(output) => output,
             syn::Type::Tuple(tuple) => {
                 return Self::wrap_self_tuple(block, tuple, morphed_ty, real_self);
-            },
+            }
             output => return Err(unhandled_self_return(output)),
         };
 
@@ -344,11 +345,13 @@ impl<'a> Signature<'a> {
     }
 
     fn wrap_self_tuple(
-        block: &TokenStream, 
-        tuple: &syn::TypeTuple, 
+        block: &TokenStream,
+        tuple: &syn::TypeTuple,
         morphed_ty: &syn::TypePath,
-        real_self: SelfType) -> darling::Result<Option<TokenStream>> {
-        let elements = tuple.elems
+        real_self: SelfType,
+    ) -> darling::Result<Option<TokenStream>> {
+        let elements = tuple
+            .elems
             .iter()
             .enumerate()
             .map(|e| {
@@ -361,10 +364,10 @@ impl<'a> Signature<'a> {
                 Ok(wrapped.unwrap_or(tuple_index))
             })
             .collect::<darling::Result<Vec<TokenStream>>>()?;
-        
-        Ok(Some(quote! {{ 
+
+        Ok(Some(quote! {{
             let tuple = #block;
-           
+
             (# ( #elements),*)
         }}))
     }
@@ -464,11 +467,8 @@ fn add_lifetime(t: &mut Type, new_lifetime: &Lifetime) {
                 ..
             }) = segments.last_mut()
             {
-                if let Some(first_arg) = args.args.first_mut() {
-                    match first_arg {
-                        GenericArgument::Type(t) => add_lifetime(t, new_lifetime),
-                        _ => {}
-                    }
+                if let Some(GenericArgument::Type(t)) = args.args.first_mut() {
+                    add_lifetime(t, new_lifetime)
                 }
             };
         }
@@ -522,10 +522,8 @@ fn ang_generic_contains_self(args: &syn::AngleBracketedGenericArguments, path: &
             if contains_self(&assoc.ty, path) {
                 return true;
             }
-            // TODO: use let-else once we bump MSRV to 1.65.0
-            let args = match &assoc.generics {
-                Some(args) => args,
-                None => return false,
+            let Some(args) = &assoc.generics else {
+                return false;
             };
             ang_generic_contains_self(args, path)
         }

tests/return_self_tuple.rs

@@ -1,7 +1,4 @@
-use std::sync::Arc;
-use std::rc::Rc;
-use std::result::Result;
-use std::error::Error;
+use std::{error::Error, rc::Rc, result::Result, sync::Arc};
 
 #[faux::create]
 pub struct Foo;