first pass of merging in warp (doesn't build)

crates/galaxy_js/src/js_function/mod.rs

@@ -7,7 +7,8 @@ cfg_if::cfg_if! {
 }
 use std::marker::PhantomData;
 
-use serde::{de::DeserializeOwned, Deserialize, Serialize};
+use serde::de::DeserializeOwned;
+use serde::{Deserialize, Serialize};
 use uuid::Uuid;
 
 /// Struct to pass serialized function input and output, encapsulating the details of the actual

crates/galaxy_js/src/js_function/native.rs

@@ -1,7 +1,10 @@
-use std::{collections::HashMap, marker::PhantomData, sync::Arc};
+use std::collections::HashMap;
+use std::marker::PhantomData;
+use std::sync::Arc;
 
 use rquickjs::{Ctx, Function, Persistent};
-use serde::{de::DeserializeOwned, Serialize};
+use serde::de::DeserializeOwned;
+use serde::Serialize;
 
 use crate::{FromWarpJs, IntoWarpJs, JsFunctionId, SerializedJsValue, TypedJsFunctionRef};