diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 8d272ae89..35eb1ddfb 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -2,6 +2,5 @@ - \ No newline at end of file diff --git a/fyrox-impl/src/engine/executor.rs b/fyrox-impl/src/engine/executor.rs index 7ae2091e3..49cdd3615 100644 --- a/fyrox-impl/src/engine/executor.rs +++ b/fyrox-impl/src/engine/executor.rs @@ -23,11 +23,11 @@ use std::{ sync::Arc, }; -#[derive(Parser, Debug)] +#[derive(Parser, Debug, Default)] #[clap(author, version, about, long_about = None)] struct Args { - #[clap(short, long, default_value = "")] - override_scene: String, + #[clap(short, long, default_value = None)] + override_scene: Option, } /// Executor is a small wrapper that manages plugins and scripts for your game. @@ -140,17 +140,9 @@ impl Executor { let event_loop = self.event_loop; let headless = self.headless; - let args = Args::parse(); + let args = Args::try_parse().unwrap_or_default(); - engine.enable_plugins( - if args.override_scene.is_empty() { - None - } else { - Some(&args.override_scene) - }, - true, - Some(&event_loop), - ); + engine.enable_plugins(args.override_scene.as_deref(), true, Some(&event_loop)); let mut previous = Instant::now(); let fixed_time_step = 1.0 / self.desired_update_rate; diff --git a/project-manager/src/project.rs b/project-manager/src/project.rs index 5d79fc95a..ddd82aa88 100644 --- a/project-manager/src/project.rs +++ b/project-manager/src/project.rs @@ -253,7 +253,7 @@ impl ProjectWizard { self.vcs.as_str(), true, ); - let mut manifest_path = self + let manifest_path = self .path .join(&self.name) .join("Cargo.toml")