Merge branch 'main' into use-msrustup

SteveL-MSFT · web-flow · commit 2585cb962f37 · 2025-04-12T16:44:52.000-07:00
diff --git a/dsc/src/resource_command.rs b/dsc/src/resource_command.rs
@@ -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) => {
diff --git a/dsc/src/subcommand.rs b/dsc/src/subcommand.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 {
diff --git a/dsc/src/tablewriter.rs b/dsc/src/tablewriter.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
diff --git a/dsc/src/util.rs b/dsc/src/util.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(())
 }
diff --git a/dsc_lib/src/configure/mod.rs b/dsc_lib/src/configure/mod.rs
@@ -88,7 +88,6 @@ fn escape_property_values(properties: &Map<String, Value>) -> Result<Option<Map<
             Value::Object(object) => {
                 let value = escape_property_values(&object.clone())?;
                 result.insert(name.clone(), serde_json::to_value(value)?);
-                continue;
             },
             Value::Array(array) => {
                 let mut result_array: Vec<Value> = Vec::new();
@@ -97,7 +96,6 @@ fn escape_property_values(properties: &Map<String, Value>) -> Result<Option<Map<
                         Value::Object(object) => {
                             let value = escape_property_values(&object.clone())?;
                             result_array.push(serde_json::to_value(value)?);
-                            continue;
                         },
                         Value::Array(_) => {
                             return Err(DscError::Parser(t!("configure.mod.nestedArraysNotSupported").to_string()));
@@ -779,7 +777,6 @@ impl Configurator {
                     Value::Object(object) => {
                         let value = self.invoke_property_expressions(Some(object))?;
                         result.insert(name.clone(), serde_json::to_value(value)?);
-                        continue;
                     },
                     Value::Array(array) => {
                         let mut result_array: Vec<Value> = Vec::new();
@@ -788,7 +785,6 @@ impl Configurator {
                                 Value::Object(object) => {
                                     let value = self.invoke_property_expressions(Some(object))?;
                                     result_array.push(serde_json::to_value(value)?);
-                                    continue;
                                 },
                                 Value::Array(_) => {
                                     return Err(DscError::Parser(t!("configure.mod.nestedArraysNotSupported").to_string()));
@@ -821,7 +817,7 @@ impl Configurator {
                             result.insert(name.clone(), Value::String(string_result.to_string()));
                         } else {
                             result.insert(name.clone(), statement_result);
-                        };
+                        }
                     },
                     _ => {
                         result.insert(name.clone(), value.clone());
diff --git a/dsc_lib/src/discovery/command_discovery.rs b/dsc_lib/src/discovery/command_discovery.rs
@@ -152,7 +152,7 @@ impl CommandDiscovery {
                     }
                 }
             }
-        };
+        }
 
         if let Ok(final_resource_path) = env::join_paths(paths.clone()) {
             debug!("{}", t!("discovery.commandDiscovery.usingResourcePath", path = final_resource_path.to_string_lossy()));
@@ -334,9 +334,8 @@ impl ResourceDiscovery for CommandDiscovery {
                         },
                         Result::Err(err) => {
                             warn!("Failed to parse resource: {line} -> {err}");
-                            continue;
                         }
-                    };
+                    }
                 }
 
                 adapter_progress.write_increment(1);
@@ -625,11 +624,11 @@ fn add_resources_to_lookup_table(adapted_resources: &BTreeMap<String, Vec<DscRes
             let oldvalue = lookup_table.insert(resource_name.to_string().to_lowercase(), new_value.clone());
             if !lookup_table_changed && (oldvalue.is_none() || oldvalue.is_some_and(|val| val != new_value)) {
                 lookup_table_changed = true;
-            };
+            }
         } else {
             info!("Resource '{resource_name}' in 'adapted_resources' is missing 'require_adapter' field.");
         }
-    };
+    }
 
     if lookup_table_changed {
         save_adapted_resources_lookup_table(&lookup_table);
diff --git a/dsc_lib/src/dscresources/command_resource.rs b/dsc_lib/src/dscresources/command_resource.rs
@@ -814,8 +814,8 @@ fn json_to_hashmap(json: &str) -> Result<HashMap<String, String>, DscError> {
                     map.insert(key, array.join(","));
                 },
                 Value::Null => {
-                    continue;
-                }
+                    // ignore null values
+                },  
                 Value::Object(_) => {
                     return Err(DscError::Operation(t!("dscresources.commandResource.invalidKey", key = key).to_string()));
                 },
@@ -884,13 +884,13 @@ pub fn log_stderr_line<'a>(process_id: &u32, trace_line: &'a str) -> &'a str
                 // the line is a valid json, but not one of standard trace lines - return it as filtered stderr_line
                 trace!("PID {process_id}: {trace_line}");
                 return trace_line;
-            };
+            }
         } else {
             // the line is not a valid json - return it as filtered stderr_line
             trace!("PID {process_id}: {}", trace_line);
             return trace_line;
         }
-    };
+    }
 
     ""
 }
diff --git a/dsc_lib/src/schemas/mod.rs b/dsc_lib/src/schemas/mod.rs
@@ -219,7 +219,7 @@ pub(crate) fn get_recognized_schema_uri(
 /// 
 /// Parameters:
 /// 
-///- `schema_file_base_name` - specify the base name for the schema file, like `document` for
+/// - `schema_file_base_name` - specify the base name for the schema file, like `document` for
 ///   the configuration document schema or `manifest` for the resource manifest schema.
 /// - `schema_folder_path` - specify the folder path for the schema file relative to the version
 ///   folder, like `config` for the configuration document schema or `resource` for the resource
@@ -300,7 +300,7 @@ pub(crate) fn get_recognized_uris_subschema(
 /// 
 /// Parameters:
 /// 
-///- `schema_file_base_name` - specify the base name for the schema file, like `document` for
+/// - `schema_file_base_name` - specify the base name for the schema file, like `document` for
 ///   the configuration document schema or `manifest` for the resource manifest schema.
 /// - `schema_folder_path` - specify the folder path for the schema file relative to the version
 ///   folder, like `config` for the configuration document schema or `resource` for the resource
diff --git a/dsc_lib/src/util.rs b/dsc_lib/src/util.rs
@@ -152,7 +152,7 @@ pub fn get_exe_path() -> Result<PathBuf, DscError> {
     if let Ok(exe) = env::current_exe() {
         if let Ok(target_path) = fs::read_link(exe.clone()) {
             return Ok(target_path);
-        };
+        }
 
         return Ok(exe);
     }
diff --git a/registry/src/main.rs b/registry/src/main.rs
@@ -163,7 +163,6 @@ fn check_debug() {
                 }
             } else {
                 eprintln!("{}", t!("main.debugEventUnexpectedError", e = event : {:?}));
-                continue;
             }
         }
     }
diff --git a/registry/src/registry_helper.rs b/registry/src/registry_helper.rs
@@ -175,7 +175,7 @@ impl RegistryHelper {
 
             if let Some(reg_key) = reg_key {
                 reg_key.set_value(&value_name, &data)?;
-            };
+            }
         }
 
         if self.what_if {

Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ pub fn schema(dsc: &DscManager, resource_type: &str, format: Option<&OutputForma`
`199`	`199`	`error!("Error: {err}");`
`200`	`200`	`exit(EXIT_JSON_ERROR);`
`201`	`201`	`}`
`202`		`- };`
	`202`	`+ }`
`203`	`203`	`write_object(&json, format, false);`
`204`	`204`	`}`
`205`	`205`	`Err(err) => {`
Original file line number	Diff line number	Diff line change
`@@ -316,7 +316,7 @@ pub fn config(subcommand: &ConfigSubCommand, parameters: &Option<String>, mounte`
`316`	`316`	`if *what_if {`
`317`	`317`	`configurator.context.execution_type = ExecutionKind::WhatIf;`
`318`	`318`	`}`
`319`		`- };`
	`319`	`+ }`
`320`	`320`
`321`	`321`	`let parameters: Option<serde_json::Value> = match if new_parameters.is_some() {`
`322`	`322`	`&new_parameters`
`@@ -407,7 +407,7 @@ pub fn config(subcommand: &ConfigSubCommand, parameters: &Option<String>, mounte`
`407`	`407`	`error!("{err}");`
`408`	`408`	`result.valid = false;`
`409`	`409`	`}`
`410`		`- };`
	`410`	`+ }`
`411`	`411`	`}`
`412`	`412`
`413`	`413`	`let Ok(json) = serde_json::to_string(&result) else {`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ impl CommandDiscovery {`
`152`	`152`	`}`
`153`	`153`	`}`
`154`	`154`	`}`
`155`		`- };`
	`155`	`+ }`
`156`	`156`
`157`	`157`	`if let Ok(final_resource_path) = env::join_paths(paths.clone()) {`
`158`	`158`	`debug!("{}", t!("discovery.commandDiscovery.usingResourcePath", path = final_resource_path.to_string_lossy()));`
`@@ -334,9 +334,8 @@ impl ResourceDiscovery for CommandDiscovery {`
`334`	`334`	`},`
`335`	`335`	`Result::Err(err) => {`
`336`	`336`	`warn!("Failed to parse resource: {line} -> {err}");`
`337`		`- continue;`
`338`	`337`	`}`
`339`		`- };`
	`338`	`+ }`
`340`	`339`	`}`
`341`	`340`
`342`	`341`	`adapter_progress.write_increment(1);`
`@@ -625,11 +624,11 @@ fn add_resources_to_lookup_table(adapted_resources: &BTreeMap<String, Vec<DscRes`
`625`	`624`	`let oldvalue = lookup_table.insert(resource_name.to_string().to_lowercase(), new_value.clone());`
`626`	`625`	`if !lookup_table_changed && (oldvalue.is_none() \|\| oldvalue.is_some_and(\|val\| val != new_value)) {`
`627`	`626`	`lookup_table_changed = true;`
`628`		`- };`
	`627`	`+ }`
`629`	`628`	`} else {`
`630`	`629`	`info!("Resource '{resource_name}' in 'adapted_resources' is missing 'require_adapter' field.");`
`631`	`630`	`}`
`632`		`- };`
	`631`	`+ }`
`633`	`632`
`634`	`633`	`if lookup_table_changed {`
`635`	`634`	`save_adapted_resources_lookup_table(&lookup_table);`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ pub fn get_exe_path() -> Result<PathBuf, DscError> {`
`152`	`152`	`if let Ok(exe) = env::current_exe() {`
`153`	`153`	`if let Ok(target_path) = fs::read_link(exe.clone()) {`
`154`	`154`	`return Ok(target_path);`
`155`		`- };`
	`155`	`+ }`
`156`	`156`
`157`	`157`	`return Ok(exe);`
`158`	`158`	`}`
Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,6 @@ fn check_debug() {`
`163`	`163`	`}`
`164`	`164`	`} else {`
`165`	`165`	`eprintln!("{}", t!("main.debugEventUnexpectedError", e = event : {:?}));`
`166`		`- continue;`
`167`	`166`	`}`
`168`	`167`	`}`
`169`	`168`	`}`