Clippy clean

This commit is contained in:
Sunli 2022-04-20 14:21:23 +08:00
parent 88ba75ec70
commit 8a2d25c172
4 changed files with 19 additions and 26 deletions

View File

@ -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 { impl #impl_generics ::std::convert::Into<#inner_ty> for #ident #ty_generics #where_clause {
fn into(self) -> #inner_ty { fn into(self) -> #inner_ty {
self.0 self.0

View File

@ -408,37 +408,31 @@ mod tests {
#[test] #[test]
fn test_as_opt_ref() { fn test_as_opt_ref() {
let mut value: MaybeUndefined<String>; let value = MaybeUndefined::<String>::Undefined;
let mut r: Option<Option<&String>>; let r = value.as_opt_ref();
value = MaybeUndefined::Undefined;
r = value.as_opt_ref();
assert_eq!(r, None); assert_eq!(r, None);
value = MaybeUndefined::Null; let value = MaybeUndefined::<String>::Null;
r = value.as_opt_ref(); let r = value.as_opt_ref();
assert_eq!(r, Some(None)); assert_eq!(r, Some(None));
value = MaybeUndefined::Value("abc".to_string()); let value = MaybeUndefined::<String>::Value("abc".to_string());
r = value.as_opt_ref(); let r = value.as_opt_ref();
assert_eq!(r, Some(Some(&"abc".to_string()))); assert_eq!(r, Some(Some(&"abc".to_string())));
} }
#[test] #[test]
fn test_as_opt_deref() { fn test_as_opt_deref() {
let mut value: MaybeUndefined<String>; let value = MaybeUndefined::<String>::Undefined;
let mut r: Option<Option<&str>>; let r = value.as_opt_deref();
value = MaybeUndefined::Undefined;
r = value.as_opt_deref();
assert_eq!(r, None); assert_eq!(r, None);
value = MaybeUndefined::Null; let value = MaybeUndefined::<String>::Null;
r = value.as_opt_deref(); let r = value.as_opt_deref();
assert_eq!(r, Some(None)); assert_eq!(r, Some(None));
value = MaybeUndefined::Value("abc".to_string()); let value = MaybeUndefined::<String>::Value("abc".to_string());
r = value.as_opt_deref(); let r = value.as_opt_deref();
assert_eq!(r, Some(Some("abc"))); assert_eq!(r, Some(Some("abc")));
} }

View File

@ -92,19 +92,17 @@ pub async fn test_failure() {
#[Object] #[Object]
impl Query { impl Query {
async fn failure(&self) -> Result<i32> { 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> { async fn failure2(&self) -> Result<i32> {
Err(Error::new_with_source(MyError::Error2))?; Err(Error::new_with_source(MyError::Error2))
Ok(1)
} }
async fn failure3(&self) -> Result<i32> { async fn failure3(&self) -> Result<i32> {
Err(Error::new_with_source(MyError::Error1) Err(Error::new_with_source(MyError::Error1)
.extend_with(|_, values| values.set("a", 1)) .extend_with(|_, values| values.set("a", 1))
.extend_with(|_, values| values.set("b", 2)))?; .extend_with(|_, values| values.set("b", 2)))
Ok(1)
} }
async fn failure4(&self) -> Result<i32> { async fn failure4(&self) -> Result<i32> {
@ -180,7 +178,7 @@ pub async fn test_failure2() {
#[Object] #[Object]
impl Query { impl Query {
async fn failure(&self) -> Result<i32, MyError> { async fn failure(&self) -> Result<i32, MyError> {
Err(MyError::Error1)? Err(MyError::Error1)
} }
} }
} }

View File

@ -318,11 +318,11 @@ pub async fn test_concrete_object() {
#[Object] #[Object]
impl Query { impl Query {
async fn a(&self) -> GbObject<i32, i64> { async fn a(&self) -> GbObject<i32, i64> {
GbObject { 0: 10, 1: 20 } GbObject(10, 20)
} }
async fn b(&self) -> GbObject<f32, f64> { async fn b(&self) -> GbObject<f32, f64> {
GbObject { 0: 88.0, 1: 99.0 } GbObject(88.0, 99.0)
} }
} }