into_future for services (#527)

Author: cataggar

.github/workflows/services-all-features.yml

@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
 
 env:
-  RUSTFLAGS: --deny warnings --allow unused_attributes
+  RUSTFLAGS: --deny warnings --allow unused_attributes --allow unreachable-code --allow unused-assignments
   CARGO_INCREMENTAL: 0
 
 jobs:

services/autorust/codegen/src/cargo_toml.rs

@@ -32,6 +32,7 @@ bytes = "1.0"
 thiserror = "1.0"
 http = "0.2"
 url = "2.2"
+futures = "0.3"
 
 [dev-dependencies]
 azure_identity = {{ path = "../../../sdk/identity", version = "0.1.0" }}

services/autorust/codegen/src/codegen.rs

@@ -123,14 +123,6 @@ pub fn is_vec(ts: &TokenStream) -> bool {
     ts.to_string().starts_with("Vec <")
 }
 
-pub fn is_array(schema: &SchemaCommon) -> bool {
-    matches!(schema.type_, Some(DataType::Array))
-}
-
-pub fn is_string(schema: &SchemaCommon) -> bool {
-    matches!(schema.type_, Some(DataType::String))
-}
-
 pub fn get_schema_array_items(schema: &SchemaCommon) -> Result<&ReferenceOr<Schema>, Error> {
     schema.items.as_ref().as_ref().ok_or(Error::ArrayExpectedToHaveItems)
 }
@@ -157,12 +149,12 @@ pub fn is_basic_type(property: &ResolvedSchema) -> bool {
     )
 }
 
-/// Wraps a type in an Option if is not required.
-pub fn require(is_required: bool, tp: TokenStream) -> TokenStream {
-    if is_required {
-        tp
-    } else {
+/// Wraps a type in an Option
+pub fn add_option(is_option: bool, tp: TokenStream) -> TokenStream {
+    if is_option {
         quote! { Option<#tp> }
+    } else {
+        tp
     }
 }
 
@@ -200,29 +192,32 @@ impl TypeName {
                     idt
                 };
                 match as_ref {
-                    true => quote! { &#idt },
+                    true => quote! { impl Into<#idt> },
                     false => idt,
                 }
             }
             TypeName::Array(vec_items_typ) => {
-                let vec_items_typ = vec_items_typ.to_token_stream(as_ref, qualify_models)?;
+                let vec_items_typ = vec_items_typ.to_token_stream(false, qualify_models)?;
                 match as_ref {
-                    true => quote! { &[#vec_items_typ] },
+                    true => quote! { impl Into<Vec<#vec_items_typ>> },
                     false => quote! { Vec<#vec_items_typ> },
                 }
             }
             TypeName::Value => match as_ref {
-                true => quote! { &serde_json::Value },
+                true => quote! { impl Into<serde_json::Value> },
                 false => quote! { serde_json::Value },
             },
-            TypeName::Bytes => quote! { bytes::Bytes },
+            TypeName::Bytes => match as_ref {
+                true => quote! { impl Into<bytes::Bytes> },
+                false => quote! { bytes::Bytes },
+            },
             TypeName::Int32 => quote! { i32 },
             TypeName::Int64 => quote! { i64 },
             TypeName::Float32 => quote! { f32 },
             TypeName::Float64 => quote! { f64 },
             TypeName::Boolean => quote! { bool },
             TypeName::String => match as_ref {
-                true => quote! { &str },
+                true => quote! { impl Into<String> },
                 false => quote! { String },
             },
         })

services/autorust/codegen/src/codegen_models.rs

@@ -1,12 +1,12 @@
 use crate::{
     codegen::{
-        create_generated_by_header, enum_values_as_strings, get_schema_array_items, get_type_name_for_schema, get_type_name_for_schema_ref,
-        is_array, is_basic_type, is_local_enum, is_local_struct, is_vec, require, Error,
+        add_option, create_generated_by_header, enum_values_as_strings, get_schema_array_items, get_type_name_for_schema,
+        get_type_name_for_schema_ref, is_basic_type, is_local_enum, is_local_struct, is_vec, Error,
     },
     identifier::{CamelCaseIdent, SnakeCaseIdent},
     spec, CodeGen, PropertyName, ResolvedSchema,
 };
-use autorust_openapi::Reference;
+use autorust_openapi::{DataType, Reference, SchemaCommon};
 use indexmap::IndexMap;
 use proc_macro2::TokenStream;
 use quote::quote;
@@ -16,6 +16,10 @@ use std::{
     path::{Path, PathBuf},
 };
 
+fn is_array(schema: &SchemaCommon) -> bool {
+    matches!(schema.type_, Some(DataType::Array))
+}
+
 pub fn create_models(cg: &CodeGen) -> Result<TokenStream, Error> {
     let mut file = TokenStream::new();
     file.extend(create_generated_by_header());
@@ -203,7 +207,7 @@ fn create_struct(cg: &CodeGen, doc_file: &Path, struct_name: &str, schema: &Reso
 
         let is_vec = is_vec(&field_tp_name);
         if !is_vec {
-            field_tp_name = require(is_required, field_tp_name);
+            field_tp_name = add_option(!is_required, field_tp_name);
         }
         local_types.extend(field_tp);
         let mut serde_attrs: Vec<TokenStream> = Vec::new();