Rm PhantomData

Author: RoDmitry

openapi-generator-template/model.mustache

@@ -1,7 +1,6 @@
 {{>partial_header}}
 use crate::models;
 use ::std::borrow::Cow;
-use ::std::marker::PhantomData;
 use serde::{Deserialize, Serialize};
 {{#models}}
 {{#model}}
@@ -170,11 +169,6 @@ pub struct {{{classname}}}{{#vendorExtensions.x-rust-is-used-as-input}}<'a{{#ven
     }}{{#isNullable}}>{{/isNullable}}{{^required}}>{{/required}},
     {{/vendorExtensions.x-rust-type}}
 {{/vars}}
-    {{#vendorExtensions.x-rust-is-used-as-input}}
-    #[serde(skip)]
-    {{#vendorExtensions.x-rust-builder}}#[builder(default)]{{/vendorExtensions.x-rust-builder}}
-    pub _phantom: PhantomData<&'a ()>,
-    {{/vendorExtensions.x-rust-is-used-as-input}}
 }
 
 impl{{#vendorExtensions.x-rust-is-used-as-input}}<'a{{#vendorExtensions.x-rust-generic-parameter}}, {{{.}}}{{/vendorExtensions.x-rust-generic-parameter}}>{{/vendorExtensions.x-rust-is-used-as-input}}{{^vendorExtensions.x-rust-is-used-as-input}}{{#vendorExtensions.x-rust-generic-parameter}}<{{{.}}}>{{/vendorExtensions.x-rust-generic-parameter}}{{/vendorExtensions.x-rust-is-used-as-input}} {{!
@@ -213,9 +207,6 @@ impl{{#vendorExtensions.x-rust-is-used-as-input}}<'a{{#vendorExtensions.x-rust-g
             {{{name}}}{{^required}}: None{{/required}}{{#required}}{{#isModel}}{{^avoidBoxedModels}}: {{^isNullable}}Box::new({{{name}}}){{/isNullable}}{{#isNullable}}if let Some(x) = {{{name}}} {Some(Box::new(x))} else {None}{{/isNullable}}{{/avoidBoxedModels}}{{/isModel}}{{/required}},
             {{/vendorExtensions.x-rust-type}}
             {{/vars}}
-            {{#vendorExtensions.x-rust-is-used-as-input}}
-            _phantom: PhantomData,
-            {{/vendorExtensions.x-rust-is-used-as-input}}
         }
     }
 }

openapi-generator-template/reqwest/api.mustache

@@ -3,7 +3,6 @@
 use super::{Error, configuration, ContentType};
 use crate::{apis::ResponseContent, models};
 use ::std::borrow::Cow;
-use ::std::marker::PhantomData;
 use reqwest;
 use serde::{Deserialize, Serialize, de::Error as _};
 
@@ -46,7 +45,6 @@ pub struct {{{operationIdCamelCase}}}Params<'p{{!
     }},
     {{/vendorExtensions.x-rust-type}}
 {{#-last}}
-    pub _phantom: PhantomData<&'p ()>,
 }
 
 {{/-last}}

typesense/src/client/alias.rs

@@ -26,7 +26,6 @@ impl<'a> Alias<'a> {
     ) -> Result<models::CollectionAlias, Error<collections_api::GetAliasError>> {
         let params = collections_api::GetAliasParams {
             alias_name: self.alias_name.into(),
-            _phantom: core::marker::PhantomData,
         };
 
         execute_wrapper!(self, collections_api::get_alias, params)
@@ -38,7 +37,6 @@ impl<'a> Alias<'a> {
     ) -> Result<models::CollectionAlias, Error<collections_api::DeleteAliasError>> {
         let params = collections_api::DeleteAliasParams {
             alias_name: self.alias_name.into(),
-            _phantom: core::marker::PhantomData,
         };
         execute_wrapper!(self, collections_api::delete_alias, params)
     }

typesense/src/client/aliases.rs

@@ -37,7 +37,6 @@ impl<'a> Aliases<'a> {
         let params = collections_api::UpsertAliasParams {
             alias_name: alias_name.into(),
             collection_alias_schema: Some(schema),
-            _phantom: core::marker::PhantomData,
         };
         execute_wrapper!(self, collections_api::upsert_alias, params)
     }

typesense/src/client/collection/document.rs

@@ -52,7 +52,6 @@ where
         let params = documents_api::GetDocumentParams {
             collection_name: self.collection_name.into(),
             document_id: self.document_id.as_ref().into(),
-            _phantom: core::marker::PhantomData,
         };
 
         let result_value = execute_wrapper!(self, documents_api::get_document, params)?;
@@ -70,7 +69,6 @@ where
         let params = documents_api::DeleteDocumentParams {
             collection_name: self.collection_name.into(),
             document_id: self.document_id.as_ref().into(),
-            _phantom: core::marker::PhantomData,
         };
 
         let result_value = execute_wrapper!(self, documents_api::delete_document, params)?;
@@ -136,7 +134,6 @@ where
             document_id: self.document_id.as_ref().into(),
             body: partial_document,
             dirty_values: params.and_then(|d| d.dirty_values),
-            _phantom: core::marker::PhantomData,
         };
 
         let result_value = execute_wrapper!(self, documents_api::update_document, params)?;

typesense/src/client/collection/documents.rs

@@ -61,7 +61,6 @@ where
             body: document,
             action: Some(action.into()),
             dirty_values: params.and_then(|d| d.dirty_values), // Or expose this as an argument if needed
-            _phantom: core::marker::PhantomData,
         };
         execute_wrapper!(self, documents_api::index_document, params)
     }
@@ -78,7 +77,7 @@ where
     pub async fn import_jsonl(
         &self,
         documents_jsonl: impl Into<Cow<'_, str>>,
-        params: ImportDocumentsParameters<'_>,
+        params: ImportDocumentsParameters,
     ) -> Result<String, Error<documents_api::ImportDocumentsError>> {
         let params = documents_api::ImportDocumentsParams {
             body: documents_jsonl.into(),
@@ -90,7 +89,6 @@ where
             remote_embedding_batch_size: params.remote_embedding_batch_size,
             return_doc: params.return_doc,
             return_id: params.return_id,
-            _phantom: core::marker::PhantomData,
         };
         execute_wrapper!(self, documents_api::import_documents, params)
     }
@@ -108,7 +106,6 @@ where
             exclude_fields: params.exclude_fields,
             filter_by: params.filter_by,
             include_fields: params.include_fields,
-            _phantom: core::marker::PhantomData,
         };
         execute_wrapper!(self, documents_api::export_documents, params)
     }
@@ -128,7 +125,6 @@ where
             batch_size: params.batch_size,
             ignore_not_found: params.ignore_not_found,
             truncate: params.truncate,
-            _phantom: core::marker::PhantomData,
         };
         execute_wrapper!(self, documents_api::delete_documents, params)
     }
@@ -217,7 +213,6 @@ where
             nl_query: params.nl_query,
             enable_analytics: params.enable_analytics,
             synonym_sets: params.synonym_sets,
-            _phantom: core::marker::PhantomData,
         };
         execute_wrapper!(self, documents_api::search_collection, search_params)
     }
@@ -279,7 +274,6 @@ where
             collection_name: self.collection_name.into(),
             filter_by: params.filter_by,
             body: document,
-            _phantom: core::marker::PhantomData,
         };
         execute_wrapper!(self, documents_api::update_documents, params)
     }

typesense/src/client/collection/mod.rs

@@ -58,7 +58,6 @@ where
     ) -> Result<models::CollectionResponse, Error<collections_api::GetCollectionError>> {
         let params = collections_api::GetCollectionParams {
             collection_name: self.collection_name.as_ref().into(),
-            _phantom: core::marker::PhantomData,
         };
         execute_wrapper!(self, collections_api::get_collection, params)
     }
@@ -70,7 +69,6 @@ where
     ) -> Result<models::CollectionResponse, Error<collections_api::DeleteCollectionError>> {
         let params = collections_api::DeleteCollectionParams {
             collection_name: self.collection_name.as_ref().into(),
-            _phantom: core::marker::PhantomData,
         };
         execute_wrapper!(self, collections_api::delete_collection, params)
     }
@@ -82,15 +80,11 @@ where
     #[inline]
     pub async fn update(
         &self,
-        update_schema: models::CollectionUpdateSchema<'_>,
-    ) -> Result<
-        models::CollectionUpdateSchema<'static>,
-        Error<collections_api::UpdateCollectionError>,
-    > {
+        update_schema: models::CollectionUpdateSchema,
+    ) -> Result<models::CollectionUpdateSchema, Error<collections_api::UpdateCollectionError>> {
         let params = collections_api::UpdateCollectionParams {
             collection_name: self.collection_name.as_ref().into(),
             collection_update_schema: update_schema,
-            _phantom: core::marker::PhantomData,
         };
         execute_wrapper!(self, collections_api::update_collection, params)
     }

typesense/src/client/collections.rs

@@ -32,7 +32,6 @@ impl<'c> Collections<'c> {
     ) -> Result<models::CollectionResponse, Error<collections_api::CreateCollectionError>> {
         let params = collections_api::CreateCollectionParams {
             collection_schema: schema,
-            _phantom: core::marker::PhantomData,
         };
         execute_wrapper!(self, collections_api::create_collection, params)
     }
@@ -46,7 +45,6 @@ impl<'c> Collections<'c> {
             exclude_fields: params.exclude_fields,
             limit: params.limit,
             offset: params.offset,
-            _phantom: core::marker::PhantomData,
         };
         execute_wrapper!(self, collections_api::get_collections, params)
     }

typesense/src/client/conversations/model.rs

@@ -29,7 +29,6 @@ impl<'a> Model<'a> {
     > {
         let params = conversations_api::RetrieveConversationModelParams {
             model_id: self.model_id.into(),
-            _phantom: core::marker::PhantomData,
         };
         execute_wrapper!(self, conversations_api::retrieve_conversation_model, params)
     }
@@ -48,7 +47,6 @@ impl<'a> Model<'a> {
         let params = conversations_api::UpdateConversationModelParams {
             model_id: self.model_id.into(),
             conversation_model_update_schema: schema,
-            _phantom: core::marker::PhantomData,
         };
         execute_wrapper!(self, conversations_api::update_conversation_model, params)
     }
@@ -62,7 +60,6 @@ impl<'a> Model<'a> {
     > {
         let params = conversations_api::DeleteConversationModelParams {
             model_id: self.model_id.into(),
-            _phantom: core::marker::PhantomData,
         };
         execute_wrapper!(self, conversations_api::delete_conversation_model, params)
     }

typesense/src/client/conversations/models.rs

@@ -32,7 +32,6 @@ impl<'a> Models<'a> {
     > {
         let params = conversations_api::CreateConversationModelParams {
             conversation_model_create_schema: schema,
-            _phantom: core::marker::PhantomData,
         };
         execute_wrapper!(self, conversations_api::create_conversation_model, params)
     }