From 172730a13244c25cdcabd5614d4dde1a90e8257b Mon Sep 17 00:00:00 2001 From: John Smith Date: Sat, 29 Jan 2022 13:49:27 -0500 Subject: [PATCH] lock cargo, fix io --- veilid-cli/src/client_api_connection.rs | 2 +- .../src/intf/native/network/protocol/tcp.rs | 2 +- veilid-core/src/xx/async_peek_stream.rs | 6 +- veilid-flutter/rust/Cargo.lock | 101 ++++++++++++++---- veilid-server/src/client_api.rs | 3 +- 5 files changed, 90 insertions(+), 24 deletions(-) diff --git a/veilid-cli/src/client_api_connection.rs b/veilid-cli/src/client_api_connection.rs index 497674d4..33bf1810 100644 --- a/veilid-cli/src/client_api_connection.rs +++ b/veilid-cli/src/client_api_connection.rs @@ -3,7 +3,7 @@ use crate::veilid_client_capnp::*; use async_executors::{AsyncStd, LocalSpawnHandleExt}; use capnp::capability::Promise; use capnp_rpc::{pry, rpc_twoparty_capnp, twoparty, Disconnector, RpcSystem}; -use futures::AsyncReadExt; +use futures::io::AsyncReadExt; use std::cell::RefCell; use std::net::SocketAddr; use std::rc::Rc; diff --git a/veilid-core/src/intf/native/network/protocol/tcp.rs b/veilid-core/src/intf/native/network/protocol/tcp.rs index e995a712..c90e5db1 100644 --- a/veilid-core/src/intf/native/network/protocol/tcp.rs +++ b/veilid-core/src/intf/native/network/protocol/tcp.rs @@ -4,7 +4,7 @@ use crate::network_manager::MAX_MESSAGE_SIZE; use crate::*; use async_std::net::TcpStream; use core::fmt; -use futures_util::{AsyncReadExt, AsyncWriteExt}; +use futures_util::io::{AsyncReadExt, AsyncWriteExt}; pub struct RawTcpNetworkConnection { stream: AsyncPeekStream, diff --git a/veilid-core/src/xx/async_peek_stream.rs b/veilid-core/src/xx/async_peek_stream.rs index c64928f7..975cf162 100644 --- a/veilid-core/src/xx/async_peek_stream.rs +++ b/veilid-core/src/xx/async_peek_stream.rs @@ -1,9 +1,9 @@ use crate::xx::*; use core::pin::Pin; use core::task::{Context, Poll}; -use futures_util::AsyncRead as Read; -use futures_util::AsyncReadExt; -use futures_util::AsyncWrite as Write; +use futures_util::io::AsyncRead as Read; +use futures_util::io::AsyncReadExt; +use futures_util::io::AsyncWrite as Write; use std::io::Result; //////// diff --git a/veilid-flutter/rust/Cargo.lock b/veilid-flutter/rust/Cargo.lock index 76fb7512..af25d6a2 100644 --- a/veilid-flutter/rust/Cargo.lock +++ b/veilid-flutter/rust/Cargo.lock @@ -338,9 +338,9 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] name = "backtrace" -version = "0.3.63" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "321629d8ba6513061f26707241fa9bc89524ff1cd7a915a97ef0c62c666ce1b6" +checksum = "5e121dee8023ce33ab248d9ce1493df03c3b38a659b240096fcbd7048ff9c31f" dependencies = [ "addr2line", "cc", @@ -901,7 +901,7 @@ dependencies = [ "anyhow", "flutter_rust_bridge_macros", "lazy_static", - "parking_lot", + "parking_lot 0.11.2", "threadpool", ] @@ -1083,15 +1083,14 @@ checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4" [[package]] name = "gloo-timers" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f16c88aa13d2656ef20d1c042086b8767bbe2bdb62526894275a1b062161b2e" +checksum = "4d12a7f4e95cfe710f1d624fb1210b7d961a5fb05c4fd942f4feab06e61f590e" dependencies = [ "futures-channel", "futures-core", "js-sys", "wasm-bindgen", - "web-sys", ] [[package]] @@ -1301,7 +1300,7 @@ name = "keyvaluedb-memorydb" version = "0.1.0" dependencies = [ "keyvaluedb", - "parking_lot", + "parking_lot 0.12.0", ] [[package]] @@ -1311,7 +1310,7 @@ dependencies = [ "hex", "keyvaluedb", "log", - "parking_lot", + "parking_lot 0.12.0", "rusqlite", ] @@ -1324,7 +1323,7 @@ dependencies = [ "keyvaluedb", "keyvaluedb-memorydb", "log", - "parking_lot", + "parking_lot 0.11.2", "send_wrapper", "wasm-bindgen", "web-sys", @@ -1360,9 +1359,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.115" +version = "0.2.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a8d982fa7a96a000f6ec4cfe966de9703eccde29750df2bb8949da91b0e818d" +checksum = "565dbd88872dbe4cc8a46e527f26483c1d1f7afa6b884a3bd6cd893d4f98da74" [[package]] name = "libsqlite3-sys" @@ -1383,9 +1382,9 @@ checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" [[package]] name = "lock_api" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109" +checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b" dependencies = [ "scopeguard", ] @@ -1771,7 +1770,17 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", "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]] @@ -1788,6 +1797,19 @@ dependencies = [ "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]] name = "paste" version = "1.0.6" @@ -2512,9 +2534,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.16.0" +version = "1.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95e99d373042c30406d317cfc5bfad7b5d604bdd31dab72cf8739abebaa64aee" +checksum = "0c27a64b625de6d309e8c57716ba93021dccf1b3b5c97edd6d3dd2d2135afc0a" dependencies = [ "bytes", "memchr", @@ -2690,7 +2712,7 @@ dependencies = [ "no-std-net", "num_cpus", "once_cell", - "parking_lot", + "parking_lot 0.12.0", "rand 0.7.3", "rtnetlink", "rusqlite", @@ -2726,7 +2748,7 @@ dependencies = [ "cfg-if 1.0.0", "flutter_rust_bridge", "log", - "parking_lot", + "parking_lot 0.12.0", "veilid-core", ] @@ -2942,6 +2964,49 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" 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]] name = "ws_stream_wasm" version = "0.7.3" diff --git a/veilid-server/src/client_api.rs b/veilid-server/src/client_api.rs index bfccdd20..227bc891 100644 --- a/veilid-server/src/client_api.rs +++ b/veilid-server/src/client_api.rs @@ -4,8 +4,9 @@ use async_std::prelude::FutureExt; use capnp::capability::Promise; use capnp_rpc::{pry, rpc_twoparty_capnp, twoparty, RpcSystem}; use failure::*; +use futures::io::AsyncReadExt; use futures::FutureExt as FuturesFutureExt; -use futures::{AsyncReadExt, StreamExt}; +use futures::StreamExt; use log::*; use std::cell::RefCell; use std::collections::HashMap;