From 49bf6c5bcef69ce4ae91f251d943ba9cd66d0078 Mon Sep 17 00:00:00 2001 From: Seyyed Morteza Moosavi Date: Wed, 26 Jun 2024 18:40:02 +0330 Subject: [PATCH] Fix lint and tests (#35) * fix lint errors * update tests --- derive/src/args/interface.rs | 1 + derive/src/lib.rs | 1 + derive/src/utils/impl_block/base_item_impl.rs | 1 + derive/src/utils/impl_block/from_fn_arg.rs | 2 ++ derive/src/utils/interface_attr.rs | 2 ++ derive/src/utils/meta_match/match_lit_str.rs | 1 + derive/src/utils/register_attr.rs | 1 + derive/tests/expand_object/expand_object_tests.rs | 2 ++ derive/tests/gql_enum/tests.rs | 2 ++ derive/tests/resolved_object/resolved_object_tests.rs | 2 ++ derive/tests/scalar/scalar_tests.rs | 6 ++++++ derive/tests/simple_object/object_tests.rs | 2 ++ derive/tests/upload/upload_tests.rs | 8 ++++++++ src/docs/resolved-object-fields.md | 2 ++ src/docs/simple-object.md | 2 ++ 15 files changed, 35 insertions(+) diff --git a/derive/src/args/interface.rs b/derive/src/args/interface.rs index 6b23880..d2e019d 100644 --- a/derive/src/args/interface.rs +++ b/derive/src/args/interface.rs @@ -39,6 +39,7 @@ mod root; #[derive(Debug, Clone)] pub struct InterfaceArg { + #[allow(dead_code)] pub ident: syn::Ident, } diff --git a/derive/src/lib.rs b/derive/src/lib.rs index a6384fb..d6d8c8d 100644 --- a/derive/src/lib.rs +++ b/derive/src/lib.rs @@ -1,3 +1,4 @@ +#![allow(clippy::manual_unwrap_or_default)] extern crate core; extern crate proc_macro; diff --git a/derive/src/utils/impl_block/base_item_impl.rs b/derive/src/utils/impl_block/base_item_impl.rs index 95b5324..0a03f7e 100644 --- a/derive/src/utils/impl_block/base_item_impl.rs +++ b/derive/src/utils/impl_block/base_item_impl.rs @@ -9,6 +9,7 @@ use crate::FromItemImpl; #[derive(Debug, Clone)] pub struct BaseItemImpl { + #[allow(dead_code)] pub trait_: Option, pub ty: syn::Type, pub methods: Methods, diff --git a/derive/src/utils/impl_block/from_fn_arg.rs b/derive/src/utils/impl_block/from_fn_arg.rs index 1ac6f79..4c594cb 100644 --- a/derive/src/utils/impl_block/from_fn_arg.rs +++ b/derive/src/utils/impl_block/from_fn_arg.rs @@ -6,7 +6,9 @@ pub trait FromFnArg: Sized { #[derive(Debug, Clone)] pub struct SelfArg { + #[allow(dead_code)] pub is_mut: bool, + #[allow(dead_code)] pub is_ref: bool, pub span: proc_macro2::Span, } diff --git a/derive/src/utils/interface_attr.rs b/derive/src/utils/interface_attr.rs index b04a81f..4fc6358 100644 --- a/derive/src/utils/interface_attr.rs +++ b/derive/src/utils/interface_attr.rs @@ -9,12 +9,14 @@ use crate::utils::meta_match::MatchNestedMetaList; #[derive(Debug, Clone)] pub struct InterfaceMarkAttr { pub path: syn::Path, + #[allow(dead_code)] pub span: Span, } #[derive(Debug, Clone)] pub struct InterfaceImplAttr { pub path: syn::Path, + #[allow(dead_code)] pub span: Span, } diff --git a/derive/src/utils/meta_match/match_lit_str.rs b/derive/src/utils/meta_match/match_lit_str.rs index 51558f1..d080b07 100644 --- a/derive/src/utils/meta_match/match_lit_str.rs +++ b/derive/src/utils/meta_match/match_lit_str.rs @@ -4,6 +4,7 @@ use std::ops::Deref; use crate::utils::meta_match::MatchNestedMeta; use crate::utils::meta_match::MatchString; +#[allow(dead_code)] pub struct MatchLitStr(pub S, pub proc_macro2::Span); impl Deref for MatchLitStr { diff --git a/derive/src/utils/register_attr.rs b/derive/src/utils/register_attr.rs index 640c854..fa94705 100644 --- a/derive/src/utils/register_attr.rs +++ b/derive/src/utils/register_attr.rs @@ -11,6 +11,7 @@ use crate::utils::meta_match::MatchNestedMetaList; #[derive(Debug, Clone)] pub struct RegisterAttr { pub path: syn::Path, + #[allow(dead_code)] pub span: Span, } diff --git a/derive/tests/expand_object/expand_object_tests.rs b/derive/tests/expand_object/expand_object_tests.rs index ba69728..dde6ee3 100644 --- a/derive/tests/expand_object/expand_object_tests.rs +++ b/derive/tests/expand_object/expand_object_tests.rs @@ -264,6 +264,8 @@ fn test_schema_with_deprecation() { old: Example! @deprecated(reason: "this is the old one") } + directive @deprecated(reason: String = "No longer supported") on FIELD_DEFINITION | ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION | ENUM_VALUE + directive @include(if: Boolean!) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT directive @skip(if: Boolean!) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT diff --git a/derive/tests/gql_enum/tests.rs b/derive/tests/gql_enum/tests.rs index d721ea1..36d9efd 100644 --- a/derive/tests/gql_enum/tests.rs +++ b/derive/tests/gql_enum/tests.rs @@ -369,6 +369,8 @@ async fn test_deprecation() { byExample(example: Example!): Example! } + directive @deprecated(reason: String = "No longer supported") on FIELD_DEFINITION | ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION | ENUM_VALUE + directive @include(if: Boolean!) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT directive @skip(if: Boolean!) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT diff --git a/derive/tests/resolved_object/resolved_object_tests.rs b/derive/tests/resolved_object/resolved_object_tests.rs index a80e88e..45617ed 100644 --- a/derive/tests/resolved_object/resolved_object_tests.rs +++ b/derive/tests/resolved_object/resolved_object_tests.rs @@ -324,6 +324,8 @@ fn test_schema_with_deprecation() { withReason: String! @deprecated(reason: "this is the old one") } + directive @deprecated(reason: String = "No longer supported") on FIELD_DEFINITION | ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION | ENUM_VALUE + directive @include(if: Boolean!) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT directive @skip(if: Boolean!) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT diff --git a/derive/tests/scalar/scalar_tests.rs b/derive/tests/scalar/scalar_tests.rs index 09eaaba..b07e553 100644 --- a/derive/tests/scalar/scalar_tests.rs +++ b/derive/tests/scalar/scalar_tests.rs @@ -337,6 +337,12 @@ fn test_schema_with_specified_by_url() { value: MyString! } + directive @include(if: Boolean!) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT + + directive @skip(if: Boolean!) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT + + directive @specifiedBy(url: String!) on SCALAR + schema { query: Query } diff --git a/derive/tests/simple_object/object_tests.rs b/derive/tests/simple_object/object_tests.rs index 673a357..bb82167 100644 --- a/derive/tests/simple_object/object_tests.rs +++ b/derive/tests/simple_object/object_tests.rs @@ -335,6 +335,8 @@ fn test_schema_with_deprecation() { withReason: String! @deprecated(reason: "this is the old one") } + directive @deprecated(reason: String = "No longer supported") on FIELD_DEFINITION | ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION | ENUM_VALUE + directive @include(if: Boolean!) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT directive @skip(if: Boolean!) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT diff --git a/derive/tests/upload/upload_tests.rs b/derive/tests/upload/upload_tests.rs index bf62810..dd391b9 100644 --- a/derive/tests/upload/upload_tests.rs +++ b/derive/tests/upload/upload_tests.rs @@ -79,6 +79,8 @@ async fn test_arg() { directive @skip(if: Boolean!) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT + directive @specifiedBy(url: String!) on SCALAR + schema { query: Query mutation: MutationRoot @@ -164,6 +166,8 @@ async fn test_input_object() { directive @skip(if: Boolean!) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT + directive @specifiedBy(url: String!) on SCALAR + schema { query: Query mutation: MutationRoot @@ -243,6 +247,8 @@ async fn test_arg_optional() { directive @skip(if: Boolean!) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT + directive @specifiedBy(url: String!) on SCALAR + schema { query: Query mutation: MutationRoot @@ -340,6 +346,8 @@ async fn test_input_object_optional() { directive @skip(if: Boolean!) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT + directive @specifiedBy(url: String!) on SCALAR + schema { query: Query mutation: MutationRoot diff --git a/src/docs/resolved-object-fields.md b/src/docs/resolved-object-fields.md index c413f06..dc69fe5 100644 --- a/src/docs/resolved-object-fields.md +++ b/src/docs/resolved-object-fields.md @@ -247,6 +247,8 @@ type Query { fourthField: Int! } +directive @deprecated(reason: String = "No longer supported") on FIELD_DEFINITION | ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION | ENUM_VALUE + directive @include(if: Boolean!) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT directive @skip(if: Boolean!) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT diff --git a/src/docs/simple-object.md b/src/docs/simple-object.md index 8fb0e5b..da1a1f3 100644 --- a/src/docs/simple-object.md +++ b/src/docs/simple-object.md @@ -178,6 +178,8 @@ type Query { myField: String! } +directive @deprecated(reason: String = "No longer supported") on FIELD_DEFINITION | ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION | ENUM_VALUE + directive @include(if: Boolean!) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT directive @skip(if: Boolean!) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT