From b9db7a569987cf9333f588fcdff2759d62da5bcc Mon Sep 17 00:00:00 2001 From: Aaron Fenyes Date: Sat, 8 Mar 2025 15:02:57 -0800 Subject: [PATCH 1/2] Make `use` declarations more compact --- app-proto/src/add_remove.rs | 5 +---- app-proto/src/outline.rs | 6 +----- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/app-proto/src/add_remove.rs b/app-proto/src/add_remove.rs index cdc35e6..5fed411 100644 --- a/app-proto/src/add_remove.rs +++ b/app-proto/src/add_remove.rs @@ -4,10 +4,7 @@ use web_sys::{console, wasm_bindgen::JsValue}; use crate::{ engine, AppState, - assembly::{ - Assembly, - Element - } + assembly::{Assembly, Element} }; /* DEBUG */ diff --git a/app-proto/src/outline.rs b/app-proto/src/outline.rs index 8e40140..002baea 100644 --- a/app-proto/src/outline.rs +++ b/app-proto/src/outline.rs @@ -9,11 +9,7 @@ use web_sys::{ use crate::{ AppState, assembly, - assembly::{ - ElementKey, - Regulator, - RegulatorKey - }, + assembly::{ElementKey, Regulator, RegulatorKey}, specified::SpecifiedValue }; From 08ec838334a5fc1bfe7961ba7047c3b60c8e70fb Mon Sep 17 00:00:00 2001 From: Aaron Fenyes Date: Sat, 8 Mar 2025 15:11:37 -0800 Subject: [PATCH 2/2] Consolidate constructions from empty specification To reduce the potential for inconsistency, we should only have one piece of code that constructs a `SpecifiedValue` from the empty specification. --- app-proto/src/specified.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-proto/src/specified.rs b/app-proto/src/specified.rs index 0422291..cfe7fc3 100644 --- a/app-proto/src/specified.rs +++ b/app-proto/src/specified.rs @@ -34,7 +34,7 @@ impl TryFrom for SpecifiedValue { fn try_from(spec: String) -> Result { if spec.is_empty() { - Ok(SpecifiedValue { spec: spec, value: None }) + Ok(SpecifiedValue::from_empty_spec()) } else { spec.parse::().map( |value| SpecifiedValue { spec: spec, value: Some(value) }