cargo fmt

Author: johnbatty

autorust/codegen/src/autorust_toml.rs

@@ -116,7 +116,8 @@ impl<'a> PackageConfig {
             let deny: HashSet<&str> = self.tags.deny.iter().map(String::as_str).collect();
             tags.retain(|tag| !deny.contains(tag.name()));
         }
-        let mut deny_contains: Vec<&str> = self.tags.deny_contains.iter().map(String::as_str).collect();
+        let mut deny_contains: Vec<&str> =
+            self.tags.deny_contains.iter().map(String::as_str).collect();
         if self.tags.deny_contains_preview.unwrap_or_default() {
             deny_contains.push("preview");
         }
@@ -325,7 +326,10 @@ mod tests {
             default = "package-resources-2021-04"
             "#,
         )?;
-        assert_eq!(Some("package-resources-2021-04".to_string()), config.tags.default);
+        assert_eq!(
+            Some("package-resources-2021-04".to_string()),
+            config.tags.default
+        );
         Ok(())
     }
 

autorust/codegen/src/cargo_toml.rs

@@ -2,7 +2,13 @@ use crate::Result;
 use crate::{config_parser::Tag, jinja::CargoToml};
 use camino::Utf8Path;
 
-pub fn create(package_name: &str, tags: &[&Tag], default_tag: &Tag, has_xml: bool, path: &Utf8Path) -> Result<()> {
+pub fn create(
+    package_name: &str,
+    tags: &[&Tag],
+    default_tag: &Tag,
+    has_xml: bool,
+    path: &Utf8Path,
+) -> Result<()> {
     let default_tag = &default_tag.rust_feature_name();
 
     // https://docs.rs/about/metadata
@@ -22,7 +28,9 @@ pub fn create(package_name: &str, tags: &[&Tag], default_tag: &Tag, has_xml: boo
 
 pub fn get_default_tag<'a>(tags: &[&'a Tag], default_tag: Option<&str>) -> &'a Tag {
     let default_tag = tags.iter().find(|tag| Some(tag.name()) == default_tag);
-    let is_preview = default_tag.map(|tag| tag.name().contains("preview")).unwrap_or_default();
+    let is_preview = default_tag
+        .map(|tag| tag.name().contains("preview"))
+        .unwrap_or_default();
     let stable_tag = tags.iter().find(|tag| !tag.name().contains("preview"));
     match (default_tag, is_preview, stable_tag) {
         (Some(default_tag), false, _) => default_tag,
@@ -94,13 +102,20 @@ mod tests {
         ];
         let tags: Vec<_> = tags.into_iter().map(Tag::new).collect();
         let tags: Vec<_> = tags.iter().collect();
-        assert_eq!("package-2020-04", get_default_tag(&tags, Some("package-2020-04")).name());
+        assert_eq!(
+            "package-2020-04",
+            get_default_tag(&tags, Some("package-2020-04")).name()
+        );
         Ok(())
     }
 
     #[test]
     fn specified_preview() -> Result<()> {
-        let tags = vec!["package-preview-2022-05", "package-2019-06-preview", "package-2019-04-preview"];
+        let tags = vec![
+            "package-preview-2022-05",
+            "package-2019-06-preview",
+            "package-2019-04-preview",
+        ];
         let tags: Vec<_> = tags.into_iter().map(Tag::new).collect();
         let tags: Vec<_> = tags.iter().collect();
         assert_eq!(

autorust/codegen/src/codegen_operations/function_code.rs

@@ -17,7 +17,11 @@ pub(crate) struct ClientFunctionCode {
 }
 
 impl ClientFunctionCode {
-    pub fn new(operation: &WebOperationGen, parameters: &FunctionParams, in_operation_group: bool) -> Result<Self> {
+    pub fn new(
+        operation: &WebOperationGen,
+        parameters: &FunctionParams,
+        in_operation_group: bool,
+    ) -> Result<Self> {
         let fname = operation.function_name()?;
         let summary = operation.0.summary.clone();
         let description = operation.0.description.clone();
@@ -41,7 +45,9 @@ impl ToTokens for ClientFunctionCode {
         }
         for param in self.parameters.required_params() {
             let FunctionParam {
-                variable_name, type_name, ..
+                variable_name,
+                type_name,
+                ..
             } = param;
             let mut type_name = type_name.clone();
             let is_vec = type_name.is_vec();
@@ -54,7 +60,9 @@ impl ToTokens for ClientFunctionCode {
         }
         for param in self.parameters.optional_params() {
             let FunctionParam {
-                variable_name, type_name, ..
+                variable_name,
+                type_name,
+                ..
             } = param;
             if type_name.is_vec() {
                 params.push(quote! { #variable_name: Vec::new() });

autorust/codegen/src/codegen_operations/operation_module.rs

@@ -2,8 +2,10 @@ use proc_macro2::{Ident, TokenStream};
 use quote::{quote, ToTokens};
 
 use super::{
-    request_builder_into_future::RequestBuilderIntoFutureCode, request_builder_send::RequestBuilderSendCode,
-    request_builder_setter::RequestBuilderSettersCode, request_builder_struct::RequestBuilderStructCode, response_code::ResponseCode,
+    request_builder_into_future::RequestBuilderIntoFutureCode,
+    request_builder_send::RequestBuilderSendCode,
+    request_builder_setter::RequestBuilderSettersCode,
+    request_builder_struct::RequestBuilderStructCode, response_code::ResponseCode,
 };
 pub struct OperationModuleCode {
     pub module_name: Ident,

autorust/codegen/src/codegen_operations/operations.rs

@@ -34,24 +34,36 @@ impl OperationCode {
         // get the content-types from the operation, else the spec, else default to json
         let consumes = operation
             .pick_consumes()
-            .unwrap_or_else(|| cg.spec.pick_consumes().unwrap_or(content_type::APPLICATION_JSON))
+            .unwrap_or_else(|| {
+                cg.spec
+                    .pick_consumes()
+                    .unwrap_or(content_type::APPLICATION_JSON)
+            })
             .to_string();
         let produces = operation
             .pick_produces()
-            .unwrap_or_else(|| cg.spec.pick_produces().unwrap_or(content_type::APPLICATION_JSON))
+            .unwrap_or_else(|| {
+                cg.spec
+                    .pick_produces()
+                    .unwrap_or(content_type::APPLICATION_JSON)
+            })
             .to_string();
 
         let lro = operation.0.long_running_operation;
         let lro_options = operation.0.long_running_operation_options.clone();
 
         let request_builder = SetRequestCode::new(operation, parameters, consumes);
         let in_operation_group = operation.0.in_group();
-        let client_function_code = ClientFunctionCode::new(operation, parameters, in_operation_group)?;
-        let request_builder_struct_code = RequestBuilderStructCode::new(parameters, in_operation_group, lro, lro_options.clone());
+        let client_function_code =
+            ClientFunctionCode::new(operation, parameters, in_operation_group)?;
+        let request_builder_struct_code =
+            RequestBuilderStructCode::new(parameters, in_operation_group, lro, lro_options.clone());
         let request_builder_setters_code = RequestBuilderSettersCode::new(parameters);
         let response_code = ResponseCode::new(cg, operation, produces)?;
-        let request_builder_send_code = RequestBuilderSendCode::new(new_request_code, request_builder, response_code.clone())?;
-        let request_builder_intofuture_code = RequestBuilderIntoFutureCode::new(response_code.clone(), lro, lro_options)?;
+        let request_builder_send_code =
+            RequestBuilderSendCode::new(new_request_code, request_builder, response_code.clone())?;
+        let request_builder_intofuture_code =
+            RequestBuilderIntoFutureCode::new(response_code.clone(), lro, lro_options)?;
 
         let module_code = OperationModuleCode {
             module_name: operation.function_name()?,

autorust/codegen/src/codegen_operations/request_builder_setter.rs

@@ -21,7 +21,9 @@ impl ToTokens for RequestBuilderSettersCode {
     fn to_tokens(&self, tokens: &mut TokenStream) {
         for param in self.parameters.optional_params() {
             let FunctionParam {
-                variable_name, type_name, ..
+                variable_name,
+                type_name,
+                ..
             } = param;
             let is_vec = type_name.is_vec();
             let mut type_name = type_name.clone();

autorust/codegen/src/codegen_operations/web_operation_gen.rs

@@ -143,7 +143,10 @@ pub struct Pageable {
 /// Creating a function name from the path and verb when an operationId is not specified.
 /// All azure-rest-api-specs operations should have an operationId.
 fn create_function_name(verb: &WebVerb, path: &str) -> String {
-    let mut path = path.split('/').filter(|&x| !x.is_empty()).collect::<Vec<_>>();
+    let mut path = path
+        .split('/')
+        .filter(|&x| !x.is_empty())
+        .collect::<Vec<_>>();
     path.insert(0, verb.as_str());
     path.join("_")
 }
@@ -165,7 +168,10 @@ mod tests {
             verb: WebVerb::Get,
             ..Default::default()
         });
-        assert_eq!(Some("private_clouds".to_owned()), operation.rust_module_name());
+        assert_eq!(
+            Some("private_clouds".to_owned()),
+            operation.rust_module_name()
+        );
         assert_eq!("create_or_update", operation.rust_function_name());
     }
 

autorust/codegen/src/config_parser.rs

@@ -77,15 +77,21 @@ impl Tag {
 /// Receives the AutoRest configuration file and parses it to its various configurations (by tags/API versions),
 /// according to its extension.
 /// e.g. for "path/to/config.md", it will get parsed as CommonMark [Literate Tag](http://azure.github.io/autorest/user/literate-file-formats/configuration.html).
-pub fn parse_configurations_from_autorest_config_file(config_file: &Utf8Path) -> Result<Configuration> {
-    let extension = config_file
-        .extension()
-        .ok_or_else(|| Error::with_message(ErrorKind::Parse, || format!("expected md extension {config_file}")))?;
+pub fn parse_configurations_from_autorest_config_file(
+    config_file: &Utf8Path,
+) -> Result<Configuration> {
+    let extension = config_file.extension().ok_or_else(|| {
+        Error::with_message(ErrorKind::Parse, || {
+            format!("expected md extension {config_file}")
+        })
+    })?;
     match extension.to_lowercase().as_str() {
         "md" => {
             use literate_config::*;
-            let cmark_content =
-                std::fs::read_to_string(config_file).with_context(ErrorKind::Io, || format!("reading the md file {config_file}"))?;
+            let cmark_content = std::fs::read_to_string(config_file)
+                .with_context(ErrorKind::Io, || {
+                    format!("reading the md file {config_file}")
+                })?;
             Ok(parse_configuration(&cmark_content)?)
         }
         _ => Err(Error::with_message(ErrorKind::Io, || {
@@ -118,12 +124,13 @@ mod literate_config {
         let root = parse_document(&arena, cmark_content, &ComrakOptions::default());
 
         // Get the AST node corresponding with "## Configuration".
-        let configuration_heading_node = get_configuration_section_heading_node(root).ok_or_else(|| {
-            Error::message(
-                ErrorKind::Parse,
-                "no `## Configuration` heading in the AutoRest literate configuration file",
-            )
-        })?;
+        let configuration_heading_node =
+            get_configuration_section_heading_node(root).ok_or_else(|| {
+                Error::message(
+                    ErrorKind::Parse,
+                    "no `## Configuration` heading in the AutoRest literate configuration file",
+                )
+            })?;
 
         let mut tags = Vec::new();
         let mut basic_info = BasicInformation::default();
@@ -133,15 +140,27 @@ mod literate_config {
         let mut current_node = configuration_heading_node.next_sibling();
         while let Some(node) = current_node {
             if is_basic_information(node) {
-                let yaml = extract_yaml(node)?
-                    .ok_or_else(|| Error::message(ErrorKind::Parse, "expected configuration tag to contain a YAML code block"))?;
-                basic_info = serde_yaml::from_str(&yaml).context(ErrorKind::DataConversion, "reading basic information block yaml")?;
+                let yaml = extract_yaml(node)?.ok_or_else(|| {
+                    Error::message(
+                        ErrorKind::Parse,
+                        "expected configuration tag to contain a YAML code block",
+                    )
+                })?;
+                basic_info = serde_yaml::from_str(&yaml).context(
+                    ErrorKind::DataConversion,
+                    "reading basic information block yaml",
+                )?;
             } else if let Some(tag_name) = get_tag_name(node) {
                 // Extract the configuration from the first node inside the tag heading ("Tag: ..."),
                 // by looking at the first YAML code block.
-                let yaml = extract_yaml(node)?
-                    .ok_or_else(|| Error::message(ErrorKind::Parse, "Expected configuration tag to contain a YAML code block."))?;
-                let mut tag: Tag = serde_yaml::from_str(&yaml).context(ErrorKind::Parse, "reading configuration block yaml")?;
+                let yaml = extract_yaml(node)?.ok_or_else(|| {
+                    Error::message(
+                        ErrorKind::Parse,
+                        "Expected configuration tag to contain a YAML code block.",
+                    )
+                })?;
+                let mut tag: Tag = serde_yaml::from_str(&yaml)
+                    .context(ErrorKind::Parse, "reading configuration block yaml")?;
                 for input_file in tag.input_files.iter_mut() {
                     *input_file = input_file.replace('\\', "/");
                 }
@@ -167,7 +186,9 @@ mod literate_config {
     // from https://github.com/kivikakk/comrak/blob/main/examples/headers.rs
     fn collect_text<'a>(node: &'a AstNode<'a>, output: &mut String) {
         match node.data.borrow().value {
-            NodeValue::Text(ref literal) | NodeValue::Code(NodeCode { ref literal, .. }) => output.push_str(literal),
+            NodeValue::Text(ref literal) | NodeValue::Code(NodeCode { ref literal, .. }) => {
+                output.push_str(literal)
+            }
             NodeValue::LineBreak | NodeValue::SoftBreak => output.push(' '),
             _ => {
                 for n in node.children() {
@@ -179,7 +200,9 @@ mod literate_config {
 
     /// Returns the first "## Configuration" AST Node.
     /// There should only be one per Literate Configuration file.
-    fn get_configuration_section_heading_node<'a>(root: &'a AstNode<'a>) -> Option<&'a AstNode<'a>> {
+    fn get_configuration_section_heading_node<'a>(
+        root: &'a AstNode<'a>,
+    ) -> Option<&'a AstNode<'a>> {
         root.children().find(|node| {
             if is_header_at_level(node, 2) {
                 let mut text = String::new();
@@ -220,19 +243,33 @@ mod literate_config {
     fn extract_yaml<'a>(configuration_tag_heading_node: &'a AstNode<'a>) -> Result<Option<String>> {
         let mut current_node = configuration_tag_heading_node
             .next_sibling()
-            .ok_or_else(|| Error::message(ErrorKind::Parse, "markdown ended unexpectedly after configuration tag heading"))?;
+            .ok_or_else(|| {
+                Error::message(
+                    ErrorKind::Parse,
+                    "markdown ended unexpectedly after configuration tag heading",
+                )
+            })?;
         loop {
-            if let NodeValue::CodeBlock(NodeCodeBlock { info, literal, fenced, .. }) = &current_node.data.borrow().value {
+            if let NodeValue::CodeBlock(NodeCodeBlock {
+                info,
+                literal,
+                fenced,
+                ..
+            }) = &current_node.data.borrow().value
+            {
                 if !fenced {
                     continue;
                 }
                 if info.trim_start().to_lowercase().starts_with("yaml") {
                     return Ok(Some(literal.to_owned()));
                 }
             }
-            current_node = current_node
-                .next_sibling()
-                .ok_or_else(|| Error::message(ErrorKind::Parse, "markdown ended unexpectedly after configuration tag heading"))?;
+            current_node = current_node.next_sibling().ok_or_else(|| {
+                Error::message(
+                    ErrorKind::Parse,
+                    "markdown ended unexpectedly after configuration tag heading",
+                )
+            })?;
         }
     }
 }
@@ -277,7 +314,9 @@ mod tests {
     fn test_get_input_file_api_version() {
         assert_eq!(
             Some("2019-05-05-preview".to_owned()),
-            get_input_file_api_version("Microsoft.AlertsManagement/preview/2019-05-05-preview/ActionRules.json")
+            get_input_file_api_version(
+                "Microsoft.AlertsManagement/preview/2019-05-05-preview/ActionRules.json"
+            )
         );
     }
 
@@ -317,8 +356,14 @@ input-file:
         assert_eq!(1, tags.len());
         assert_eq!("package-2019-06", tags[0].tag);
         assert_eq!(5, tags[0].input_files.len());
-        assert_eq!("Microsoft.Storage/stable/2019-06-01/storage.json", tags[0].input_files[0]);
-        assert_eq!("Microsoft.Storage/stable/2019-06-01/blob.json", tags[0].input_files[1]);
+        assert_eq!(
+            "Microsoft.Storage/stable/2019-06-01/storage.json",
+            tags[0].input_files[0]
+        );
+        assert_eq!(
+            "Microsoft.Storage/stable/2019-06-01/blob.json",
+            tags[0].input_files[1]
+        );
         Ok(())
     }
 
@@ -354,12 +399,21 @@ input-file:
         assert_eq!(2, tags.len());
         assert_eq!("package-2019-06", tags[0].tag);
         assert_eq!(5, tags[0].input_files.len());
-        assert_eq!("Microsoft.Storage/stable/2019-06-01/storage.json", tags[0].input_files[0]);
-        assert_eq!("Microsoft.Storage/stable/2019-06-01/blob.json", tags[0].input_files[1]);
+        assert_eq!(
+            "Microsoft.Storage/stable/2019-06-01/storage.json",
+            tags[0].input_files[0]
+        );
+        assert_eq!(
+            "Microsoft.Storage/stable/2019-06-01/blob.json",
+            tags[0].input_files[1]
+        );
 
         assert_eq!("package-2015-05-preview", tags[1].tag);
         assert_eq!(1, tags[1].input_files.len());
-        assert_eq!("Microsoft.Storage/preview/2015-05-01-preview/storage.json", tags[1].input_files[0]);
+        assert_eq!(
+            "Microsoft.Storage/preview/2015-05-01-preview/storage.json",
+            tags[1].input_files[0]
+        );
         Ok(())
     }