cleanup (#11835)

CharlesChen0823 created 2 years ago

cleanup unneed code.

Release Notes:

- N/A

Change summary

crates/util/src/util.rs             | 10 ----------
crates/workspace/src/persistence.rs |  6 +++---
2 files changed, 3 insertions(+), 13 deletions(-)

Detailed changes

crates/util/src/util.rs

@@ -431,16 +431,6 @@ pub fn asset_str<A: rust_embed::RustEmbed>(path: &str) -> Cow<'static, str> {
     }
 }
 
-// copy unstable standard feature option unzip
-// https://github.com/rust-lang/rust/issues/87800
-// Remove when this ship in Rust 1.66 or 1.67
-pub fn unzip_option<T, U>(option: Option<(T, U)>) -> (Option<T>, Option<U>) {
-    match option {
-        Some((a, b)) => (Some(a), Some(b)),
-        None => (None, None),
-    }
-}
-
 /// Expands to an immediately-invoked function expression. Good for using the ? operator
 /// in functions which do not return an Option or Result.
 ///

crates/workspace/src/persistence.rs

@@ -12,7 +12,7 @@ use sqlez::{
     statement::Statement,
 };
 
-use util::{unzip_option, ResultExt};
+use util::ResultExt;
 use uuid::Uuid;
 
 use crate::WorkspaceId;
@@ -777,7 +777,7 @@ impl WorkspaceDb {
                 children,
                 flexes,
             } => {
-                let (parent_id, position) = unzip_option(parent);
+                let (parent_id, position) = parent.unzip();
 
                 let flex_string = flexes
                     .as_ref()
@@ -828,7 +828,7 @@ impl WorkspaceDb {
         ))?((workspace_id, pane.active))?
         .ok_or_else(|| anyhow!("Could not retrieve inserted pane_id"))?;
 
-        let (parent_id, order) = unzip_option(parent);
+        let (parent_id, order) = parent.unzip();
         conn.exec_bound(sql!(
             INSERT INTO center_panes(pane_id, parent_group_id, position)
             VALUES (?, ?, ?)