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

lock cargo, fix io

Browse Source
This commit is contained in:
John Smith 2022-01-29 13:49:27 -05:00
parent d709e7d484
commit 172730a132
5 changed files with 90 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
veilid-cli/src/client_api_connection.rs
View File

@ -3,7 +3,7 @@ use crate::veilid_client_capnp::*;
use async_executors::{AsyncStd, LocalSpawnHandleExt}; use async_executors::{AsyncStd, LocalSpawnHandleExt};
use capnp::capability::Promise; use capnp::capability::Promise;
use capnp_rpc::{pry, rpc_twoparty_capnp, twoparty, Disconnector, RpcSystem}; use capnp_rpc::{pry, rpc_twoparty_capnp, twoparty, Disconnector, RpcSystem};
use futures::AsyncReadExt; use futures::io::AsyncReadExt;
use std::cell::RefCell; use std::cell::RefCell;
use std::net::SocketAddr; use std::net::SocketAddr;
use std::rc::Rc; use std::rc::Rc;

2
veilid-core/src/intf/native/network/protocol/tcp.rs
View File

@ -4,7 +4,7 @@ use crate::network_manager::MAX_MESSAGE_SIZE;
use crate::*; use crate::*;
use async_std::net::TcpStream; use async_std::net::TcpStream;
use core::fmt; use core::fmt;
use futures_util::{AsyncReadExt, AsyncWriteExt}; use futures_util::io::{AsyncReadExt, AsyncWriteExt};
pub struct RawTcpNetworkConnection { pub struct RawTcpNetworkConnection {
stream: AsyncPeekStream, stream: AsyncPeekStream,

6
veilid-core/src/xx/async_peek_stream.rs
View File

@ -1,9 +1,9 @@
use crate::xx::*; use crate::xx::*;
use core::pin::Pin; use core::pin::Pin;
use core::task::{Context, Poll}; use core::task::{Context, Poll};
use futures_util::AsyncRead as Read; use futures_util::io::AsyncRead as Read;
use futures_util::AsyncReadExt; use futures_util::io::AsyncReadExt;
use futures_util::AsyncWrite as Write; use futures_util::io::AsyncWrite as Write;
use std::io::Result; use std::io::Result;
//////// ////////

101
veilid-flutter/rust/Cargo.lock generated
View File

@ -338,9 +338,9 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
[[package]] [[package]]
name = "backtrace" name = "backtrace"
version = "0.3.63" version = "0.3.64"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "321629d8ba6513061f26707241fa9bc89524ff1cd7a915a97ef0c62c666ce1b6" checksum = "5e121dee8023ce33ab248d9ce1493df03c3b38a659b240096fcbd7048ff9c31f"
dependencies = [ dependencies = [
"addr2line", "addr2line",
"cc", "cc",
@ -901,7 +901,7 @@ dependencies = [
"anyhow", "anyhow",
"flutter_rust_bridge_macros", "flutter_rust_bridge_macros",
"lazy_static", "lazy_static",
"parking_lot", "parking_lot 0.11.2",
"threadpool", "threadpool",
] ]
@ -1083,15 +1083,14 @@ checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4"
[[package]] [[package]]
name = "gloo-timers" name = "gloo-timers"
version = "0.2.2" version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6f16c88aa13d2656ef20d1c042086b8767bbe2bdb62526894275a1b062161b2e" checksum = "4d12a7f4e95cfe710f1d624fb1210b7d961a5fb05c4fd942f4feab06e61f590e"
dependencies = [ dependencies = [
"futures-channel", "futures-channel",
"futures-core", "futures-core",
"js-sys", "js-sys",
"wasm-bindgen", "wasm-bindgen",
"web-sys",
] ]
[[package]] [[package]]
@ -1301,7 +1300,7 @@ name = "keyvaluedb-memorydb"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"keyvaluedb", "keyvaluedb",
"parking_lot", "parking_lot 0.12.0",
] ]
[[package]] [[package]]
@ -1311,7 +1310,7 @@ dependencies = [
"hex", "hex",
"keyvaluedb", "keyvaluedb",
"log", "log",
"parking_lot", "parking_lot 0.12.0",
"rusqlite", "rusqlite",
] ]
@ -1324,7 +1323,7 @@ dependencies = [
"keyvaluedb", "keyvaluedb",
"keyvaluedb-memorydb", "keyvaluedb-memorydb",
"log", "log",
"parking_lot", "parking_lot 0.11.2",
"send_wrapper", "send_wrapper",
"wasm-bindgen", "wasm-bindgen",
"web-sys", "web-sys",
@ -1360,9 +1359,9 @@ dependencies = [
[[package]] [[package]]
name = "libc" name = "libc"
version = "0.2.115" version = "0.2.116"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0a8d982fa7a96a000f6ec4cfe966de9703eccde29750df2bb8949da91b0e818d" checksum = "565dbd88872dbe4cc8a46e527f26483c1d1f7afa6b884a3bd6cd893d4f98da74"
[[package]] [[package]]
name = "libsqlite3-sys" name = "libsqlite3-sys"
@ -1383,9 +1382,9 @@ checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3"
[[package]] [[package]]
name = "lock_api" name = "lock_api"
version = "0.4.5" version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109" checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b"
dependencies = [ dependencies = [
"scopeguard", "scopeguard",
] ]
@ -1771,7 +1770,17 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
dependencies = [ dependencies = [
"instant", "instant",
"lock_api", "lock_api",
"parking_lot_core", "parking_lot_core 0.8.5",
]
[[package]]
name = "parking_lot"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58"
dependencies = [
"lock_api",
"parking_lot_core 0.9.0",
] ]
[[package]] [[package]]
@ -1788,6 +1797,19 @@ dependencies = [
"winapi", "winapi",
] ]
[[package]]
name = "parking_lot_core"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b2f4f894f3865f6c0e02810fc597300f34dc2510f66400da262d8ae10e75767d"
dependencies = [
"cfg-if 1.0.0",
"libc",
"redox_syscall",
"smallvec",
"windows-sys",
]
[[package]] [[package]]
name = "paste" name = "paste"
version = "1.0.6" version = "1.0.6"
@ -2512,9 +2534,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
[[package]] [[package]]
name = "tokio" name = "tokio"
version = "1.16.0" version = "1.16.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95e99d373042c30406d317cfc5bfad7b5d604bdd31dab72cf8739abebaa64aee" checksum = "0c27a64b625de6d309e8c57716ba93021dccf1b3b5c97edd6d3dd2d2135afc0a"
dependencies = [ dependencies = [
"bytes", "bytes",
"memchr", "memchr",
@ -2690,7 +2712,7 @@ dependencies = [
"no-std-net", "no-std-net",
"num_cpus", "num_cpus",
"once_cell", "once_cell",
"parking_lot", "parking_lot 0.12.0",
"rand 0.7.3", "rand 0.7.3",
"rtnetlink", "rtnetlink",
"rusqlite", "rusqlite",
@ -2726,7 +2748,7 @@ dependencies = [
"cfg-if 1.0.0", "cfg-if 1.0.0",
"flutter_rust_bridge", "flutter_rust_bridge",
"log", "log",
"parking_lot", "parking_lot 0.12.0",
"veilid-core", "veilid-core",
] ]
@ -2942,6 +2964,49 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
name = "windows-sys"
version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ceb069ac8b2117d36924190469735767f0990833935ab430155e71a44bafe148"
dependencies = [
"windows_aarch64_msvc",
"windows_i686_gnu",
"windows_i686_msvc",
"windows_x86_64_gnu",
"windows_x86_64_msvc",
]
[[package]]
name = "windows_aarch64_msvc"
version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3d027175d00b01e0cbeb97d6ab6ebe03b12330a35786cbaca5252b1c4bf5d9b"
[[package]]
name = "windows_i686_gnu"
version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8793f59f7b8e8b01eda1a652b2697d87b93097198ae85f823b969ca5b89bba58"
[[package]]
name = "windows_i686_msvc"
version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8602f6c418b67024be2996c512f5f995de3ba417f4c75af68401ab8756796ae4"
[[package]]
name = "windows_x86_64_gnu"
version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f3d615f419543e0bd7d2b3323af0d86ff19cbc4f816e6453f36a2c2ce889c354"
[[package]]
name = "windows_x86_64_msvc"
version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "11d95421d9ed3672c280884da53201a5c46b7b2765ca6faf34b0d71cf34a3561"
[[package]] [[package]]
name = "ws_stream_wasm" name = "ws_stream_wasm"
version = "0.7.3" version = "0.7.3"

3
veilid-server/src/client_api.rs
View File

@ -4,8 +4,9 @@ use async_std::prelude::FutureExt;
use capnp::capability::Promise; use capnp::capability::Promise;
use capnp_rpc::{pry, rpc_twoparty_capnp, twoparty, RpcSystem}; use capnp_rpc::{pry, rpc_twoparty_capnp, twoparty, RpcSystem};
use failure::*; use failure::*;
use futures::io::AsyncReadExt;
use futures::FutureExt as FuturesFutureExt; use futures::FutureExt as FuturesFutureExt;
use futures::{AsyncReadExt, StreamExt}; use futures::StreamExt;
use log::*; use log::*;
use std::cell::RefCell; use std::cell::RefCell;
use std::collections::HashMap; use std::collections::HashMap;