From a62b73a752fe05095a715b15b0365e7e69677c26 Mon Sep 17 00:00:00 2001 From: Titouan Rigoudy Date: Thu, 28 Dec 2017 13:22:30 -0500 Subject: [PATCH] Run cargo fmt. --- src/proto/peer/message.rs | 12 ++-- src/proto/server/request.rs | 85 ++++++++++++++-------------- src/proto/server/response.rs | 105 ++++++++++++++++++----------------- 3 files changed, 102 insertions(+), 100 deletions(-) diff --git a/src/proto/peer/message.rs b/src/proto/peer/message.rs index 632821d..55637e3 100644 --- a/src/proto/peer/message.rs +++ b/src/proto/peer/message.rs @@ -47,14 +47,14 @@ impl ProtoDecode for Message { CODE_PIERCE_FIREWALL => { let val = decoder.decode_u32()?; Message::PierceFirewall(val) - }, + } CODE_PEER_INIT => { let peer_init = PeerInit::decode(decoder)?; Message::PeerInit(peer_init) - }, + } _ => { return Err(DecodeError::UnknownCodeError(code)); - }, + } }; Ok(message) } @@ -66,11 +66,11 @@ impl ProtoEncode for Message { Message::PierceFirewall(token) => { encoder.encode_u32(CODE_PIERCE_FIREWALL)?; encoder.encode_u32(token)?; - }, + } Message::PeerInit(ref request) => { encoder.encode_u32(CODE_PEER_INIT)?; request.encode(encoder)?; - }, + } Message::Unknown(_) => unreachable!(), } Ok(()) @@ -166,7 +166,7 @@ mod tests { let mut cursor = io::Cursor::new(bytes); match Message::decode(&mut ProtoDecoder::new(&mut cursor)) { - Err(DecodeError::UnknownCodeError(1337)) => {}, + Err(DecodeError::UnknownCodeError(1337)) => {} result => panic!(result), } } diff --git a/src/proto/server/request.rs b/src/proto/server/request.rs index f37dd74..952098e 100644 --- a/src/proto/server/request.rs +++ b/src/proto/server/request.rs @@ -103,46 +103,46 @@ impl ProtoEncode for ServerRequest { ServerRequest::CannotConnectRequest(ref request) => { encoder.encode_u32(CODE_CANNOT_CONNECT)?; request.encode(encoder)?; - }, + } ServerRequest::ConnectToPeerRequest(ref request) => { encoder.encode_u32(CODE_CONNECT_TO_PEER)?; request.encode(encoder)?; - }, + } ServerRequest::FileSearchRequest(ref request) => { encoder.encode_u32(CODE_FILE_SEARCH)?; request.encode(encoder)?; - }, + } ServerRequest::LoginRequest(ref request) => { encoder.encode_u32(CODE_LOGIN)?; request.encode(encoder)?; - }, + } ServerRequest::PeerAddressRequest(ref request) => { encoder.encode_u32(CODE_PEER_ADDRESS)?; request.encode(encoder)?; - }, + } ServerRequest::RoomJoinRequest(ref request) => { encoder.encode_u32(CODE_ROOM_JOIN)?; request.encode(encoder)?; - }, + } ServerRequest::RoomLeaveRequest(ref request) => { encoder.encode_u32(CODE_ROOM_LEAVE)?; request.encode(encoder)?; - }, + } ServerRequest::RoomListRequest => { encoder.encode_u32(CODE_ROOM_LIST)?; - }, + } ServerRequest::RoomMessageRequest(ref request) => { encoder.encode_u32(CODE_ROOM_MESSAGE)?; request.encode(encoder)?; - }, + } ServerRequest::SetListenPortRequest(ref request) => { encoder.encode_u32(CODE_SET_LISTEN_PORT)?; request.encode(encoder)?; - }, + } ServerRequest::UserStatusRequest(ref request) => { encoder.encode_u32(CODE_USER_STATUS)?; request.encode(encoder)?; - }, + } } Ok(()) } @@ -155,49 +155,47 @@ impl ProtoDecode for ServerRequest { CODE_CANNOT_CONNECT => { let request = CannotConnectRequest::decode(decoder)?; ServerRequest::CannotConnectRequest(request) - }, + } CODE_CONNECT_TO_PEER => { let request = ConnectToPeerRequest::decode(decoder)?; ServerRequest::ConnectToPeerRequest(request) - }, + } CODE_FILE_SEARCH => { let request = FileSearchRequest::decode(decoder)?; ServerRequest::FileSearchRequest(request) - }, + } CODE_LOGIN => { let request = LoginRequest::decode(decoder)?; ServerRequest::LoginRequest(request) - }, + } CODE_PEER_ADDRESS => { let request = PeerAddressRequest::decode(decoder)?; ServerRequest::PeerAddressRequest(request) - }, + } CODE_ROOM_JOIN => { let request = RoomJoinRequest::decode(decoder)?; ServerRequest::RoomJoinRequest(request) - }, + } CODE_ROOM_LEAVE => { let request = RoomLeaveRequest::decode(decoder)?; ServerRequest::RoomLeaveRequest(request) - }, - CODE_ROOM_LIST => { - ServerRequest::RoomListRequest - }, + } + CODE_ROOM_LIST => ServerRequest::RoomListRequest, CODE_ROOM_MESSAGE => { let request = RoomMessageRequest::decode(decoder)?; ServerRequest::RoomMessageRequest(request) - }, + } CODE_SET_LISTEN_PORT => { let request = SetListenPortRequest::decode(decoder)?; ServerRequest::SetListenPortRequest(request) - }, + } CODE_USER_STATUS => { let request = UserStatusRequest::decode(decoder)?; ServerRequest::UserStatusRequest(request) - }, + } _ => { return Err(DecodeError::UnknownCodeError(code)); - }, + } }; Ok(request) } @@ -601,7 +599,7 @@ mod tests { let mut cursor = io::Cursor::new(bytes); match ServerRequest::decode(&mut ProtoDecoder::new(&mut cursor)) { - Err(DecodeError::UnknownCodeError(1337)) => {}, + Err(DecodeError::UnknownCodeError(1337)) => {} result => panic!(result), } } @@ -645,28 +643,31 @@ mod tests { #[test] fn roundtrip_login_request() { - roundtrip(ServerRequest::LoginRequest(LoginRequest::new("alice", "password1234", 1337, 42).unwrap())) + roundtrip(ServerRequest::LoginRequest( + LoginRequest::new("alice", "password1234", 1337, 42) + .unwrap(), + )) } #[test] fn roundtrip_peer_address_request() { - roundtrip(ServerRequest::PeerAddressRequest(PeerAddressRequest { - username: "alice".to_string(), - })) + roundtrip(ServerRequest::PeerAddressRequest( + PeerAddressRequest { username: "alice".to_string() }, + )) } #[test] fn roundtrip_room_join_request() { - roundtrip(ServerRequest::RoomJoinRequest(RoomJoinRequest { - room_name: "best room ever".to_string(), - })) + roundtrip(ServerRequest::RoomJoinRequest( + RoomJoinRequest { room_name: "best room ever".to_string() }, + )) } #[test] fn roundtrip_room_leave_request() { - roundtrip(ServerRequest::RoomLeaveRequest(RoomLeaveRequest { - room_name: "best room ever".to_string() - })) + roundtrip(ServerRequest::RoomLeaveRequest( + RoomLeaveRequest { room_name: "best room ever".to_string() }, + )) } #[test] @@ -684,15 +685,15 @@ mod tests { #[test] fn roundtrip_set_listen_port_request() { - roundtrip(ServerRequest::SetListenPortRequest(SetListenPortRequest { - port: 1337, - })) + roundtrip(ServerRequest::SetListenPortRequest( + SetListenPortRequest { port: 1337 }, + )) } #[test] fn roundtrip_user_status_request() { - roundtrip(ServerRequest::UserStatusRequest(UserStatusRequest { - user_name: "alice".to_string(), - })) + roundtrip(ServerRequest::UserStatusRequest( + UserStatusRequest { user_name: "alice".to_string() }, + )) } } diff --git a/src/proto/server/response.rs b/src/proto/server/response.rs index 04fbde9..5e87369 100644 --- a/src/proto/server/response.rs +++ b/src/proto/server/response.rs @@ -105,34 +105,34 @@ impl ProtoEncode for ServerResponse { ServerResponse::ConnectToPeerResponse(ref response) => { encoder.encode_u32(CODE_CONNECT_TO_PEER)?; response.encode(encoder)?; - }, + } ServerResponse::FileSearchResponse(ref response) => { encoder.encode_u32(CODE_FILE_SEARCH)?; response.encode(encoder)?; - }, + } ServerResponse::LoginResponse(ref response) => { encoder.encode_u32(CODE_LOGIN)?; response.encode(encoder)?; - }, + } ServerResponse::ParentMinSpeedResponse(ref response) => { encoder.encode_u32(CODE_PARENT_MIN_SPEED)?; response.encode(encoder)?; - }, + } ServerResponse::ParentSpeedRatioResponse(ref response) => { encoder.encode_u32(CODE_PARENT_SPEED_RATIO)?; response.encode(encoder)?; - }, + } ServerResponse::PeerAddressResponse(ref response) => { encoder.encode_u32(CODE_PEER_ADDRESS)?; response.encode(encoder)?; - }, + } ServerResponse::PrivilegedUsersResponse(ref response) => { encoder.encode_u32(CODE_PRIVILEGED_USERS)?; response.encode(encoder)?; - }, + } _ => { unimplemented!(); - }, + } }; Ok(()) } @@ -145,34 +145,34 @@ impl ProtoDecode for ServerResponse { CODE_CONNECT_TO_PEER => { let response = ConnectToPeerResponse::decode(decoder)?; ServerResponse::ConnectToPeerResponse(response) - }, + } CODE_FILE_SEARCH => { let response = FileSearchResponse::decode(decoder)?; ServerResponse::FileSearchResponse(response) - }, + } CODE_LOGIN => { let response = LoginResponse::decode(decoder)?; ServerResponse::LoginResponse(response) - }, + } CODE_PARENT_MIN_SPEED => { let response = ParentMinSpeedResponse::decode(decoder)?; ServerResponse::ParentMinSpeedResponse(response) - }, + } CODE_PARENT_SPEED_RATIO => { let response = ParentSpeedRatioResponse::decode(decoder)?; ServerResponse::ParentSpeedRatioResponse(response) - }, + } CODE_PEER_ADDRESS => { let response = PeerAddressResponse::decode(decoder)?; ServerResponse::PeerAddressResponse(response) - }, + } CODE_PRIVILEGED_USERS => { let response = PrivilegedUsersResponse::decode(decoder)?; ServerResponse::PrivilegedUsersResponse(response) - }, + } _ => { return Err(DecodeError::UnknownCodeError(code)); - }, + } }; Ok(response) } @@ -332,15 +332,19 @@ impl ReadFromPacket for LoginResponse { impl ProtoEncode for LoginResponse { fn encode(&self, encoder: &mut ProtoEncoder) -> Result<(), io::Error> { match *self { - LoginResponse::LoginOk { ref motd, ip, password_md5_opt: _ } => { + LoginResponse::LoginOk { + ref motd, + ip, + password_md5_opt: _, + } => { encoder.encode_bool(true)?; encoder.encode_string(motd)?; encoder.encode_ipv4_addr(ip)?; - }, + } LoginResponse::LoginFail { ref reason } => { encoder.encode_bool(false)?; encoder.encode_string(reason)?; - }, + } }; Ok(()) } @@ -351,9 +355,7 @@ impl ProtoDecode for LoginResponse { let ok = decoder.decode_bool()?; if !ok { let reason = decoder.decode_string()?; - return Ok(LoginResponse::LoginFail { - reason: reason, - }) + return Ok(LoginResponse::LoginFail { reason: reason }); } let motd = decoder.decode_string()?; @@ -397,9 +399,7 @@ impl ProtoEncode for ParentMinSpeedResponse { impl ProtoDecode for ParentMinSpeedResponse { fn decode(decoder: &mut ProtoDecoder) -> Result { let value = decoder.decode_u32()?; - Ok(Self { - value: value - }) + Ok(Self { value: value }) } } @@ -428,9 +428,7 @@ impl ProtoEncode for ParentSpeedRatioResponse { impl ProtoDecode for ParentSpeedRatioResponse { fn decode(decoder: &mut ProtoDecoder) -> Result { let value = decoder.decode_u32()?; - Ok(Self { - value: value - }) + Ok(Self { value: value }) } } @@ -505,9 +503,7 @@ impl ProtoEncode for PrivilegedUsersResponse { impl ProtoDecode for PrivilegedUsersResponse { fn decode(decoder: &mut ProtoDecoder) -> Result { let users = decoder.decode_vec::()?; - Ok(Self { - users: users, - }) + Ok(Self { users: users }) } } @@ -891,14 +887,16 @@ mod tests { #[test] fn roundtrip_connect_to_peer() { - roundtrip(ServerResponse::ConnectToPeerResponse(ConnectToPeerResponse { - user_name: "alice".to_string(), - connection_type: "P".to_string(), - ip: net::Ipv4Addr::new(192, 168, 254, 1), - port: 1337, - token: 42, - is_privileged: true, - })) + roundtrip(ServerResponse::ConnectToPeerResponse( + ConnectToPeerResponse { + user_name: "alice".to_string(), + connection_type: "P".to_string(), + ip: net::Ipv4Addr::new(192, 168, 254, 1), + port: 1337, + token: 42, + is_privileged: true, + }, + )) } #[test] @@ -928,16 +926,16 @@ mod tests { #[test] fn roundtrip_parent_min_speed() { - roundtrip(ServerResponse::ParentMinSpeedResponse(ParentMinSpeedResponse { - value: 1337, - })) + roundtrip(ServerResponse::ParentMinSpeedResponse( + ParentMinSpeedResponse { value: 1337 }, + )) } #[test] fn roundtrip_parent_speed_ratio() { - roundtrip(ServerResponse::ParentSpeedRatioResponse(ParentSpeedRatioResponse { - value: 1337, - })) + roundtrip(ServerResponse::ParentSpeedRatioResponse( + ParentSpeedRatioResponse { value: 1337 }, + )) } #[test] @@ -951,12 +949,15 @@ mod tests { #[test] fn roundtrip_privileged_users() { - roundtrip(ServerResponse::PrivilegedUsersResponse(PrivilegedUsersResponse { - users: vec![ - "alice".to_string(), - "bob".to_string(), - "chris".to_string(), - ], - })) + roundtrip(ServerResponse::PrivilegedUsersResponse( + PrivilegedUsersResponse { + users: vec![ + "alice".to_string(), + "bob".to_string(), + "chris".to_string(), + "dory".to_string(), + ], + }, + )) } }