Fix build

Author: bbqsrc

src/cargo.rs

@@ -86,9 +86,9 @@ fn clang_lib_path(ndk_home: &Path) -> PathBuf {
         .join("linux")
 }
 
-const CARGO_NDK_SYSROOT_PATH_KEY: &'static str = "CARGO_NDK_SYSROOT_PATH";
-const CARGO_NDK_SYSROOT_TARGET_KEY: &'static str = "CARGO_NDK_SYSROOT_TARGET";
-const CARGO_NDK_SYSROOT_LIBS_PATH_KEY: &'static str = "CARGO_NDK_SYSROOT_LIBS_PATH";
+const CARGO_NDK_SYSROOT_PATH_KEY: &str = "CARGO_NDK_SYSROOT_PATH";
+const CARGO_NDK_SYSROOT_TARGET_KEY: &str = "CARGO_NDK_SYSROOT_TARGET";
+const CARGO_NDK_SYSROOT_LIBS_PATH_KEY: &str = "CARGO_NDK_SYSROOT_LIBS_PATH";
 
 pub(crate) fn build_env(
     triple: &str,

src/cli/env.rs

@@ -32,7 +32,7 @@ struct EnvArgs {
 }
 
 pub fn run(args: Vec<String>) -> anyhow::Result<()> {
-    let (mut shell, args) = init::<EnvArgs>(args)?;
+    let (mut shell, args) = init(args)?;
     let args = EnvArgs::try_parse_from(args)?;
 
     let (ndk_home, _ndk_detection_method) = match derive_ndk_path(&mut shell) {

src/cli/mod.rs

@@ -370,7 +370,7 @@ impl StringVecExt for Vec<String> {
     }
 }
 
-pub(self) fn init<T: Parser + Clone>(args: Vec<String>) -> anyhow::Result<(Shell, Vec<String>)> {
+fn init(args: Vec<String>) -> anyhow::Result<(Shell, Vec<String>)> {
     if std::env::var_os("CARGO_NDK_NO_PANIC_HOOK").is_none() {
         std::panic::set_hook(Box::new(panic_hook));
     }
@@ -429,7 +429,7 @@ pub(self) fn init<T: Parser + Clone>(args: Vec<String>) -> anyhow::Result<(Shell
 
 pub fn run(args: Vec<String>) -> anyhow::Result<()> {
     // Check for help/version before parsing to avoid required arg errors
-    let (mut shell, args) = init::<BuildArgs>(args)?;
+    let (mut shell, args) = init(args)?;
 
     let args = match parse_mixed_args::<BuildArgs>(args) {
         Ok(args) => args,

src/cli/runner.rs

@@ -79,7 +79,7 @@ pub fn run(args: Vec<String>) -> anyhow::Result<()> {
     })?;
 
     let push_status = Command::new(&adb_path)
-        .with_serial(adb_serial.as_deref())
+        .with_serial(adb_serial)
         .arg("push")
         .arg(&args.executable)
         .arg(&device_path)
@@ -97,7 +97,7 @@ pub fn run(args: Vec<String>) -> anyhow::Result<()> {
 
     // Make binary executable
     let chmod_status = Command::new(&adb_path)
-        .with_serial(adb_serial.as_deref())
+        .with_serial(adb_serial)
         .arg("shell")
         .arg("chmod")
         .arg("755")
@@ -117,7 +117,7 @@ pub fn run(args: Vec<String>) -> anyhow::Result<()> {
     };
 
     let run_status = Command::new(&adb_path)
-        .with_serial(adb_serial.as_deref())
+        .with_serial(adb_serial)
         .arg("shell")
         .arg(&device_path)
         .arg(verbosity_arg)
@@ -126,7 +126,7 @@ pub fn run(args: Vec<String>) -> anyhow::Result<()> {
 
     // Clean up the binary from device
     let _ = Command::new(&adb_path)
-        .with_serial(adb_serial.as_deref())
+        .with_serial(adb_serial)
         .arg("shell")
         .arg("rm")
         .arg(&device_path)

src/cli/test.rs

@@ -51,7 +51,7 @@ impl HasCargoArgs for TestArgs {
 pub fn run(args: Vec<String>) -> anyhow::Result<()> {
     // Check for help/version before parsing to avoid required arg errors
     let valid_args = args.split(|x| x == "--").next().unwrap_or(&args).to_vec();
-    let (mut shell, _) = init::<TestArgs>(valid_args)?;
+    let (mut shell, _) = init(valid_args)?;
 
     let mut args = match TestArgs::try_parse_from(&args) {
         Ok(args) => args,