Merge #118

118: Update derive_utils to 0.11 r=taiki-e a=taiki-e Co-authored-by: Taiki Endo <te316e89@gmail.com>
taiki-e · Nov 6, 2020 · 51e3e1b · 51e3e1b
2 parents 24465a0 + 9a6670b
commit 51e3e1b
Show file tree

Hide file tree

Showing 22 changed files with 108 additions and 183 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,8 @@ This project adheres to [Semantic Versioning](https://semver.org).
 
 ## [Unreleased]
 
+* Update `derive_utils` to 0.11.
+
 ## [0.7.8] - 2020-10-16
 
 * [Add support for `tokio03::{AsyncRead, AsyncWrite, AsyncSeek, AsyncBufRead}`.](https://github.com/taiki-e/auto_enums/pull/114)

diff --git a/core/src/auto_enum/context.rs b/core/src/auto_enum/context.rs
@@ -299,7 +299,7 @@ mod kw {
     syn::custom_keyword!(marker);
 }
 
-#[allow(dead_code)] // https://github.com/rust-lang/rust/issues/56750
+#[allow(dead_code)] // false positive that fixed in Rust 1.39
 struct Args {
     args: Vec<Path>,
     marker: Option<Ident>,

diff --git a/derive/Cargo.toml b/derive/Cargo.toml
@@ -78,7 +78,7 @@ trusted_len = []
 autocfg = "1"
 
 [dependencies]
-derive_utils = { version = "0.10" }
+derive_utils = { version = "0.11" }
 proc-macro2 = "1"
 quote = "1"
 syn = { version = "1", features = ["full"] }
diff --git a/derive/src/derive/core/convert.rs b/derive/src/derive/core/convert.rs
@@ -4,12 +4,12 @@ pub(crate) mod as_ref {
     pub(crate) const NAME: &[&str] = &["AsRef"];
 
     pub(crate) fn derive(data: &Data) -> Result<TokenStream> {
-        derive_trait(data, parse_quote!(::core::convert::AsRef), None, parse_quote! {
+        Ok(derive_trait(data, parse_quote!(::core::convert::AsRef), None, parse_quote! {
             trait AsRef<__T: ?Sized> {
                 #[inline]
                 fn as_ref(&self) -> &__T;
             }
-        })
+        }))
     }
 }
 
@@ -19,11 +19,11 @@ pub(crate) mod as_mut {
     pub(crate) const NAME: &[&str] = &["AsMut"];
 
     pub(crate) fn derive(data: &Data) -> Result<TokenStream> {
-        derive_trait(data, parse_quote!(::core::convert::AsMut), None, parse_quote! {
+        Ok(derive_trait(data, parse_quote!(::core::convert::AsMut), None, parse_quote! {
             trait AsMut<__T: ?Sized> {
                 #[inline]
                 fn as_mut(&mut self) -> &mut __T;
             }
-        })
+        }))
     }
 }
diff --git a/derive/src/derive/core/fmt.rs b/derive/src/derive/core/fmt.rs
@@ -6,13 +6,12 @@ macro_rules! derive_fmt {
             pub(crate) const NAME: &[&str] = &[$($name),*];
 
             pub(crate) fn derive(data: &Data) -> Result<TokenStream> {
-                derive_trait(data, parse_quote!(::core::fmt::$Trait), None, parse_quote! {
+                Ok(derive_trait(data, parse_quote!(::core::fmt::$Trait), None, parse_quote! {
                     trait $Trait {
                         #[inline]
                         fn fmt(&self, f: &mut ::core::fmt::Formatter<'_>) -> ::core::fmt::Result;
                     }
-                })
-
+                }))
             }
         }
     };
@@ -42,7 +41,7 @@ pub(crate) mod write {
     pub(crate) const NAME: &[&str] = &["fmt::Write"];
 
     pub(crate) fn derive(data: &Data) -> Result<TokenStream> {
-        derive_trait(data, parse_quote!(::core::fmt::Write), None, parse_quote! {
+        Ok(derive_trait(data, parse_quote!(::core::fmt::Write), None, parse_quote! {
             trait Write {
                 #[inline]
                 fn write_str(&mut self, s: &str) -> ::core::fmt::Result;
@@ -51,6 +50,6 @@ pub(crate) mod write {
                 #[inline]
                 fn write_fmt(&mut self, args: ::core::fmt::Arguments<'_>) -> ::core::fmt::Result;
             }
-        })
+        }))
     }
 }
diff --git a/derive/src/derive/core/future.rs b/derive/src/derive/core/future.rs
@@ -3,7 +3,7 @@ use crate::utils::*;
 pub(crate) const NAME: &[&str] = &["Future"];
 
 pub(crate) fn derive(data: &Data) -> Result<TokenStream> {
-    derive_trait(data, parse_quote!(::core::future::Future), None, parse_quote! {
+    Ok(derive_trait(data, parse_quote!(::core::future::Future), None, parse_quote! {
         trait Future {
             type Output;
             #[inline]
@@ -12,5 +12,5 @@ pub(crate) fn derive(data: &Data) -> Result<TokenStream> {
                 cx: &mut ::core::task::Context<'_>,
             ) -> ::core::task::Poll<Self::Output>;
         }
-    })
+    }))
 }
diff --git a/derive/src/derive/core/iter.rs b/derive/src/derive/core/iter.rs
@@ -22,7 +22,7 @@ pub(crate) mod iterator {
                 __F: ::core::ops::FnMut(Self::Item) -> ::core::option::Option<__U>;
         };
 
-        derive_trait(data, parse_quote!(::core::iter::Iterator), None, parse_quote! {
+        Ok(derive_trait(data, parse_quote!(::core::iter::Iterator), None, parse_quote! {
             trait Iterator {
                 type Item;
                 #[inline]
@@ -38,7 +38,7 @@ pub(crate) mod iterator {
                 fn collect<__U: ::core::iter::FromIterator<Self::Item>>(self) -> __U;
                 #try_trait
             }
-        })
+        }))
     }
 }
 
@@ -62,7 +62,7 @@ pub(crate) mod double_ended_iterator {
                 __P: ::core::ops::FnMut(&Self::Item) -> bool;
         };
 
-        derive_trait(
+        Ok(derive_trait(
             data,
             parse_quote!(::core::iter::DoubleEndedIterator),
             Some(format_ident!("Item")),
@@ -73,7 +73,7 @@ pub(crate) mod double_ended_iterator {
                     #try_trait
                 }
             },
-        )
+        ))
     }
 }
 
@@ -85,7 +85,7 @@ pub(crate) mod exact_size_iterator {
     pub(crate) fn derive(data: &Data) -> Result<TokenStream> {
         // TODO: When `exact_size_is_empty` stabilized, add `is_empty` conditionally.
 
-        derive_trait(
+        Ok(derive_trait(
             data,
             parse_quote!(::core::iter::ExactSizeIterator),
             Some(format_ident!("Item")),
@@ -95,7 +95,7 @@ pub(crate) mod exact_size_iterator {
                     fn len(&self) -> usize;
                 }
             },
-        )
+        ))
     }
 }
 
@@ -105,14 +105,14 @@ pub(crate) mod fused_iterator {
     pub(crate) const NAME: &[&str] = &["FusedIterator"];
 
     pub(crate) fn derive(data: &Data) -> Result<TokenStream> {
-        derive_trait(
+        Ok(derive_trait(
             data,
             parse_quote!(::core::iter::FusedIterator),
             Some(format_ident!("Item")),
             parse_quote! {
                 trait FusedIterator: ::core::iter::Iterator {}
             },
-        )
+        ))
     }
 }
 
@@ -123,14 +123,14 @@ pub(crate) mod trusted_len {
     pub(crate) const NAME: &[&str] = &["TrustedLen"];
 
     pub(crate) fn derive(data: &Data) -> Result<TokenStream> {
-        derive_trait(
+        Ok(derive_trait(
             data,
             parse_quote!(::core::iter::TrustedLen),
             Some(format_ident!("Item")),
             parse_quote! {
                 unsafe trait TrustedLen: ::core::iter::Iterator {}
             },
-        )
+        ))
     }
 }
 
@@ -140,11 +140,11 @@ pub(crate) mod extend {
     pub(crate) const NAME: &[&str] = &["Extend"];
 
     pub(crate) fn derive(data: &Data) -> Result<TokenStream> {
-        derive_trait(data, parse_quote!(::core::iter::Extend), None, parse_quote! {
+        Ok(derive_trait(data, parse_quote!(::core::iter::Extend), None, parse_quote! {
             trait Extend<__A> {
                 #[inline]
                 fn extend<__T: ::core::iter::IntoIterator<Item = __A>>(&mut self, iter: __T);
             }
-        })
+        }))
     }
 }
diff --git a/derive/src/derive/core/ops.rs b/derive/src/derive/core/ops.rs
@@ -5,13 +5,13 @@ pub(crate) mod deref {
     pub(crate) const NAME: &[&str] = &["Deref"];
 
     pub(crate) fn derive(data: &Data) -> Result<TokenStream> {
-        derive_trait(data, parse_quote!(::core::ops::Deref), None, parse_quote! {
+        Ok(derive_trait(data, parse_quote!(::core::ops::Deref), None, parse_quote! {
             trait Deref {
                 type Target;
                 #[inline]
                 fn deref(&self) -> &Self::Target;
             }
-        })
+        }))
     }
 }
 
@@ -22,7 +22,7 @@ pub(crate) mod deref_mut {
     pub(crate) const NAME: &[&str] = &["DerefMut"];
 
     pub(crate) fn derive(data: &Data) -> Result<TokenStream> {
-        derive_trait(
+        Ok(derive_trait(
             data,
             parse_quote!(::core::ops::DerefMut),
             Some(format_ident!("Target")),
@@ -32,7 +32,7 @@ pub(crate) mod deref_mut {
                     fn deref_mut(&mut self) -> &mut Self::Target;
                 }
             },
-        )
+        ))
     }
 }
 
@@ -43,13 +43,13 @@ pub(crate) mod index {
     pub(crate) const NAME: &[&str] = &["Index"];
 
     pub(crate) fn derive(data: &Data) -> Result<TokenStream> {
-        derive_trait(data, parse_quote!(::core::ops::Index), None, parse_quote! {
+        Ok(derive_trait(data, parse_quote!(::core::ops::Index), None, parse_quote! {
             trait Index<__Idx> {
                 type Output;
                 #[inline]
                 fn index(&self, index: __Idx) -> &Self::Output;
             }
-        })
+        }))
     }
 }
 
@@ -60,7 +60,7 @@ pub(crate) mod index_mut {
     pub(crate) const NAME: &[&str] = &["IndexMut"];
 
     pub(crate) fn derive(data: &Data) -> Result<TokenStream> {
-        derive_trait(
+        Ok(derive_trait(
             data,
             parse_quote!(::core::ops::IndexMut),
             Some(format_ident!("Output")),
@@ -70,7 +70,7 @@ pub(crate) mod index_mut {
                     fn index_mut(&mut self, index: __Idx) -> &mut Self::Output;
                 }
             },
-        )
+        ))
     }
 }
 
@@ -81,14 +81,14 @@ pub(crate) mod range_bounds {
     pub(crate) const NAME: &[&str] = &["RangeBounds"];
 
     pub(crate) fn derive(data: &Data) -> Result<TokenStream> {
-        derive_trait(data, parse_quote!(::core::ops::RangeBounds), None, parse_quote! {
+        Ok(derive_trait(data, parse_quote!(::core::ops::RangeBounds), None, parse_quote! {
             trait RangeBounds<__T: ?Sized> {
                 #[inline]
                 fn start_bound(&self) -> ::core::ops::Bound<&__T>;
                 #[inline]
                 fn end_bound(&self) -> ::core::ops::Bound<&__T>;
             }
-        })
+        }))
     }
 }
 
@@ -99,7 +99,7 @@ pub(crate) mod generator {
     pub(crate) const NAME: &[&str] = &["Generator"];
 
     pub(crate) fn derive(data: &Data) -> Result<TokenStream> {
-        derive_trait(data, parse_quote!(::core::ops::Generator), None, parse_quote! {
+        Ok(derive_trait(data, parse_quote!(::core::ops::Generator), None, parse_quote! {
             trait Generator<R> {
                 type Yield;
                 type Return;
@@ -109,7 +109,7 @@ pub(crate) mod generator {
                     arg: R,
                 ) -> ::core::ops::GeneratorState<Self::Yield, Self::Return>;
             }
-        })
+        }))
     }
 }
 
@@ -140,7 +140,7 @@ pub(crate) mod fn_ {
         impl_.push_method(parse_quote! {
             #[inline]
             extern "rust-call" fn call(&self, args: (__T,)) -> Self::Output;
-        })?;
+        });
 
         Ok(impl_.build())
     }
@@ -173,7 +173,7 @@ pub(crate) mod fn_mut {
         impl_.push_method(parse_quote! {
             #[inline]
             extern "rust-call" fn call_mut(&mut self, args: (__T,)) -> Self::Output;
-        })?;
+        });
 
         Ok(impl_.build())
     }
@@ -209,7 +209,7 @@ pub(crate) mod fn_once {
                 #[inline]
                 extern "rust-call" fn call_once(self, args: (__T,)) -> Self::Output;
             }
-        })?;
+        });
 
         Ok(impl_.build())
     }

diff --git a/derive/src/derive/external/futures01.rs b/derive/src/derive/external/futures01.rs
@@ -4,14 +4,14 @@ pub(crate) mod future {
     pub(crate) const NAME: &[&str] = &["futures01::Future"];
 
     pub(crate) fn derive(data: &Data) -> Result<TokenStream> {
-        derive_trait(data, parse_quote!(::futures::future::Future), None, parse_quote! {
+        Ok(derive_trait(data, parse_quote!(::futures::future::Future), None, parse_quote! {
             trait Future {
                 type Item;
                 type Error;
                 #[inline]
                 fn poll(&mut self) -> ::futures::Poll<Self::Item, Self::Error>;
             }
-        })
+        }))
     }
 }
 
@@ -21,7 +21,7 @@ pub(crate) mod stream {
     pub(crate) const NAME: &[&str] = &["futures01::Stream"];
 
     pub(crate) fn derive(data: &Data) -> Result<TokenStream> {
-        derive_trait(data, parse_quote!(::futures::stream::Stream), None, parse_quote! {
+        Ok(derive_trait(data, parse_quote!(::futures::stream::Stream), None, parse_quote! {
             trait Stream {
                 type Item;
                 type Error;
@@ -30,7 +30,7 @@ pub(crate) mod stream {
                     &mut self,
                 ) -> ::futures::Poll<::core::option::Option<Self::Item>, Self::Error>;
             }
-        })
+        }))
     }
 }
 
@@ -40,7 +40,7 @@ pub(crate) mod sink {
     pub(crate) const NAME: &[&str] = &["futures01::Sink"];
 
     pub(crate) fn derive(data: &Data) -> Result<TokenStream> {
-        derive_trait(data, parse_quote!(::futures::sink::Sink), None, parse_quote! {
+        Ok(derive_trait(data, parse_quote!(::futures::sink::Sink), None, parse_quote! {
             trait Sink {
                 type SinkItem;
                 type SinkError;
@@ -54,6 +54,6 @@ pub(crate) mod sink {
                 #[inline]
                 fn close(&mut self) -> ::futures::Poll<(), Self::SinkError>;
             }
-        })
+        }))
     }
 }