Evan Almloff 1 рік тому
батько
коміт
649d264a38
3 змінених файлів з 44 додано та 45 видалено
  1. 33 42
      packages/dioxus/build.rs
  2. 10 2
      packages/dioxus/src/launch.rs
  3. 1 1
      packages/signals/Cargo.toml

+ 33 - 42
packages/dioxus/build.rs

@@ -1,51 +1,42 @@
 fn main() {
-	// Warn the user if they enabled the launch feature without any renderers
+    // Warn the user if they enabled the launch feature without any renderers
     if feature_enabled("launch") {
-		if feature_enabled("third-party-renderer"){
-			return;
-		}
+        if feature_enabled("third-party-renderer") {
+            return;
+        }
 
-		let liveview_renderers = [
-			"liveview",
-			"axum",
-			"salvo",
-			"warp",
-			"rocket",
-		];
-		let fullstack_renderers = [
-			"axum",
-			"salvo",
-			"warp",
-		];
-		let client_renderers = [
-			"desktop",
-			"mobile",
-			"web",
-			"tui",
-		];
-		let client_renderer_selected = client_renderers.iter().any(|renderer| feature_enabled(renderer));
-		if feature_enabled("fullstack") {
-			let server_fullstack_enabled = fullstack_renderers.iter().any(|renderer| feature_enabled(renderer));
-			if !server_fullstack_enabled && !client_renderer_selected {
-				println!("cargo:warning=You have enabled the launch and fullstack features, but have not enabled any renderers. The application will not be able to launch. Try enabling one of the following renderers: {} for the server or one of the following renderers: {} for the client.", fullstack_renderers.join(", "), client_renderers.join(", "));
-			}
-		}
+        let liveview_renderers = ["liveview", "axum", "salvo", "warp", "rocket"];
+        let fullstack_renderers = ["axum", "salvo", "warp"];
+        let client_renderers = ["desktop", "mobile", "web", "tui"];
+        let client_renderer_selected = client_renderers
+            .iter()
+            .any(|renderer| feature_enabled(renderer));
+        if feature_enabled("fullstack") {
+            let server_fullstack_enabled = fullstack_renderers
+                .iter()
+                .any(|renderer| feature_enabled(renderer));
+            if !server_fullstack_enabled && !client_renderer_selected {
+                println!("cargo:warning=You have enabled the launch and fullstack features, but have not enabled any renderers. The application will not be able to launch. Try enabling one of the following renderers: {} for the server or one of the following renderers: {} for the client.", fullstack_renderers.join(", "), client_renderers.join(", "));
+            }
+        }
 
-		if feature_enabled("liveview") {
-			let server_selected = liveview_renderers.iter().any(|renderer| feature_enabled(renderer));
-			if !server_selected {
-				println!("cargo:warning=You have enabled the launch and liveview features, but have not enabled any liveview renderers. The application will not be able to launch. Try enabling one of the following renderers: {}", liveview_renderers.join(", "));
-			}
-		}
+        if feature_enabled("liveview") {
+            let server_selected = liveview_renderers
+                .iter()
+                .any(|renderer| feature_enabled(renderer));
+            if !server_selected {
+                println!("cargo:warning=You have enabled the launch and liveview features, but have not enabled any liveview renderers. The application will not be able to launch. Try enabling one of the following renderers: {}", liveview_renderers.join(", "));
+            }
+        }
 
-		if !client_renderer_selected {
-			println!("cargo:warning=You have enabled the launch feature, but have not enabled any client renderers. The application will not be able to launch. Try enabling one of the following renderers: {}, fullstack or liveview", client_renderers.join(", "));
-		}
+        if !client_renderer_selected {
+            println!("cargo:warning=You have enabled the launch feature, but have not enabled any client renderers. The application will not be able to launch. Try enabling one of the following renderers: {}, fullstack or liveview", client_renderers.join(", "));
+        }
     }
 }
 
 fn feature_enabled(feature: &str) -> bool {
-	let feature = "CARGO_FEATURE_".to_owned() + &feature.to_uppercase().replace("-", "_");
-	println!("cargo:rerun-if-env-changed={}", feature);
-	std::env::var(feature).is_ok()
-}
+    let feature = "CARGO_FEATURE_".to_owned() + &feature.to_uppercase().replace('-', "_");
+    println!("cargo:rerun-if-env-changed={}", feature);
+    std::env::var(feature).is_ok()
+}

+ 10 - 2
packages/dioxus/src/launch.rs

@@ -167,12 +167,20 @@ mod current_platform {
     #[cfg(feature = "fullstack")]
     pub use dioxus_fullstack::launch::*;
 
-    #[cfg(all(feature = "web", not(any(feature = "desktop", feature = "mobile", feature = "fullstack"))))]
+    #[cfg(all(
+        feature = "web",
+        not(any(feature = "desktop", feature = "mobile", feature = "fullstack"))
+    ))]
     pub use dioxus_web::launch::*;
 
     #[cfg(all(
         feature = "liveview",
-        not(any(feature = "web", feature = "desktop", feature = "mobile", feature = "fullstack"))
+        not(any(
+            feature = "web",
+            feature = "desktop",
+            feature = "mobile",
+            feature = "fullstack"
+        ))
     ))]
     pub use dioxus_liveview::launch::*;
 

+ 1 - 1
packages/signals/Cargo.toml

@@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0"
 repository = "https://github.com/DioxusLabs/dioxus/"
 homepage = "https://dioxuslabs.com"
 keywords = ["dom", "ui", "gui", "react", "wasm"]
-rust-version = "1.60.0"
+rust-version = "1.64.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html