Merge pull request #30 from alecmocatta/v0.3.0

Stable by default

Author: mergify[bot]

Cargo.toml

@@ -2,7 +2,7 @@
 
 [package]
 name = "serde_closure"
-version = "0.2.14"
+version = "0.3.0"
 license = "MIT OR Apache-2.0"
 authors = ["Alec Mocatta <[email protected]>"]
 categories = ["development-tools","encoding","rust-patterns","network-programming"]
@@ -23,11 +23,13 @@ azure-devops = { project = "alecmocatta/serde_closure", pipeline = "tests", buil
 maintenance = { status = "actively-developed" }
 
 [features]
-default = ["nightly"]
 nightly = []
 
+[package.metadata.docs.rs]
+features = ["nightly"]
+
 [dependencies]
-serde_closure_derive = { version = "=0.2.14", path = "serde_closure_derive" }
+serde_closure_derive = { version = "=0.3.0", path = "serde_closure_derive" }
 serde = { version = "1.0", features = ["derive"] }
 
 [dev-dependencies]

README.md

@@ -12,10 +12,13 @@ This library provides macros that wrap closures to make them serializable and
 debuggable.
 
 ```rust
+use serde_closure::{traits::Fn, Fn};
+
 let one = 1;
 let plus_one = Fn!(|x: i32| x + one);
 
-assert_eq!(2, plus_one(1));
+assert_eq!(2, plus_one.call((1,))); // this works on stable and nightly
+// assert_eq!(2, plus_one(1));      // this only works on nightly
 println!("{:#?}", plus_one);
 
 // prints:
@@ -25,14 +28,22 @@ println!("{:#?}", plus_one);
 // }
 ```
 
-This library aims to work in as simple and safe a way as possible. It currently
-requires nightly Rust for the `unboxed_closures` and `fn_traits` features (rust
+This library aims to work in as simple and safe a way as possible. On stable
+Rust the wrapped closures implement
+[`traits::FnOnce`](https://docs.rs/serde_closure/0.3/serde_closure/traits/trait.FnOnce.html),
+[`traits::FnMut`](https://docs.rs/serde_closure/0.3/serde_closure/traits/trait.FnMut.html)
+and [`traits::Fn`](https://docs.rs/serde_closure/0.3/serde_closure/traits/trait.Fn.html),
+and when the "nightly" feature is passed
+[`std::ops::FnOnce`](https://doc.rust-lang.org/std/ops/trait.FnOnce.html),
+[`std::ops::FnMut`](https://doc.rust-lang.org/std/ops/trait.FnMut.html) and
+[`std::ops::Fn`](https://doc.rust-lang.org/std/ops/trait.Fn.html) are
+implemented as well using the `unboxed_closures` and `fn_traits` features (rust
 issue [#29625](https://github.com/rust-lang/rust/issues/29625)).
 
  * There are three macros,
-   [`FnOnce`](https://docs.rs/serde_closure/0.2/serde_closure/macro.FnOnce.html),
-   [`FnMut`](https://docs.rs/serde_closure/0.2/serde_closure/macro.FnMut.html)
-   and [`Fn`](https://docs.rs/serde_closure/0.2/serde_closure/macro.Fn.html),
+   [`FnOnce`](https://docs.rs/serde_closure/0.3/serde_closure/macro.FnOnce.html),
+   [`FnMut`](https://docs.rs/serde_closure/0.3/serde_closure/macro.FnMut.html)
+   and [`Fn`](https://docs.rs/serde_closure/0.3/serde_closure/macro.Fn.html),
    corresponding to the three types of Rust closure.
  * Wrap your closure with one of the macros and it will now implement `Copy`,
    `Clone`, `PartialEq`, `Eq`, `Hash`, `PartialOrd`, `Ord`, `Serialize`,

serde_closure_derive/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "serde_closure_derive"
-version = "0.2.14"
+version = "0.3.0"
 license = "MIT OR Apache-2.0"
 authors = ["Alec Mocatta <[email protected]>"]
 categories = ["development-tools","encoding","rust-patterns","network-programming"]
@@ -25,6 +25,6 @@ maintenance = { status = "actively-developed" }
 proc-macro = true
 
 [dependencies]
-proc-macro2 = { version = "1.0.1", default-features = false, features = ["span-locations"] }
+proc-macro2 = { version = "1.0.1", default-features = false }
 quote = { version = "1.0.2", default-features = false }
 syn = { version = "1.0.5", default-features = false, features = ["clone-impls", "full", "parsing", "printing", "proc-macro", "visit-mut"] }

serde_closure_derive/src/lib.rs

@@ -10,7 +10,7 @@
 //! See [`serde_closure`](https://docs.rs/serde_closure) for
 //! documentation.
 
-#![doc(html_root_url = "https://docs.rs/serde_closure_derive/0.2.14")]
+#![doc(html_root_url = "https://docs.rs/serde_closure_derive/0.3.0")]
 
 use proc_macro2::{Span, TokenStream};
 use quote::{quote, ToTokens};
@@ -45,7 +45,7 @@ pub fn FnOnce(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
 }
 
 #[proc_macro_attribute]
-pub fn generalize(
+pub fn desugar(
 	attr: proc_macro::TokenStream, item: proc_macro::TokenStream,
 ) -> proc_macro::TokenStream {
 	let args: AttributeArgs = parse_macro_input!(attr);
@@ -54,13 +54,13 @@ pub fn generalize(
 		Err(err) => return err.to_compile_error().into(),
 		Ok(item) => item,
 	};
-	Generalizer.visit_item_mut(&mut item);
+	Desugar.visit_item_mut(&mut item);
 	item.into_token_stream().into()
 }
 
-struct Generalizer;
+struct Desugar;
 
-impl VisitMut for Generalizer {
+impl VisitMut for Desugar {
 	fn visit_trait_bound_mut(&mut self, i: &mut TraitBound) {
 		if let PathSegment {
 			ident,
@@ -107,10 +107,9 @@ impl VisitMut for Generalizer {
 							Span::call_site(),
 						))
 					}));
-				i.path = syn::parse2(
-					quote! { ::serde_closure::traits::#ident<(#inputs), Output = #output> },
-				)
-				.unwrap();
+				i.path.segments.last_mut().unwrap().arguments = PathArguments::AngleBracketed(
+					syn::parse2(quote! { <(#inputs), Output = #output> }).unwrap(),
+				);
 			}
 		}
 		visit_mut::visit_trait_bound_mut(self, i)