Update to cynic 2.2

Author: obmarg

Cargo.lock

@@ -36,7 +36,7 @@ serde_path_to_error = "0.1.2"
 octocrab = "0.9.1"
 comrak = "0.8.2"
 route-recognizer = "0.3.0"
-cynic = { version = "0.14" }
+cynic = { version = "2.0.0" }
 itertools = "0.10.2"
 tower = { version = "0.4.13", features = ["util", "limit", "buffer", "load-shed"] }
 github-graphql = { path = "github-graphql" }

Cargo.toml

@@ -5,4 +5,4 @@ edition = "2021"
 
 [dependencies]
 chrono = { version = "0.4", features = ["serde"] }
-cynic = { version = "0.14" }
+cynic = { version = "2.2.2" }

github-graphql/Cargo.toml

@@ -11,7 +11,7 @@ pub mod queries {
 
     cynic::impl_scalar!(DateTime, schema::DateTime);
 
-    #[derive(cynic::FragmentArguments, Debug)]
+    #[derive(cynic::QueryVariables, Debug, Clone)]
     pub struct LeastRecentlyReviewedPullRequestsArguments {
         pub repository_owner: String,
         pub repository_name: String,
@@ -21,17 +21,23 @@ pub mod queries {
     #[derive(cynic::QueryFragment, Debug)]
     #[cynic(
         graphql_type = "Query",
-        argument_struct = "LeastRecentlyReviewedPullRequestsArguments"
+        variables = "LeastRecentlyReviewedPullRequestsArguments"
     )]
     pub struct LeastRecentlyReviewedPullRequests {
-        #[arguments(owner = &args.repository_owner, name = &args.repository_name)]
+        #[arguments(owner: $repository_owner, name: $repository_name)]
         pub repository: Option<Repository>,
     }
 
     #[derive(cynic::QueryFragment, Debug)]
-    #[cynic(argument_struct = "LeastRecentlyReviewedPullRequestsArguments")]
+    #[cynic(variables = "LeastRecentlyReviewedPullRequestsArguments")]
     pub struct Repository {
-        #[arguments(states = Some(vec![PullRequestState::Open]), first = 100, after = &args.after, labels = Some(vec!["S-waiting-on-review".to_string()]), order_by = IssueOrder { direction: OrderDirection::Asc, field: IssueOrderField::UpdatedAt })]
+        #[arguments(
+            states: "OPEN",
+            first: 100,
+            after: $after,
+            labels: ["S-waiting-on-review"],
+            orderBy: {direction: "ASC", field: "UPDATED_AT"}
+        )]
         pub pull_requests: PullRequestConnection,
     }
 
@@ -53,7 +59,7 @@ pub mod queries {
         pub is_draft: bool,
         #[arguments(first = 100)]
         pub assignees: UserConnection,
-        #[arguments(first = 100, order_by = IssueCommentOrder { direction: OrderDirection::Desc, field: IssueCommentOrderField::UpdatedAt })]
+        #[arguments(first = 100, orderBy: { direction: "DESC", field: "UPDATED_AT" })]
         pub comments: IssueCommentConnection,
         #[arguments(last = 20)]
         pub latest_reviews: Option<PullRequestReviewConnection>,
@@ -109,49 +115,13 @@ pub mod queries {
         pub created_at: DateTime,
     }
 
-    #[derive(cynic::Enum, Clone, Copy, Debug)]
-    pub enum IssueCommentOrderField {
-        UpdatedAt,
-    }
-
-    #[derive(cynic::Enum, Clone, Copy, Debug)]
-    pub enum IssueOrderField {
-        Comments,
-        CreatedAt,
-        UpdatedAt,
-    }
-
-    #[derive(cynic::Enum, Clone, Copy, Debug)]
-    pub enum OrderDirection {
-        Asc,
-        Desc,
-    }
-
-    #[derive(cynic::Enum, Clone, Copy, Debug)]
-    pub enum PullRequestState {
-        Closed,
-        Merged,
-        Open,
-    }
-
-    #[derive(cynic::InputObject, Debug)]
-    pub struct IssueOrder {
-        pub direction: OrderDirection,
-        pub field: IssueOrderField,
-    }
-
-    #[derive(cynic::InputObject, Debug)]
-    pub struct IssueCommentOrder {
-        pub direction: OrderDirection,
-        pub field: IssueCommentOrderField,
-    }
-
     #[derive(cynic::QueryFragment, Debug)]
     pub struct Actor {
         pub login: String,
     }
 
     #[derive(cynic::Scalar, Debug, Clone)]
+    #[cynic(graphql_type = "URI")]
     pub struct Uri(pub String);
 }
 
@@ -160,7 +130,7 @@ pub mod docs_update_queries {
     use super::queries::{DateTime, PageInfo};
     use super::schema;
 
-    #[derive(cynic::FragmentArguments, Debug)]
+    #[derive(cynic::QueryVariables, Clone, Debug)]
     pub struct RecentCommitsArguments {
         pub branch: String,
         pub name: String,
@@ -208,30 +178,30 @@ pub mod docs_update_queries {
     /// }
     /// ```
     #[derive(cynic::QueryFragment, Debug)]
-    #[cynic(graphql_type = "Query", argument_struct = "RecentCommitsArguments")]
+    #[cynic(graphql_type = "Query", variables = "RecentCommitsArguments")]
     pub struct RecentCommits {
-        #[arguments(name = &args.name, owner = &args.owner)]
+        #[arguments(name: $name, owner: $owner)]
         pub repository: Option<Repository>,
     }
 
     #[derive(cynic::QueryFragment, Debug)]
-    #[cynic(argument_struct = "RecentCommitsArguments")]
+    #[cynic(variables = "RecentCommitsArguments")]
     pub struct Repository {
-        #[arguments(qualified_name = &args.branch)]
+        #[arguments(qualifiedName: $branch)]
         #[cynic(rename = "ref")]
         pub ref_: Option<Ref>,
     }
 
     #[derive(cynic::QueryFragment, Debug)]
-    #[cynic(argument_struct = "RecentCommitsArguments")]
+    #[cynic(variables = "RecentCommitsArguments")]
     pub struct Ref {
         pub target: Option<GitObject>,
     }
 
     #[derive(cynic::QueryFragment, Debug)]
-    #[cynic(argument_struct = "RecentCommitsArguments")]
+    #[cynic(variables = "RecentCommitsArguments")]
     pub struct Commit {
-        #[arguments(first = 100, after = &args.after)]
+        #[arguments(first: 100, after: $after)]
         pub history: CommitHistoryConnection,
     }
 
@@ -277,33 +247,18 @@ pub mod docs_update_queries {
     }
 
     #[derive(cynic::InlineFragments, Debug)]
-    #[cynic(argument_struct = "RecentCommitsArguments")]
+    #[cynic(variables = "RecentCommitsArguments")]
     pub enum GitObject {
         Commit(Commit),
-        // These three variants are here just to pacify cynic. I don't know
-        // why it fails to compile without them.
-        Tree(Tree),
-        Tag(Tag),
-        Blob(Blob),
-    }
-
-    #[derive(cynic::QueryFragment, Debug)]
-    pub struct Tree {
-        pub id: cynic::Id,
-    }
-    #[derive(cynic::QueryFragment, Debug)]
-    pub struct Tag {
-        pub id: cynic::Id,
-    }
-    #[derive(cynic::QueryFragment, Debug)]
-    pub struct Blob {
-        pub id: cynic::Id,
+        #[cynic(fallback)]
+        Other,
     }
 
     #[derive(cynic::Scalar, Debug, Clone)]
     pub struct GitObjectID(pub String);
 }
 
+#[allow(non_snake_case, non_camel_case_types)]
 mod schema {
     cynic::use_schema!("src/github.graphql");
 }