forked from 1b-agent/opencadstudio-upstream
style: apply cargo fmt across workspace
This commit is contained in:
1 parent
85710e5454
commit
9cf9ff2c5c
531 files changed
+57740
-33906
No files matched your search
+8
-21
@@ -243,23 +243,16 @@ pub(super) fn load_aliases() -> FxHashMap<String, String> {
|
||||
// Only advance the version marker once the migrated table is
|
||||
// actually stored, so a failed set_item leaves the marker
|
||||
// behind and the merge is retried next launch.
|
||||
if storage
|
||||
.set_item(WEB_ALIAS_KEY, &to_pgp(&map))
|
||||
.is_ok()
|
||||
{
|
||||
let _ = storage.set_item(
|
||||
WEB_ALIAS_VERSION_KEY,
|
||||
&DEFAULT_ALIASES_VERSION.to_string(),
|
||||
);
|
||||
if storage.set_item(WEB_ALIAS_KEY, &to_pgp(&map)).is_ok() {
|
||||
let _ = storage
|
||||
.set_item(WEB_ALIAS_VERSION_KEY, &DEFAULT_ALIASES_VERSION.to_string());
|
||||
}
|
||||
}
|
||||
map
|
||||
}
|
||||
None => {
|
||||
let _ = storage.set_item(
|
||||
WEB_ALIAS_VERSION_KEY,
|
||||
&DEFAULT_ALIASES_VERSION.to_string(),
|
||||
);
|
||||
let _ =
|
||||
storage.set_item(WEB_ALIAS_VERSION_KEY, &DEFAULT_ALIASES_VERSION.to_string());
|
||||
default_map()
|
||||
}
|
||||
};
|
||||
@@ -330,12 +323,7 @@ impl OpenCADStudio {
|
||||
.alias_editor_rows
|
||||
.iter()
|
||||
.filter(|(a, c)| !a.trim().is_empty() && !c.trim().is_empty())
|
||||
.map(|(a, c)| {
|
||||
(
|
||||
a.trim().to_uppercase(),
|
||||
c.trim().to_uppercase(),
|
||||
)
|
||||
})
|
||||
.map(|(a, c)| (a.trim().to_uppercase(), c.trim().to_uppercase()))
|
||||
.collect();
|
||||
self.set_command_aliases(map);
|
||||
}
|
||||
@@ -371,9 +359,8 @@ impl OpenCADStudio {
|
||||
);
|
||||
}
|
||||
self.apply_alias_editor_rows();
|
||||
self.command_line.push_info(
|
||||
crate::tf!("{} alias(es) applied.", self.command_aliases.len()).as_ref(),
|
||||
);
|
||||
self.command_line
|
||||
.push_info(crate::tf!("{} alias(es) applied.", self.command_aliases.len()).as_ref());
|
||||
}
|
||||
|
||||
/// Reset the working rows and live table to the shipped defaults.
|
||||
|
||||
Reference in new issue
Block a user