Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

migrator: Do some cleanup (#24687)

Browse source 
This PR does some clean up of the `migrator` crate:

- Remove `.unwrap`s
- Don't suppress `rustfmt`

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2025-02-11 15:46:21 -05:00 • committed by GitHub
parent b3814ce4e3
commit e851abd2ec
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 181 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/zed/src/zed/migrate.rs
View file

@ -8,14 +8,17 @@ pub fn should_migrate_settings(settings: &serde_json::Value) -> bool {
let Ok(old_text) = serde_json::to_string(settings) else {
return false;
};
migrator::migrate_settings(&old_text).is_some()
migrator::migrate_settings(&old_text)
.ok()
.flatten()
.is_some()
}
pub fn migrate_settings(fs: Arc<dyn Fs>, cx: &mut gpui::App) {
cx.background_executor()
.spawn(async move {
let old_text = SettingsStore::load_settings(&fs).await?;
let Some(new_text) = migrator::migrate_settings(&old_text) else {
let Some(new_text) = migrator::migrate_settings(&old_text)? else {
return anyhow::Ok(());
};
let settings_path = paths::settings_file().as_path();
@ -49,12 +52,12 @@ pub fn should_migrate_keymap(keymap_file: KeymapFile) -> bool {
let Ok(old_text) = serde_json::to_string(&keymap_file) else {
return false;
};
migrator::migrate_keymap(&old_text).is_some()
migrator::migrate_keymap(&old_text).ok().flatten().is_some()
}
pub async fn migrate_keymap(fs: Arc<dyn Fs>) -> anyhow::Result<()> {
let old_text = KeymapFile::load_keymap_file(&fs).await?;
let Some(new_text) = migrator::migrate_keymap(&old_text) else {
let Some(new_text) = migrator::migrate_keymap(&old_text)? else {
return Ok(());
};
let keymap_path = paths::keymap_file().as_path();