liz/veilid
1
0
Fork 0
Code Pull Requests Packages Releases Activity

fix rust flutter

Browse Source
This commit is contained in:
John Smith
2022-02-01 13:07:39 -05:00
parent 65dabd09c7
commit 4bfa72f2db
4 changed files with 65 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
veilid-flutter/rust/src/api.rs
View File

@@ -437,6 +437,13 @@ pub enum VeilidLogLevel {
Debug,
Trace,
}
impl Default for VeilidLogLevel {
fn default() -> Self {
Self::Info
}
}
impl VeilidLogLevel {
fn from_core(level: veilid_core::VeilidLogLevel) -> Self {
match level {
@@ -448,13 +455,13 @@ impl VeilidLogLevel {
}
}
fn to_config_log_level(&self) -> VeilidConfigLogLevel {
fn to_config_log_level(&self) -> veilid_core::VeilidConfigLogLevel {
match self {
Self::Error => VeilidConfigLogLevel::Error,
Self::Warn => VeilidConfigLogLevel::Warn,
Self::Info => VeilidConfigLogLevel::Info,
Self::Debug => VeilidConfigLogLevel::Debug,
Self::Trace => VeilidConfigLogLevel::Trace,
Self::Error => veilid_core::VeilidConfigLogLevel::Error,
Self::Warn => veilid_core::VeilidConfigLogLevel::Warn,
Self::Info => veilid_core::VeilidConfigLogLevel::Info,
Self::Debug => veilid_core::VeilidConfigLogLevel::Debug,
Self::Trace => veilid_core::VeilidConfigLogLevel::Trace,
}
}
}
@@ -543,7 +550,7 @@ pub fn get_veilid_state() -> Result<VeilidState> {
// xxx api functions
pub fn change_api_log_level(level: VeilidLogLevel) -> Result<()> {
pub fn change_api_log_level(log_level: VeilidLogLevel) -> Result<()> {
async_std::task::block_on(async {
let veilid_api = get_veilid_api().await?;
veilid_api

24
veilid-flutter/rust/src/bridge_generated.rs
View File

@@ -41,7 +41,7 @@ pub extern "C" fn wire_get_veilid_state(port_: i64) {
}
#[no_mangle]
pub extern "C" fn wire_change_api_log_level(port_: i64, level: i32) {
pub extern "C" fn wire_change_api_log_level(port_: i64, log_level: i32) {
FLUTTER_RUST_BRIDGE_HANDLER.wrap(
WrapInfo {
debug_name: "change_api_log_level",
@@ -49,8 +49,8 @@ pub extern "C" fn wire_change_api_log_level(port_: i64, level: i32) {
mode: FfiCallMode::Normal,
},
move || {
let api_level = level.wire2api();
move |task_callback| change_api_log_level(api_level)
let api_log_level = log_level.wire2api();
move |task_callback| change_api_log_level(api_log_level)
},
)
}
@@ -579,21 +579,3 @@ pub extern "C" fn free_WireSyncReturnStruct(val: support::WireSyncReturnStruct)
let _ = support::vec_from_leak_ptr(val.ptr, val.len);
}
}
// ----------- DUMMY CODE FOR BINDGEN ----------
// copied from: allo-isolate
pub type DartPort = i64;
pub type DartPostCObjectFnType = unsafe extern "C" fn(port_id: DartPort, message: *mut std::ffi::c_void) -> bool;
#[no_mangle] pub unsafe extern "C" fn store_dart_post_cobject(ptr: DartPostCObjectFnType) { panic!("dummy code") }
// copied from: frb_rust::support.rs
#[repr(C)]
pub struct WireSyncReturnStruct {
pub ptr: *mut u8,
pub len: i32,
pub success: bool,
}
// ---------------------------------------------