Git-Mirrors/veilid
1
0
Fork 0
mirror of https://gitlab.com/veilid/veilid.git synced 2024-10-01 01:26:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'salvatoret/clean-up-warnings' into 'main'

Browse Source 
Clean up the compile-time warnings

See merge request veilid/veilid!247
This commit is contained in:
Christien Rioux 2024-01-19 18:53:31 +00:00
commit 3f86801ecd
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
veilid-core/src/network_manager/mod.rs
View File

@ -38,7 +38,7 @@ use hashlink::LruCache;
#[cfg(not(target_arch = "wasm32"))] #[cfg(not(target_arch = "wasm32"))]
use native::*; use native::*;
#[cfg(not(target_arch = "wasm32"))] #[cfg(not(target_arch = "wasm32"))]
pub use native::{LOCAL_NETWORK_CAPABILITIES, MAX_CAPABILITIES, PUBLIC_INTERNET_CAPABILITIES}; pub use native::{MAX_CAPABILITIES, PUBLIC_INTERNET_CAPABILITIES};
use routing_table::*; use routing_table::*;
use rpc_processor::*; use rpc_processor::*;
use storage_manager::*; use storage_manager::*;

2
veilid-flutter/rust/src/dart_isolate_wrapper.rs
View File

@ -1,5 +1,5 @@
use crate::tools::*; use crate::tools::*;
pub use allo_isolate::ffi::DartCObject;
pub use allo_isolate::IntoDart; pub use allo_isolate::IntoDart;
use allo_isolate::Isolate; use allo_isolate::Isolate;
use core::fmt::Debug; use core::fmt::Debug;

8
veilid-flutter/rust/src/tools.rs
View File

@ -16,15 +16,15 @@ cfg_if! {
pub use async_std::future::timeout; pub use async_std::future::timeout;
} else if #[cfg(feature="rt-tokio")] { } else if #[cfg(feature="rt-tokio")] {
pub use tokio::task::JoinHandle; pub use tokio::task::JoinHandle;
pub use tokio::net::TcpStream;
//pub use tokio::time::error::Elapsed as TimeoutError; //pub use tokio::time::error::Elapsed as TimeoutError;
pub use tokio::sync::Mutex as AsyncMutex;
pub fn spawn<F: Future<Output = T> + Send + 'static, T: Send + 'static>(f: F) -> JoinHandle<T> { pub fn spawn<F: Future<Output = T> + Send + 'static, T: Send + 'static>(f: F) -> JoinHandle<T> {
GLOBAL_RUNTIME.spawn(f) GLOBAL_RUNTIME.spawn(f)
} }
pub use tokio::time::sleep;
pub use tokio::time::timeout;
lazy_static::lazy_static! { lazy_static::lazy_static! {
static ref GLOBAL_RUNTIME: tokio::runtime::Runtime = tokio::runtime::Runtime::new().unwrap(); static ref GLOBAL_RUNTIME: tokio::runtime::Runtime = tokio::runtime::Runtime::new().unwrap();
} }

2
veilid-server/src/tools.rs
View File

@ -1,5 +1,5 @@
pub use cfg_if::*; pub use cfg_if::*;
pub use color_eyre::eyre::{bail, ensure, eyre, Result as EyreResult, WrapErr}; pub use color_eyre::eyre::{bail, eyre, Result as EyreResult, WrapErr};
pub use core::future::Future; pub use core::future::Future;
pub use parking_lot::*; pub use parking_lot::*;
pub use tracing::*; pub use tracing::*;