berkus
/
actix-net
mirror of https://github.com/fafhrd91/actix-net
1
0
Fork 0
Code Issues Releases Wiki Activity

add forbid unsafe to actix-server

This commit is contained in:
fakeshadow 2021-04-21 19:44:23 +08:00
parent 9c7cbd2551
commit 154bc201c9
2 changed files with 3 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
actix-server/src/lib.rs
View File

@ -1,5 +1,6 @@
//! General purpose TCP server.
#![forbid(unsafe_code)]
#![deny(rust_2018_idioms, nonstandard_style)]
#![doc(html_logo_url = "https://actix.rs/img/logo.png")]
#![doc(html_favicon_url = "https://actix.rs/favicon.ico")]

46
actix-server/src/socket.rs
View File

@ -73,7 +73,7 @@ impl fmt::Display for Listener {
#[derive(Debug)]
pub enum Stream {
Tcp(actix_rt::net::TcpStream),
Tcp(TcpStream),
#[cfg(unix)]
Uds(actix_rt::net::UnixStream),
}
@ -87,13 +87,10 @@ pub trait FromStream: Sized {
mod win_impl {
use super::*;
use std::os::windows::io::{FromRawSocket, IntoRawSocket};
// FIXME: This is a workaround and we need an efficient way to convert between mio and tokio stream
impl FromStream for TcpStream {
fn from_stream(stream: Stream) -> Self {
match stream {
MioStream::Tcp(stream) => stream,
Stream::Tcp(stream) => stream,
}
}
}
@ -103,7 +100,6 @@ mod win_impl {
mod unix_impl {
use super::*;
// FIXME: This is a workaround and we need an efficient way to convert between mio and tokio stream
impl FromStream for TcpStream {
fn from_stream(stream: Stream) -> Self {
match stream {
@ -115,7 +111,6 @@ mod unix_impl {
}
}
// FIXME: This is a workaround and we need an efficient way to convert between mio and tokio stream
impl FromStream for actix_rt::net::UnixStream {
fn from_stream(stream: Stream) -> Self {
match stream {
@ -125,40 +120,3 @@ mod unix_impl {
}
}
}
// #[cfg(test)]
// mod tests {
// use super::*;
// #[test]
// fn socket_addr() {
// let addr = SocketAddr::Tcp("127.0.0.1:8080".parse().unwrap());
// assert!(format!("{:?}", addr).contains("127.0.0.1:8080"));
// assert_eq!(format!("{}", addr), "127.0.0.1:8080");
// let addr: StdSocketAddr = "127.0.0.1:0".parse().unwrap();
// let socket = MioTcpSocket::new_v4().unwrap();
// socket.set_reuseaddr(true).unwrap();
// socket.bind(addr).unwrap();
// let tcp = socket.listen(128).unwrap();
// let lst = Listener::Tcp(tcp);
// assert!(format!("{:?}", lst).contains("TcpListener"));
// assert!(format!("{}", lst).contains("127.0.0.1"));
// }
// #[test]
// #[cfg(unix)]
// fn uds() {
// let _ = std::fs::remove_file("/tmp/sock.xxxxx");
// if let Ok(socket) = MioUnixListener::bind("/tmp/sock.xxxxx") {
// let addr = socket.local_addr().expect("Couldn't get local address");
// let a = SocketAddr::Uds(addr);
// assert!(format!("{:?}", a).contains("/tmp/sock.xxxxx"));
// assert!(format!("{}", a).contains("/tmp/sock.xxxxx"));
// let lst = Listener::Uds(socket);
// assert!(format!("{:?}", lst).contains("/tmp/sock.xxxxx"));
// assert!(format!("{}", lst).contains("/tmp/sock.xxxxx"));
// }
// }
// }