From 0af69f83f29a4fda32b5397cf1249251649249c7 Mon Sep 17 00:00:00 2001 From: YuKun Liu <41265098+mrxiaozhuox@users.noreply.github.com> Date: Sun, 26 Jun 2022 14:23:19 +0800 Subject: [PATCH] Rename `hot_reload` to `hot-reload` --- Cargo.toml | 2 +- docs/reference/src/guide/hot_reloading.md | 4 ++-- packages/core-macro/Cargo.toml | 2 +- packages/core-macro/src/lib.rs | 6 +++--- packages/desktop/Cargo.toml | 2 +- packages/desktop/src/controller.rs | 2 +- packages/web/Cargo.toml | 2 +- packages/web/src/lib.rs | 2 +- src/lib.rs | 4 ++-- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 441f2c417..7266b6cee 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -49,7 +49,7 @@ desktop = ["dioxus-desktop"] router = ["dioxus-router"] tui = ["dioxus-tui"] liveview = ["dioxus-liveview"] -hot-reload = ["dioxus-core-macro/hot_reload", "dioxus-rsx-interpreter", "dioxus-desktop?/hot_reload", "dioxus-web?/hot_reload"] +hot-reload = ["dioxus-core-macro/hot-reload", "dioxus-rsx-interpreter", "dioxus-desktop?/hot-reload", "dioxus-web?/hot-reload"] native-core = ["dioxus-native-core", "dioxus-native-core-macro"] diff --git a/docs/reference/src/guide/hot_reloading.md b/docs/reference/src/guide/hot_reloading.md index eff0c8a54..8560c62f9 100644 --- a/docs/reference/src/guide/hot_reloading.md +++ b/docs/reference/src/guide/hot_reloading.md @@ -5,9 +5,9 @@ # Setup Install [dioxus-cli](https://github.com/DioxusLabs/cli). -Enable the hot_reload feature on dioxus: +Enable the hot-reload feature on dioxus: ```toml -dioxus = { version = "*", features = ["web", "hot_reload"] } +dioxus = { version = "*", features = ["web", "hot-reload"] } ``` # Usage diff --git a/packages/core-macro/Cargo.toml b/packages/core-macro/Cargo.toml index 80502cf66..f6b352689 100644 --- a/packages/core-macro/Cargo.toml +++ b/packages/core-macro/Cargo.toml @@ -28,4 +28,4 @@ trybuild = "1.0" [features] default = [] -hot_reload = ["dioxus-rsx-interpreter"] \ No newline at end of file +hot-reload = ["dioxus-rsx-interpreter"] \ No newline at end of file diff --git a/packages/core-macro/src/lib.rs b/packages/core-macro/src/lib.rs index 56d82876f..35298703c 100644 --- a/packages/core-macro/src/lib.rs +++ b/packages/core-macro/src/lib.rs @@ -34,12 +34,12 @@ pub fn derive_typed_builder(input: proc_macro::TokenStream) -> proc_macro::Token /// ``` #[proc_macro] pub fn rsx(s: TokenStream) -> TokenStream { - #[cfg(feature = "hot_reload")] + #[cfg(feature = "hot-reload")] let rsx_text = s.to_string(); match syn::parse::(s) { Err(err) => err.to_compile_error().into(), Ok(body) => { - #[cfg(feature = "hot_reload")] + #[cfg(feature = "hot-reload")] { use dioxus_rsx_interpreter::captuered_context::CapturedContextBuilder; @@ -66,7 +66,7 @@ pub fn rsx(s: TokenStream) -> TokenStream { Err(err) => err.into_compile_error().into(), } } - #[cfg(not(feature = "hot_reload"))] + #[cfg(not(feature = "hot-reload"))] body.to_token_stream().into() } } diff --git a/packages/desktop/Cargo.toml b/packages/desktop/Cargo.toml index de07bb88a..c5beefbdc 100644 --- a/packages/desktop/Cargo.toml +++ b/packages/desktop/Cargo.toml @@ -44,7 +44,7 @@ tokio_runtime = ["tokio"] fullscreen = ["wry/fullscreen"] transparent = ["wry/transparent"] tray = ["wry/tray"] -hot_reload = ["dioxus-rsx-interpreter", "interprocess"] +hot-reload = ["dioxus-rsx-interpreter", "interprocess"] [dev-dependencies] dioxus-core-macro = { path = "../core-macro" } diff --git a/packages/desktop/src/controller.rs b/packages/desktop/src/controller.rs index b6a954b01..6c0c7feef 100644 --- a/packages/desktop/src/controller.rs +++ b/packages/desktop/src/controller.rs @@ -51,7 +51,7 @@ impl DesktopController { dom.base_scope().provide_context(window_context); // allow other proccesses to send the new rsx text to the @dioxusin ipc channel and recieve erros on the @dioxusout channel - #[cfg(feature = "hot_reload")] + #[cfg(feature = "hot-reload")] { use dioxus_rsx_interpreter::{ error::Error, ErrorHandler, SetManyRsxMessage, RSX_CONTEXT, diff --git a/packages/web/Cargo.toml b/packages/web/Cargo.toml index 2fa4a2f6b..e73f1512c 100644 --- a/packages/web/Cargo.toml +++ b/packages/web/Cargo.toml @@ -77,7 +77,7 @@ features = [ [features] default = ["panic_hook"] panic_hook = ["console_error_panic_hook"] -hot_reload = ["dioxus-rsx-interpreter", "web-sys/WebSocket", "web-sys/Location", "web-sys/MessageEvent", "web-sys/console", "serde_json"] +hot-reload = ["dioxus-rsx-interpreter", "web-sys/WebSocket", "web-sys/Location", "web-sys/MessageEvent", "web-sys/console", "serde_json"] [dev-dependencies] dioxus-core-macro = { path = "../core-macro" } diff --git a/packages/web/src/lib.rs b/packages/web/src/lib.rs index cb0e92155..abffaa66e 100644 --- a/packages/web/src/lib.rs +++ b/packages/web/src/lib.rs @@ -217,7 +217,7 @@ pub async fn run_with_props(root: Component, root_props: T let mut work_loop = ric_raf::RafLoop::new(); - #[cfg(feature = "hot_reload")] + #[cfg(feature = "hot-reload")] { use dioxus_rsx_interpreter::error::Error; use dioxus_rsx_interpreter::{ErrorHandler, SetManyRsxMessage, RSX_CONTEXT}; diff --git a/src/lib.rs b/src/lib.rs index a28d6c7f5..bd728ae2a 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -46,7 +46,7 @@ pub mod events { pub use dioxus_rsx as rsx; -#[cfg(feature = "hot_reload")] +#[cfg(feature = "hot-reload")] pub use dioxus_rsx_interpreter as rsx_interpreter; pub mod prelude { @@ -62,7 +62,7 @@ pub mod prelude { #[cfg(feature = "fermi")] pub use fermi::{use_atom_ref, use_init_atom_root, use_read, use_set, Atom, AtomRef}; - #[cfg(feature = "hot_reload")] + #[cfg(feature = "hot-reload")] pub use dioxus_rsx_interpreter::{ captuered_context::{CapturedContext, FormattedArg, IfmtArgs}, get_line_num, resolve_scope, CodeLocation, RsxContext,