Skip to content

Commit 265a466

Browse files
committed
fix: apk build error
1 parent 7c6c426 commit 265a466

File tree

5 files changed

+26
-32
lines changed

5 files changed

+26
-32
lines changed

rust/src/api/app_scan.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ fn walk_entry(
5353
path: &Path,
5454
remain_walk_depth: Option<usize>,
5555
) -> Result<Option<Vec<CommonAppScannedEntry>>> {
56-
Err(err_msg!("unsupported platform"))
56+
use anyhow::anyhow;
57+
Err(anyhow!("unsupported platform"))
5758
}
5859

5960
#[cfg(target_os = "windows")]

rust/src/api/process_runner.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,13 +113,15 @@ pub fn process_runner(
113113
monitor_path: String,
114114
working_dir: String,
115115
sleep_count: i32,
116-
sleep_millis: u64,
117-
) -> Result<(i64, i64, bool)> {
118-
Err(err_msg!("unsupported platform"))
116+
sleep_duration: chrono::Duration,
117+
) -> Result<(DateTime<Utc>, DateTime<Utc>, bool)> {
118+
use anyhow::anyhow;
119+
Err(anyhow!("unsupported platform"))
119120
}
120121

121122
#[cfg(target_os = "linux")]
122123
fn wait_for_process_exit(pid: u32) -> Result<i32> {
124+
use anyhow::anyhow;
123125
use libc::{c_int, pid_t, WEXITSTATUS, WIFEXITED, WIFSIGNALED, WTERMSIG};
124126

125127
extern "C" {
@@ -145,7 +147,7 @@ fn wait_for_process_exit(pid: u32) -> Result<i32> {
145147
signal
146148
))
147149
} else {
148-
Err(err_msg!("Unknown error"))
150+
Err(anyhow!("Unknown error"))
149151
}
150152
}
151153

rust/src/api/system_proxy.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@ pub fn get_system_proxy() -> anyhow::Result<(bool, String, u16)> {
77

88
#[cfg(not(any(target_os = "windows", target_os = "linux", target_os = "macos")))]
99
pub fn get_system_proxy() -> anyhow::Result<(bool, String, u16)> {
10-
Err(err_msg!("Unsupported platform"))
10+
use anyhow::anyhow;
11+
Err(anyhow!("Unsupported platform"))
1112
}

rust/src/api/win_icon.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ mod wrapper {
1717
use anyhow::Result;
1818
use image::RgbaImage;
1919

20-
fn get_images_from_exe(_executable_path: &str) -> Result<Vec<RgbaImage>> {
20+
pub fn get_images_from_exe(_executable_path: &str) -> Result<Vec<RgbaImage>> {
2121
Ok(Vec::new())
2222
}
2323
}

rust/src/frb_generated.rs

Lines changed: 15 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,9 @@
2525

2626
// Section: imports
2727

28-
use flutter_rust_bridge::{
29-
for_generated::{
30-
byteorder::{NativeEndian, ReadBytesExt, WriteBytesExt},
31-
transform_result_dco, Lifetimeable, Lockable,
32-
},
33-
Handler, IntoIntoDart,
34-
};
28+
use flutter_rust_bridge::for_generated::byteorder::{NativeEndian, ReadBytesExt, WriteBytesExt};
29+
use flutter_rust_bridge::for_generated::{transform_result_dco, Lifetimeable, Lockable};
30+
use flutter_rust_bridge::{Handler, IntoIntoDart};
3531

3632
// Section: boilerplate
3733

@@ -817,15 +813,12 @@ mod io {
817813

818814
// Section: imports
819815

820-
use flutter_rust_bridge::{
821-
for_generated::{
822-
byteorder::{NativeEndian, ReadBytesExt, WriteBytesExt},
823-
transform_result_dco, Lifetimeable, Lockable,
824-
},
825-
Handler, IntoIntoDart,
826-
};
827-
828816
use super::*;
817+
use flutter_rust_bridge::for_generated::byteorder::{
818+
NativeEndian, ReadBytesExt, WriteBytesExt,
819+
};
820+
use flutter_rust_bridge::for_generated::{transform_result_dco, Lifetimeable, Lockable};
821+
use flutter_rust_bridge::{Handler, IntoIntoDart};
829822

830823
// Section: boilerplate
831824

@@ -842,17 +835,14 @@ mod web {
842835

843836
// Section: imports
844837

845-
use flutter_rust_bridge::{
846-
for_generated::{
847-
byteorder::{NativeEndian, ReadBytesExt, WriteBytesExt},
848-
transform_result_dco, wasm_bindgen,
849-
wasm_bindgen::prelude::*,
850-
Lifetimeable, Lockable,
851-
},
852-
Handler, IntoIntoDart,
853-
};
854-
855838
use super::*;
839+
use flutter_rust_bridge::for_generated::byteorder::{
840+
NativeEndian, ReadBytesExt, WriteBytesExt,
841+
};
842+
use flutter_rust_bridge::for_generated::wasm_bindgen;
843+
use flutter_rust_bridge::for_generated::wasm_bindgen::prelude::*;
844+
use flutter_rust_bridge::for_generated::{transform_result_dco, Lifetimeable, Lockable};
845+
use flutter_rust_bridge::{Handler, IntoIntoDart};
856846

857847
// Section: boilerplate
858848

0 commit comments

Comments
 (0)