Merge remote-tracking branch 'upstream/master' into clean_up_rsx_imports

packages/rsx-prelude/src/lib.rs

@@ -12,7 +12,7 @@ pub mod events {
     pub use dioxus_html::{on::*, KeyCode};
 }
 
-#[cfg(feature = "hot_reload")]
+#[cfg(feature = "hot-reload")]
 pub use dioxus_rsx_interpreter as rsx_interpreter;
 
 pub mod prelude {
@@ -22,7 +22,7 @@ pub mod prelude {
     pub use dioxus_elements::{GlobalAttributes, SvgAttributes};
     pub use dioxus_html as dioxus_elements;
 
-    #[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,