wrapper: use new Inner APIs

Author: dr-orlovsky

Cargo.toml

@@ -28,7 +28,7 @@ proc-macro2 = "1"
 amplify_syn = { version = "2.0.1", path = "syn" }
 
 [dev-dependencies]
-amplify = { version = "4.0.0" }
+amplify = { version = "4.4.0", git = "https://github.com/rust-amplify/rust-amplify", branch = "wrapper" }
 
 [target.'cfg(target_arch = "wasm32")'.dev-dependencies]
 wasm-bindgen-test = "0.3"

src/lib.rs

@@ -720,7 +720,6 @@ pub fn derive_getters(input: TokenStream) -> TokenStream {
 /// Simple wrapper:
 /// ```
 /// # #[macro_use] extern crate amplify_derive;
-/// use amplify::Wrapper;
 ///
 /// #[derive(Wrapper, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Default, From, Debug, Display)]
 /// #[display(inner)]
@@ -734,10 +733,9 @@ pub fn derive_getters(input: TokenStream) -> TokenStream {
 /// # #[macro_use] extern crate amplify_derive;
 /// # use std::collections::HashMap;
 /// # use std::fmt::Debug;
+/// use amplify::Inner;
 /// use std::marker::PhantomData;
 ///
-/// use amplify::Wrapper;
-///
 /// #[derive(Clone, Wrapper, Default, From)]
 /// #[wrapper(Debug)]
 /// struct Wrapped<T, U>(
@@ -755,7 +753,6 @@ pub fn derive_getters(input: TokenStream) -> TokenStream {
 /// Wrappers for indexable types
 /// ```
 /// # #[macro_use] extern crate amplify_derive;
-/// use amplify::Wrapper;
 ///
 /// #[derive(Wrapper, From)]
 /// #[wrapper(Index, RangeOps)]
@@ -830,7 +827,6 @@ pub fn derive_wrapper(input: TokenStream) -> TokenStream {
 ///
 /// ```
 /// # #[macro_use] extern crate amplify_derive;
-/// use amplify::{Wrapper, WrapperMut};
 ///
 /// #[derive(
 ///     Wrapper, WrapperMut, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Default, From, Debug,

src/wrapper.rs

@@ -247,7 +247,7 @@ impl Wrapper {
                 #[automatically_derived]
                 impl #impl_generics ::core::str::FromStr for #ident_name #ty_generics #where_clause
                 {
-                    type Err = <<Self as #amplify_crate::Wrapper>::Inner as ::core::str::FromStr>::Err;
+                    type Err = <<Self as #amplify_crate::Inner>::Inner as ::core::str::FromStr>::Err;
 
                     #[inline]
                     fn from_str(s: &str) -> Result<Self, Self::Err> {
@@ -758,9 +758,9 @@ impl WrapperMut {
             },
             WrapperMut::AsMut => quote! {
                 #[automatically_derived]
-                impl #impl_generics ::core::convert::AsMut<<#ident_name #impl_generics as #amplify_crate::Wrapper>::Inner> for #ident_name #ty_generics #where_clause {
+                impl #impl_generics ::core::convert::AsMut<<#ident_name #impl_generics as #amplify_crate::Inner>::Inner> for #ident_name #ty_generics #where_clause {
                     #[inline]
-                    fn as_mut(&mut self) -> &mut <Self as #amplify_crate::Wrapper>::Inner {
+                    fn as_mut(&mut self) -> &mut <Self as #amplify_crate::Inner>::Inner {
                         &mut self.#field
                     }
                 }
@@ -777,9 +777,9 @@ impl WrapperMut {
             },
             WrapperMut::BorrowMut => quote! {
                 #[automatically_derived]
-                impl #impl_generics ::core::borrow::BorrowMut<<#ident_name #impl_generics as #amplify_crate::Wrapper>::Inner> for #ident_name #ty_generics #where_clause {
+                impl #impl_generics ::core::borrow::BorrowMut<<#ident_name #impl_generics as #amplify_crate::Inner>::Inner> for #ident_name #ty_generics #where_clause {
                     #[inline]
-                    fn borrow_mut(&mut self) -> &mut <Self as #amplify_crate::Wrapper>::Inner {
+                    fn borrow_mut(&mut self) -> &mut <Self as #amplify_crate::Inner>::Inner {
                         &mut self.#field
                     }
                 }
@@ -1005,14 +1005,9 @@ pub(crate) fn inner(input: DeriveInput) -> Result<TokenStream2> {
 
     Ok(quote! {
         #[automatically_derived]
-        impl #impl_generics #amplify_crate::Wrapper for #ident_name #ty_generics #where_clause {
+        impl #impl_generics #amplify_crate::Inner for #ident_name #ty_generics #where_clause {
             type Inner = #from;
 
-            #[inline]
-            fn from_inner(inner: Self::Inner) -> Self {
-                Self::from(inner)
-            }
-
             #[inline]
             fn as_inner(&self) -> &Self::Inner {
                 &self.#field
@@ -1024,6 +1019,14 @@ pub(crate) fn inner(input: DeriveInput) -> Result<TokenStream2> {
             }
         }
 
+        #[automatically_derived]
+        impl #impl_generics #amplify_crate::FromInner for #ident_name #ty_generics #where_clause {
+            #[inline]
+            fn from_inner(inner: Self::Inner) -> Self {
+                Self::from(inner)
+            }
+        }
+
         #[automatically_derived]
         impl #impl_generics ::core::convert::From<#ident_name #ty_generics> for #from #where_clause {
             #[inline]
@@ -1050,9 +1053,9 @@ pub(crate) fn inner_mut(input: DeriveInput) -> Result<TokenStream2> {
 
     Ok(quote! {
         #[automatically_derived]
-        impl #impl_generics #amplify_crate::WrapperMut for #ident_name #ty_generics #where_clause {
+        impl #impl_generics #amplify_crate::InnerMut for #ident_name #ty_generics #where_clause {
             #[inline]
-            fn as_inner_mut(&mut self) -> &mut <Self as #amplify_crate::Wrapper>::Inner {
+            fn as_inner_mut(&mut self) -> &mut <Self as #amplify_crate::Inner>::Inner {
                 &mut self.#field
             }
         }