From 8a2d25c1728d41bc5d1f4eb7fd4236863d90117c Mon Sep 17 00:00:00 2001
From: Sunli <scott_s829@163.com>
Date: Wed, 20 Apr 2022 14:21:23 +0800
Subject: [PATCH] Clippy clean

---
 derive/src/newtype.rs        |  1 +
 src/types/maybe_undefined.rs | 30 ++++++++++++------------------
 tests/error_ext.rs           | 10 ++++------
 tests/generic_types.rs       |  4 ++--
 4 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/derive/src/newtype.rs b/derive/src/newtype.rs
index afeabc51..ba90573c 100644
--- a/derive/src/newtype.rs
+++ b/derive/src/newtype.rs
@@ -76,6 +76,7 @@ pub fn generate(newtype_args: &args::NewType) -> GeneratorResult<TokenStream> {
             }
         }
 
+        #[allow(clippy::from_over_into)]
         impl #impl_generics ::std::convert::Into<#inner_ty> for #ident #ty_generics #where_clause {
             fn into(self) -> #inner_ty {
                 self.0
diff --git a/src/types/maybe_undefined.rs b/src/types/maybe_undefined.rs
index d1177ded..2419c463 100644
--- a/src/types/maybe_undefined.rs
+++ b/src/types/maybe_undefined.rs
@@ -408,37 +408,31 @@ mod tests {
 
     #[test]
     fn test_as_opt_ref() {
-        let mut value: MaybeUndefined<String>;
-        let mut r: Option<Option<&String>>;
-
-        value = MaybeUndefined::Undefined;
-        r = value.as_opt_ref();
+        let value = MaybeUndefined::<String>::Undefined;
+        let r = value.as_opt_ref();
         assert_eq!(r, None);
 
-        value = MaybeUndefined::Null;
-        r = value.as_opt_ref();
+        let value = MaybeUndefined::<String>::Null;
+        let r = value.as_opt_ref();
         assert_eq!(r, Some(None));
 
-        value = MaybeUndefined::Value("abc".to_string());
-        r = value.as_opt_ref();
+        let value = MaybeUndefined::<String>::Value("abc".to_string());
+        let r = value.as_opt_ref();
         assert_eq!(r, Some(Some(&"abc".to_string())));
     }
 
     #[test]
     fn test_as_opt_deref() {
-        let mut value: MaybeUndefined<String>;
-        let mut r: Option<Option<&str>>;
-
-        value = MaybeUndefined::Undefined;
-        r = value.as_opt_deref();
+        let value = MaybeUndefined::<String>::Undefined;
+        let r = value.as_opt_deref();
         assert_eq!(r, None);
 
-        value = MaybeUndefined::Null;
-        r = value.as_opt_deref();
+        let value = MaybeUndefined::<String>::Null;
+        let r = value.as_opt_deref();
         assert_eq!(r, Some(None));
 
-        value = MaybeUndefined::Value("abc".to_string());
-        r = value.as_opt_deref();
+        let value = MaybeUndefined::<String>::Value("abc".to_string());
+        let r = value.as_opt_deref();
         assert_eq!(r, Some(Some("abc")));
     }
 
diff --git a/tests/error_ext.rs b/tests/error_ext.rs
index 36d5e2e6..58278b7b 100644
--- a/tests/error_ext.rs
+++ b/tests/error_ext.rs
@@ -92,19 +92,17 @@ pub async fn test_failure() {
     #[Object]
     impl Query {
         async fn failure(&self) -> Result<i32> {
-            Err(Error::new_with_source(MyError::Error1).into())
+            Err(Error::new_with_source(MyError::Error1))
         }
 
         async fn failure2(&self) -> Result<i32> {
-            Err(Error::new_with_source(MyError::Error2))?;
-            Ok(1)
+            Err(Error::new_with_source(MyError::Error2))
         }
 
         async fn failure3(&self) -> Result<i32> {
             Err(Error::new_with_source(MyError::Error1)
                 .extend_with(|_, values| values.set("a", 1))
-                .extend_with(|_, values| values.set("b", 2)))?;
-            Ok(1)
+                .extend_with(|_, values| values.set("b", 2)))
         }
 
         async fn failure4(&self) -> Result<i32> {
@@ -180,7 +178,7 @@ pub async fn test_failure2() {
     #[Object]
     impl Query {
         async fn failure(&self) -> Result<i32, MyError> {
-            Err(MyError::Error1)?
+            Err(MyError::Error1)
         }
     }
 }
diff --git a/tests/generic_types.rs b/tests/generic_types.rs
index 30f95253..54303a34 100644
--- a/tests/generic_types.rs
+++ b/tests/generic_types.rs
@@ -318,11 +318,11 @@ pub async fn test_concrete_object() {
     #[Object]
     impl Query {
         async fn a(&self) -> GbObject<i32, i64> {
-            GbObject { 0: 10, 1: 20 }
+            GbObject(10, 20)
         }
 
         async fn b(&self) -> GbObject<f32, f64> {
-            GbObject { 0: 88.0, 1: 99.0 }
+            GbObject(88.0, 99.0)
         }
     }