cargo fmt
This commit is contained in:
parent
842990e559
commit
cd81427228
|
@ -860,6 +860,7 @@ dependencies = [
|
||||||
"sha-1",
|
"sha-1",
|
||||||
"std_or_web",
|
"std_or_web",
|
||||||
"steven_shared",
|
"steven_shared",
|
||||||
|
"tokio",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|
|
@ -36,11 +36,11 @@ use std::default;
|
||||||
use std::fmt;
|
use std::fmt;
|
||||||
use std::io;
|
use std::io;
|
||||||
use std::io::{Read, Write};
|
use std::io::{Read, Write};
|
||||||
use tokio::net::TcpStream;
|
|
||||||
use tokio::io::{AsyncWriteExt, AsyncReadExt, AsyncWrite, AsyncRead, ReadBuf};
|
|
||||||
use std::sync::atomic::{AtomicBool, AtomicI32, Ordering};
|
|
||||||
use std::pin::Pin;
|
use std::pin::Pin;
|
||||||
|
use std::sync::atomic::{AtomicBool, AtomicI32, Ordering};
|
||||||
use std::task::{Context, Poll};
|
use std::task::{Context, Poll};
|
||||||
|
use tokio::io::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt, ReadBuf};
|
||||||
|
use tokio::net::TcpStream;
|
||||||
|
|
||||||
pub const SUPPORTED_PROTOCOLS: [i32; 25] = [
|
pub const SUPPORTED_PROTOCOLS: [i32; 25] = [
|
||||||
756, 754, 753, 751, 736, 735, 578, 575, 498, 490, 485, 480, 477, 452, 451, 404, 340, 316, 315,
|
756, 754, 753, 751, 736, 735, 578, 575, 498, 490, 485, 480, 477, 452, 451, 404, 340, 316, 315,
|
||||||
|
@ -1044,7 +1044,7 @@ pub struct Conn {
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Conn {
|
impl Conn {
|
||||||
pub /*TODO async*/ fn new(target: &str, protocol_version: i32) -> Result<Conn, Error> {
|
pub fn new(target: &str, protocol_version: i32) -> Result<Conn, Error> {
|
||||||
CURRENT_PROTOCOL_VERSION.store(protocol_version, Ordering::Relaxed);
|
CURRENT_PROTOCOL_VERSION.store(protocol_version, Ordering::Relaxed);
|
||||||
|
|
||||||
// TODO SRV record support
|
// TODO SRV record support
|
||||||
|
@ -1476,7 +1476,11 @@ pub struct StatusPlayer {
|
||||||
// I'm using tokio's Async{Read,Write}, maybe instead for runtime agnostic use https://crates.io/crates/futures?
|
// I'm using tokio's Async{Read,Write}, maybe instead for runtime agnostic use https://crates.io/crates/futures?
|
||||||
// Or are these the right traits? Ext? Something else? Just need to wrap enough to let use as async, encryption pipeline
|
// Or are these the right traits? Ext? Something else? Just need to wrap enough to let use as async, encryption pipeline
|
||||||
impl AsyncRead for Conn {
|
impl AsyncRead for Conn {
|
||||||
fn poll_read(mut self: Pin<&mut Self>, cx: &mut Context<'_>, buf: &mut ReadBuf<'_>) -> Poll<io::Result<()>> {
|
fn poll_read(
|
||||||
|
mut self: Pin<&mut Self>,
|
||||||
|
cx: &mut Context<'_>,
|
||||||
|
buf: &mut ReadBuf<'_>,
|
||||||
|
) -> Poll<io::Result<()>> {
|
||||||
unimplemented!()
|
unimplemented!()
|
||||||
/* TODO
|
/* TODO
|
||||||
match self.cipher.as_mut() {
|
match self.cipher.as_mut() {
|
||||||
|
@ -1493,7 +1497,11 @@ impl AsyncRead for Conn {
|
||||||
}
|
}
|
||||||
|
|
||||||
impl AsyncWrite for Conn {
|
impl AsyncWrite for Conn {
|
||||||
fn poll_write(self: Pin<&mut Self>, cx: &mut Context<'_>, buf: &[u8]) -> Poll<io::Result<usize>> {
|
fn poll_write(
|
||||||
|
self: Pin<&mut Self>,
|
||||||
|
cx: &mut Context<'_>,
|
||||||
|
buf: &[u8],
|
||||||
|
) -> Poll<io::Result<usize>> {
|
||||||
unimplemented!()
|
unimplemented!()
|
||||||
/* TODO
|
/* TODO
|
||||||
match self.cipher.as_mut() {
|
match self.cipher.as_mut() {
|
||||||
|
@ -1520,7 +1528,11 @@ impl AsyncWrite for Conn {
|
||||||
unimplemented!()
|
unimplemented!()
|
||||||
}
|
}
|
||||||
|
|
||||||
fn poll_write_vectored(self: Pin<&mut Self>, cx: &mut Context<'_>, bufs: &[io::IoSlice<'_>]) -> Poll<Result<usize, io::Error>> {
|
fn poll_write_vectored(
|
||||||
|
self: Pin<&mut Self>,
|
||||||
|
cx: &mut Context<'_>,
|
||||||
|
bufs: &[io::IoSlice<'_>],
|
||||||
|
) -> Poll<Result<usize, io::Error>> {
|
||||||
unimplemented!()
|
unimplemented!()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1565,7 +1577,6 @@ impl Write for Conn {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
impl Clone for Conn {
|
impl Clone for Conn {
|
||||||
fn clone(&self) -> Self {
|
fn clone(&self) -> Self {
|
||||||
Conn {
|
Conn {
|
||||||
|
|
Loading…
Reference in New Issue