From 5530d29c69160cee3f8c0a50b9c5e631d9ae9389 Mon Sep 17 00:00:00 2001 From: Juha Kukkonen Date: Wed, 15 May 2024 09:11:55 +0300 Subject: [PATCH] Clean up imports for utoipa-gen --- utoipa-gen/src/ext.rs | 2 ++ utoipa-gen/src/ext/actix.rs | 13 +++---------- utoipa-gen/src/path/parameter.rs | 2 +- utoipa-gen/src/path/response.rs | 5 +---- 4 files changed, 7 insertions(+), 15 deletions(-) diff --git a/utoipa-gen/src/ext.rs b/utoipa-gen/src/ext.rs index 083b8431..3500da3b 100644 --- a/utoipa-gen/src/ext.rs +++ b/utoipa-gen/src/ext.rs @@ -263,12 +263,14 @@ pub struct ResolvedOperation { pub body: String, } +#[allow(unused)] pub type Arguments<'a> = ( Option>>, Option>>, Option>, ); +#[allow(unused)] pub trait ArgumentResolver { fn resolve_arguments( _: &'_ Punctuated, diff --git a/utoipa-gen/src/ext/actix.rs b/utoipa-gen/src/ext/actix.rs index f7cc085c..005c3f82 100644 --- a/utoipa-gen/src/ext/actix.rs +++ b/utoipa-gen/src/ext/actix.rs @@ -13,8 +13,8 @@ use crate::{ use super::{ fn_arg::{self, FnArg}, - ArgumentIn, ArgumentResolver, MacroArg, MacroPath, PathOperationResolver, PathOperations, - PathResolver, ResolvedOperation, ValueArgument, + ArgumentIn, ArgumentResolver, Arguments, MacroArg, MacroPath, PathOperationResolver, + PathOperations, PathResolver, ResolvedOperation, ValueArgument, }; impl ArgumentResolver for PathOperations { @@ -22,14 +22,7 @@ impl ArgumentResolver for PathOperations { fn_args: &Punctuated, macro_args: Option>, _: String, - ) -> Result< - ( - Option>>, - Option>>, - Option>, - ), - Diagnostics, - > { + ) -> Result { let (into_params_args, value_args): (Vec, Vec) = fn_arg::get_fn_args(fn_args)?.partition(fn_arg::is_into_params); diff --git a/utoipa-gen/src/path/parameter.rs b/utoipa-gen/src/path/parameter.rs index f8ed6c03..77cdd6af 100644 --- a/utoipa-gen/src/path/parameter.rs +++ b/utoipa-gen/src/path/parameter.rs @@ -1,6 +1,6 @@ use std::{borrow::Cow, fmt::Display}; -use proc_macro2::{Ident, Span, TokenStream}; +use proc_macro2::{Ident, TokenStream}; use quote::{quote, quote_spanned, ToTokens}; use syn::{ parenthesized, diff --git a/utoipa-gen/src/path/response.rs b/utoipa-gen/src/path/response.rs index 69a97d42..b49bf3db 100644 --- a/utoipa-gen/src/path/response.rs +++ b/utoipa-gen/src/path/response.rs @@ -11,10 +11,7 @@ use syn::{ }; use crate::{ - component::{ - features::{impl_merge, Inline}, - ComponentSchema, TypeTree, - }, + component::{features::Inline, ComponentSchema, TypeTree}, impl_to_tokens_diagnostics, parse_utils, AnyValue, Array, Diagnostics, };