From 8115f6dcc8046cadeb05d339c66d576f249bebd8 Mon Sep 17 00:00:00 2001 From: Syed Ahkam Date: Wed, 23 Aug 2023 03:14:28 +0530 Subject: [PATCH] chore: run cargo fmt --- src/commands/create.rs | 9 +++++++-- src/commands/launch.rs | 2 +- src/commands/mod.rs | 4 ++-- src/lib.rs | 9 +++++++-- src/main.rs | 4 ++-- src/utils.rs | 1 - 6 files changed, 19 insertions(+), 10 deletions(-) diff --git a/src/commands/create.rs b/src/commands/create.rs index be99d46..5187042 100644 --- a/src/commands/create.rs +++ b/src/commands/create.rs @@ -3,7 +3,7 @@ use clap::Parser; use std::{collections::BTreeMap, path::PathBuf}; -use crate::utils::{prompt_for_input, parse_package_id}; +use crate::utils::{parse_package_id, prompt_for_input}; const DEFAULT_COMPILE_SDK_VERSION: &str = "33"; const DEFAULT_TARGET_SDK_VERSION: &str = "33"; @@ -78,7 +78,12 @@ fn post_create(args: Create) -> Result<()> { let dest = args.dest.clone().unwrap(); android_cli::create_local_properties_file(&dest, &args.sdk_path.unwrap())?; - android_cli::create_dot_android(&dest, args.project_name.unwrap(), args.package_id.unwrap(), None)?; + android_cli::create_dot_android( + &dest, + args.project_name.unwrap(), + args.package_id.unwrap(), + None, + )?; Ok(()) } diff --git a/src/commands/launch.rs b/src/commands/launch.rs index 043e064..b4aed2d 100644 --- a/src/commands/launch.rs +++ b/src/commands/launch.rs @@ -1,5 +1,5 @@ +use anyhow::{anyhow, bail, Result}; use clap::Parser; -use anyhow::{Result, bail, anyhow}; #[derive(Parser, Debug)] pub struct Launch {} diff --git a/src/commands/mod.rs b/src/commands/mod.rs index cd392f4..e828985 100644 --- a/src/commands/mod.rs +++ b/src/commands/mod.rs @@ -1,7 +1,7 @@ pub mod build; pub mod create; +pub mod devices; pub mod install; -pub mod run; pub mod launch; -pub mod devices; pub mod link; +pub mod run; diff --git a/src/lib.rs b/src/lib.rs index 1d65d95..e12fd9c 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -83,13 +83,18 @@ pub fn invoke_adb_command(args: &[&str]) -> Result { Ok(run.status()?) } -pub fn create_dot_android(dest: &Path, project_name: String, package_id: String, main_activity_name: Option) -> Result<()> { +pub fn create_dot_android( + dest: &Path, + project_name: String, + package_id: String, + main_activity_name: Option, +) -> Result<()> { // Construct the structure let dot_android = DotAndroid { package_id, project_name, gen_at_version: VERSION.to_owned(), - main_activity_name: main_activity_name.unwrap_or(DEFAULT_MAIN_ACTIVITY.to_owned()) + main_activity_name: main_activity_name.unwrap_or(DEFAULT_MAIN_ACTIVITY.to_owned()), }; // Serialize into Ron diff --git a/src/main.rs b/src/main.rs index 1404d0e..f02aeec 100644 --- a/src/main.rs +++ b/src/main.rs @@ -21,7 +21,7 @@ enum SubCommand { Run(commands::run::Run), Launch(commands::launch::Launch), Devices(commands::devices::Devices), - Link(commands::link::Link) + Link(commands::link::Link), } fn main() { @@ -37,7 +37,7 @@ fn main() { SubCommand::Run(args) => commands::run::handle(args), SubCommand::Launch(args) => commands::launch::handle(args), SubCommand::Devices(args) => commands::devices::handle(args), - SubCommand::Link(args) => commands::link::handle(args) + SubCommand::Link(args) => commands::link::handle(args), }; if result.is_err() { diff --git a/src/utils.rs b/src/utils.rs index 3cc2838..0e3aaa1 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -35,7 +35,6 @@ pub fn parse_package_id(package_id: String) -> Result<(String, String, String)> anyhow::Ok((domain.to_owned(), org.to_owned(), name.to_owned())) } - pub fn safe_name(name: String) -> String { name.to_lowercase().replace(" ", "_") }