From f0fdb7005816f367a066c68e0dd4475adfd545e1 Mon Sep 17 00:00:00 2001 From: Markus Kohlhase Date: Tue, 7 Mar 2023 11:20:47 +0100 Subject: [PATCH] Rearrange module files --- src/{app.rs => app/mod.rs} | 0 src/app/{orders.rs => orders/mod.rs} | 0 src/app/{streams.rs => streams/mod.rs} | 0 src/app/{subs.rs => subs/mod.rs} | 0 src/browser/{dom.rs => dom/mod.rs} | 0 src/browser/json.rs | 12 ---------- src/browser/json/mod.rs | 17 ++++++++++++++ src/browser/json/serde_json.rs | 21 ----------------- src/browser/json/swb.rs | 23 ------------------- src/{browser.rs => browser/mod.rs} | 0 src/browser/{service.rs => service/mod.rs} | 0 .../{attributes.rs => attributes/mod.rs} | 0 .../{events.rs => events/mod.rs} | 0 .../mod.rs} | 0 .../{styles.rs => styles/mod.rs} | 0 src/dom_entity_names/{tags.rs => tags/mod.rs} | 0 .../mod.rs} | 0 src/{virtual_dom.rs => virtual_dom/mod.rs} | 0 src/virtual_dom/{node.rs => node/mod.rs} | 0 src/virtual_dom/{patch.rs => patch/mod.rs} | 0 20 files changed, 17 insertions(+), 56 deletions(-) rename src/{app.rs => app/mod.rs} (100%) rename src/app/{orders.rs => orders/mod.rs} (100%) rename src/app/{streams.rs => streams/mod.rs} (100%) rename src/app/{subs.rs => subs/mod.rs} (100%) rename src/browser/{dom.rs => dom/mod.rs} (100%) delete mode 100644 src/browser/json.rs create mode 100644 src/browser/json/mod.rs delete mode 100644 src/browser/json/serde_json.rs delete mode 100644 src/browser/json/swb.rs rename src/{browser.rs => browser/mod.rs} (100%) rename src/browser/{service.rs => service/mod.rs} (100%) rename src/dom_entity_names/{attributes.rs => attributes/mod.rs} (100%) rename src/dom_entity_names/{events.rs => events/mod.rs} (100%) rename src/{dom_entity_names.rs => dom_entity_names/mod.rs} (100%) rename src/dom_entity_names/{styles.rs => styles/mod.rs} (100%) rename src/dom_entity_names/{tags.rs => tags/mod.rs} (100%) rename src/virtual_dom/{event_handler_manager.rs => event_handler_manager/mod.rs} (100%) rename src/{virtual_dom.rs => virtual_dom/mod.rs} (100%) rename src/virtual_dom/{node.rs => node/mod.rs} (100%) rename src/virtual_dom/{patch.rs => patch/mod.rs} (100%) diff --git a/src/app.rs b/src/app/mod.rs similarity index 100% rename from src/app.rs rename to src/app/mod.rs diff --git a/src/app/orders.rs b/src/app/orders/mod.rs similarity index 100% rename from src/app/orders.rs rename to src/app/orders/mod.rs diff --git a/src/app/streams.rs b/src/app/streams/mod.rs similarity index 100% rename from src/app/streams.rs rename to src/app/streams/mod.rs diff --git a/src/app/subs.rs b/src/app/subs/mod.rs similarity index 100% rename from src/app/subs.rs rename to src/app/subs/mod.rs diff --git a/src/browser/dom.rs b/src/browser/dom/mod.rs similarity index 100% rename from src/browser/dom.rs rename to src/browser/dom/mod.rs diff --git a/src/browser/json.rs b/src/browser/json.rs deleted file mode 100644 index c988c533e..000000000 --- a/src/browser/json.rs +++ /dev/null @@ -1,12 +0,0 @@ -use serde::{de::DeserializeOwned, Serialize}; -use wasm_bindgen::JsValue; - -#[derive(Debug)] -pub struct Error(JsValue); - -type Result = std::result::Result; - -#[cfg(feature = "routing")] -mod swb; -#[cfg(feature = "routing")] -pub use swb::*; diff --git a/src/browser/json/mod.rs b/src/browser/json/mod.rs new file mode 100644 index 000000000..e35d6e6ad --- /dev/null +++ b/src/browser/json/mod.rs @@ -0,0 +1,17 @@ +use serde::{de::DeserializeOwned, Serialize}; +use serde_wasm_bindgen as swb; +use wasm_bindgen::JsValue; + +pub fn from_js_value(v: &JsValue) -> Result +where + T: DeserializeOwned, +{ + Ok(swb::from_value(v.into())?) +} + +pub fn to_js_value(v: &T) -> Result +where + T: Serialize + ?Sized, +{ + Ok(v.serialize(&swb::Serializer::json_compatible())?) +} diff --git a/src/browser/json/serde_json.rs b/src/browser/json/serde_json.rs deleted file mode 100644 index 754b39436..000000000 --- a/src/browser/json/serde_json.rs +++ /dev/null @@ -1,21 +0,0 @@ -use super::*; - -impl From<::serde_json::Error> for Error { - fn from(err: ::serde_json::Error) -> Self { - Error(JsValue::from(err.to_string())) - } -} - -pub fn from_js_value(v: &JsValue) -> Result -where - T: DeserializeOwned, -{ - Ok(v.into_serde()?) -} - -pub fn to_js_value(v: &T) -> Result -where - T: Serialize + ?Sized, -{ - Ok(JsValue::from_serde(v)?) -} diff --git a/src/browser/json/swb.rs b/src/browser/json/swb.rs deleted file mode 100644 index 900788006..000000000 --- a/src/browser/json/swb.rs +++ /dev/null @@ -1,23 +0,0 @@ -use super::*; -use serde_wasm_bindgen as swb; - -impl From for Error { - fn from(err: swb::Error) -> Self { - Error(err.into()) - } -} - -pub fn from_js_value(v: &JsValue) -> Result -where - T: DeserializeOwned, -{ - let v = swb::from_value(v.into())?; - Ok(v) -} - -pub fn to_js_value(v: &T) -> Result -where - T: Serialize + ?Sized, -{ - Ok(v.serialize(&swb::Serializer::json_compatible())?) -} diff --git a/src/browser.rs b/src/browser/mod.rs similarity index 100% rename from src/browser.rs rename to src/browser/mod.rs diff --git a/src/browser/service.rs b/src/browser/service/mod.rs similarity index 100% rename from src/browser/service.rs rename to src/browser/service/mod.rs diff --git a/src/dom_entity_names/attributes.rs b/src/dom_entity_names/attributes/mod.rs similarity index 100% rename from src/dom_entity_names/attributes.rs rename to src/dom_entity_names/attributes/mod.rs diff --git a/src/dom_entity_names/events.rs b/src/dom_entity_names/events/mod.rs similarity index 100% rename from src/dom_entity_names/events.rs rename to src/dom_entity_names/events/mod.rs diff --git a/src/dom_entity_names.rs b/src/dom_entity_names/mod.rs similarity index 100% rename from src/dom_entity_names.rs rename to src/dom_entity_names/mod.rs diff --git a/src/dom_entity_names/styles.rs b/src/dom_entity_names/styles/mod.rs similarity index 100% rename from src/dom_entity_names/styles.rs rename to src/dom_entity_names/styles/mod.rs diff --git a/src/dom_entity_names/tags.rs b/src/dom_entity_names/tags/mod.rs similarity index 100% rename from src/dom_entity_names/tags.rs rename to src/dom_entity_names/tags/mod.rs diff --git a/src/virtual_dom/event_handler_manager.rs b/src/virtual_dom/event_handler_manager/mod.rs similarity index 100% rename from src/virtual_dom/event_handler_manager.rs rename to src/virtual_dom/event_handler_manager/mod.rs diff --git a/src/virtual_dom.rs b/src/virtual_dom/mod.rs similarity index 100% rename from src/virtual_dom.rs rename to src/virtual_dom/mod.rs diff --git a/src/virtual_dom/node.rs b/src/virtual_dom/node/mod.rs similarity index 100% rename from src/virtual_dom/node.rs rename to src/virtual_dom/node/mod.rs diff --git a/src/virtual_dom/patch.rs b/src/virtual_dom/patch/mod.rs similarity index 100% rename from src/virtual_dom/patch.rs rename to src/virtual_dom/patch/mod.rs