Merge branch 'main' into dependabot/cargo/dsc_lib/tokio-1.43.1

Author: SteveL-MSFT

dsc/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "dsc"
-version = "3.1.0-preview.2"
+version = "3.1.0-preview.3"
 edition = "2021"
 
 [profile.release]
@@ -13,7 +13,7 @@ lto = true
 [dependencies]
 clap = { version = "4.5", features = ["derive"] }
 clap_complete = { version = "4.5" }
-crossterm = { version = "0.28" }
+crossterm = { version = "0.29" }
 ctrlc = { version = "3.4" }
 dsc_lib = { path = "../dsc_lib" }
 indicatif = { version = "0.17" }
@@ -25,7 +25,7 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0", features = ["preserve_order"] }
 serde_yaml = { version = "0.9" }
 syntect = { version = "5.0", features = ["default-fancy"], default-features = false }
-sysinfo = { version = "0.33" }
+sysinfo = { version = "0.34" }
 thiserror = "2.0"
 tracing = { version = "0.1" }
 tracing-subscriber = { version = "0.3", features = ["ansi", "env-filter", "json"] }

dsc/Cargo.toml

@@ -199,7 +199,7 @@ pub fn schema(dsc: &DscManager, resource_type: &str, format: Option<&OutputForma
                     error!("Error: {err}");
                     exit(EXIT_JSON_ERROR);
                 }
-            };
+            }
             write_object(&json, format, false);
         }
         Err(err) => {

dsc/src/resource_command.rs

@@ -316,7 +316,7 @@ pub fn config(subcommand: &ConfigSubCommand, parameters: &Option<String>, mounte
         if *what_if {
             configurator.context.execution_type = ExecutionKind::WhatIf;
         }
-    };
+    }
 
     let parameters: Option<serde_json::Value> = match if new_parameters.is_some() {
         &new_parameters
@@ -407,7 +407,7 @@ pub fn config(subcommand: &ConfigSubCommand, parameters: &Option<String>, mounte
                         error!("{err}");
                         result.valid = false;
                     }
-                };
+                }
             }
 
             let Ok(json) = serde_json::to_string(&result) else {

dsc/src/subcommand.rs

@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
 use crossterm::terminal::size;
 
 pub struct Table {
@@ -45,6 +48,7 @@ impl Table {
     }
 
     /// Print the table to the console.
+    #[allow(clippy::format_push_string)]
     pub fn print(&self) {
         let (width, _) = size().unwrap_or((80, 25));
         // make header bright green

dsc/src/tablewriter.rs

@@ -330,11 +330,11 @@ pub fn enable_tracing(trace_level_arg: Option<&TraceLevel>, trace_format_arg: Op
     if !policy_is_used {
         if let Some(v) = trace_level_arg {
             tracing_setting.level = v.clone();
-        };
+        }
         if let Some(v) = trace_format_arg {
             tracing_setting.format = v.clone();
-        };
-    };
+        }
+    }
 
     // convert to 'tracing' crate type
     let tracing_level = match tracing_setting.level {
@@ -421,7 +421,7 @@ pub fn validate_json(source: &str, schema: &Value, json: &Value) -> Result<(), D
 
     if let Err(err) = compiled_schema.validate(json) {
         return Err(DscError::Validation(format!("{}: '{source}' {err}", t!("util.validationFailed"))));
-    };
+    }
 
     Ok(())
 }

dsc/src/util.rs

@@ -33,7 +33,7 @@ tokio = { version = "1.43", features = ["full"] }
 tracing = "0.1"
 tracing-indicatif = { version = "0.3" }
 tree-sitter = "0.25"
-tree-sitter-rust = "0.23"
+tree-sitter-rust = "0.24"
 tree-sitter-dscexpression = { path = "../tree-sitter-dscexpression" }
 uuid = { version = "1.15", features = ["v4"] }
 which = "7.0"