rust: merge UI feature modules; fix Ctrl+key on Linux/Windows (egui command_only shadowing); clippy clean; rustfmt config

This commit is contained in:
Andy Dixon
2026-10-11 17:40:48 +01:00
parent 327ca1caa9
commit 2bb12c3a58
49 changed files with 1140 additions and 659 deletions
+11 -2
View File
@@ -229,7 +229,12 @@ impl Service {
}
}
}
self.store.add_audit("export", "", "", &format!("Exported {} profile(s) {}", ps.len(), if include_secrets { "with secrets" } else { "without secrets" }));
self.store.add_audit(
"export",
"",
"",
&format!("Exported {} profile(s) {}", ps.len(), if include_secrets { "with secrets" } else { "without secrets" }),
);
Ok(serde_json::to_string_pretty(&ps)?)
}
@@ -238,7 +243,11 @@ impl Service {
return Err(format!("import data is too large (max {MAX_IMPORT_JSON_BYTES} bytes)").into());
}
let ps: Vec<Option<Profile>> = serde_json::from_str(json).map_err(|e| format!("invalid JSON: {e}"))?;
let ps = ps.into_iter().enumerate().map(|(i, p)| p.ok_or_else(|| format!("profile import entry {i} is null"))).collect::<std::result::Result<Vec<_>, _>>()?;
let ps = ps
.into_iter()
.enumerate()
.map(|(i, p)| p.ok_or_else(|| format!("profile import entry {i} is null")))
.collect::<std::result::Result<Vec<_>, _>>()?;
self.import(ps, strategy)
}