swaits/dioxus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix some merge conflicts

Browse Source
This commit is contained in:
Evan Almloff committed 2023-12-29 09:46:58 -06:00
1 parent 601c63b67f
commit f7881aa1f0
2 files changed
+9 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

packages/cli/src/cli/build.rs
+5 -5
View File
@@ -26,15 +26,15 @@ impl Build {
crate_config.with_verbose(self.build.verbose); crate_config.with_verbose(self.build.verbose);
if self.build.example.is_some() { if self.build.example.is_some() {
crate_config.as_example(self.build.example.unwrap()); crate_config.as_example(self.build.example.clone().unwrap());
} }
if self.build.profile.is_some() { if self.build.profile.is_some() {
crate_config.set_profile(self.build.profile.unwrap()); crate_config.set_profile(self.build.profile.clone().unwrap());
} }
if self.build.features.is_some() { if self.build.features.is_some() {
crate_config.set_features(self.build.features.unwrap()); crate_config.set_features(self.build.features.clone().unwrap());
} }
let platform = self let platform = self
@@ -57,6 +57,7 @@ impl Build {
let _config = WebAssetConfigDropGuard::new(); let _config = WebAssetConfigDropGuard::new();
{ {
let mut web_config = crate_config.clone(); let mut web_config = crate_config.clone();
let _gaurd = FullstackWebEnvGuard::new(&self.build);
let web_feature = self.build.client_feature; let web_feature = self.build.client_feature;
let features = &mut web_config.features; let features = &mut web_config.features;
match features { match features {
@@ -65,7 +66,6 @@ impl Build {
} }
None => web_config.features = Some(vec![web_feature]), None => web_config.features = Some(vec![web_feature]),
}; };
let _gaurd = FullstackWebEnvGuard::new(self.build.debug);
crate::builder::build(&crate_config, false, self.build.skip_assets)?; crate::builder::build(&crate_config, false, self.build.skip_assets)?;
} }
{ {
@@ -78,7 +78,7 @@ impl Build {
} }
None => desktop_config.features = Some(vec![desktop_feature]), None => desktop_config.features = Some(vec![desktop_feature]),
}; };
let _gaurd = FullstackServerEnvGuard::new(self.build.debug); let _gaurd = FullstackServerEnvGuard::new(self.build.debug, self.build.release);
crate::builder::build_desktop(&desktop_config, false, self.build.skip_assets)?; crate::builder::build_desktop(&desktop_config, false, self.build.skip_assets)?;
} }
} }
packages/cli/src/server/fullstack/mod.rs
+4 -4
View File
@@ -66,7 +66,7 @@ impl Platform for FullstackPlatform {
} }
None => desktop_config.features = Some(vec![desktop_feature]), None => desktop_config.features = Some(vec![desktop_feature]),
}; };
let _gaurd = FullstackServerEnvGuard::new(&self.serve); let _gaurd = FullstackServerEnvGuard::new(self.serve.debug, self.serve.release);
self.desktop.rebuild(&desktop_config) self.desktop.rebuild(&desktop_config)
}; };
thread_handle thread_handle
@@ -136,11 +136,11 @@ pub(crate) struct FullstackServerEnvGuard {
} }
impl FullstackServerEnvGuard { impl FullstackServerEnvGuard {
pub fn new(debug_mode: bool, release_mode: bool) -> Self { pub fn new(debug: bool, release: bool) -> Self {
Self { Self {
old_rustflags: (!debug_mode).then(|| { old_rustflags: (!debug).then(|| {
let old_rustflags = std::env::var("RUSTFLAGS").unwrap_or_default(); let old_rustflags = std::env::var("RUSTFLAGS").unwrap_or_default();
let debug_assertions = if serve.release { let debug_assertions = if release {
"" ""
} else { } else {
" -C debug-assertions" " -C debug-assertions"