Skip to content

Commit 0e93143

Browse files
getonggetong
committed
fmt code
1 parent f90de43 commit 0e93143

File tree

17 files changed

+74
-98
lines changed

17 files changed

+74
-98
lines changed

‎examples/distributed/discovery_server.rs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,7 @@ impl DiscoveryServer {
8585
// Register participant
8686
self.participants.insert(name.to_string(), ParticipantInfo { addr, endpoint });
8787
println!("Added participant '{}' with ip {}", name, addr);
88-
}
89-
else {
88+
} else {
9089
println!(
9190
"Participant with name '{}' already exists, please registry with another name",
9291
name
@@ -103,8 +102,7 @@ impl DiscoveryServer {
103102
self.handler.network().send(participant.1.endpoint, &output_data);
104103
}
105104
println!("Removed participant '{}' with ip {}", name, info.addr);
106-
}
107-
else {
105+
} else {
108106
println!("Can not unregister an non-existent participant with name '{}'", name);
109107
}
110108
}

‎examples/distributed/participant.rs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,10 @@ impl Participant {
5151
Message::RegisterParticipant(self.name.clone(), self.public_addr);
5252
let output_data = bincode::serialize(&message).unwrap();
5353
self.handler.network().send(self.discovery_endpoint, &output_data);
54-
}
55-
else {
54+
} else {
5655
println!("Can not connect to the discovery server");
5756
}
58-
}
59-
else {
57+
} else {
6058
// Participant endpoint
6159
let (name, message) = self.greetings.remove(&endpoint).unwrap();
6260
if established {

‎examples/file-transfer/sender.rs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ pub fn run(file_path: String) {
3333
let request = SenderMsg::FileRequest(file_name.clone(), file_size);
3434
let output_data = bincode::serialize(&request).unwrap();
3535
handler.network().send(server_id, &output_data);
36-
}
37-
else {
36+
} else {
3837
println!("Can not connect to the receiver by TCP to {}", server_addr)
3938
}
4039
}
@@ -70,8 +69,7 @@ pub fn run(file_path: String) {
7069
print!("\rSending '{}': {}%", file_name, percentage);
7170

7271
handler.signals().send_with_timer(Signal::SendChunk, Duration::from_micros(10));
73-
}
74-
else {
72+
} else {
7573
println!("\nFile sent!");
7674
handler.stop();
7775
}

‎examples/ping-pong/client.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ pub fn run(transport: Transport, remote_addr: RemoteAddr) {
2323
println!("Connected to server at {} by {}", server_id.addr(), transport);
2424
println!("Client identified by local port: {}", local_addr.port());
2525
handler.signals().send(Signal::Greet);
26-
}
27-
else {
26+
} else {
2827
println!("Can not connect to server at {} by {}", remote_addr, transport)
2928
}
3029
}

‎examples/throughput/main.rs‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -260,14 +260,11 @@ impl std::fmt::Display for ThroughputMeasure {
260260
let bytes_per_sec = self.0 as f64 / self.1.as_secs_f64();
261261
if bytes_per_sec < 1000.0 {
262262
write!(f, "{:.2} B/s", bytes_per_sec)
263-
}
264-
else if bytes_per_sec < 1000_000.0 {
263+
} else if bytes_per_sec < 1000_000.0 {
265264
write!(f, "{:.2} KB/s", bytes_per_sec / 1000.0)
266-
}
267-
else if bytes_per_sec < 1000_000_000.0 {
265+
} else if bytes_per_sec < 1000_000_000.0 {
268266
write!(f, "{:.2} MB/s", bytes_per_sec / 1000_000.0)
269-
}
270-
else {
267+
} else {
271268
write!(f, "{:.2} GB/s", bytes_per_sec / 1000_000_000.0)
272269
}
273270
}

‎src/adapters/framed_tcp.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ impl Remote for RemoteResource {
121121
}
122122
Err(err) => {
123123
log::error!("TCP receive error: {}", err);
124-
break ReadStatus::Disconnected // should not happen
124+
break ReadStatus::Disconnected; // should not happen
125125
}
126126
}
127127
}
@@ -144,13 +144,13 @@ impl Remote for RemoteResource {
144144
Ok(bytes_sent) => {
145145
total_bytes_sent += bytes_sent;
146146
if total_bytes_sent == total_bytes {
147-
break SendStatus::Sent
147+
break SendStatus::Sent;
148148
}
149149
}
150150
Err(ref err) if err.kind() == io::ErrorKind::WouldBlock => continue,
151151
Err(err) => {
152152
log::error!("TCP receive error: {}", err);
153-
break SendStatus::ResourceNotFound // should not happen
153+
break SendStatus::ResourceNotFound; // should not happen
154154
}
155155
}
156156
}

‎src/adapters/tcp.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ impl Remote for RemoteResource {
177177
}
178178
Err(err) => {
179179
log::error!("TCP receive error: {}", err);
180-
break ReadStatus::Disconnected // should not happen
180+
break ReadStatus::Disconnected; // should not happen
181181
}
182182
}
183183
}
@@ -195,7 +195,7 @@ impl Remote for RemoteResource {
195195
Ok(bytes_sent) => {
196196
total_bytes_sent += bytes_sent;
197197
if total_bytes_sent == data.len() {
198-
break SendStatus::Sent
198+
break SendStatus::Sent;
199199
}
200200
}
201201
Err(ref err) if err.kind() == io::ErrorKind::WouldBlock => continue,
@@ -204,7 +204,7 @@ impl Remote for RemoteResource {
204204
// a Event::Disconnection will be generated later.
205205
Err(err) => {
206206
log::error!("TCP receive error: {}", err);
207-
break SendStatus::ResourceNotFound // should not happen
207+
break SendStatus::ResourceNotFound; // should not happen
208208
}
209209
}
210210
}
@@ -238,7 +238,7 @@ pub fn check_stream_ready(stream: &TcpStream) -> PendingStatus {
238238
// A multiplatform non-blocking way to determine if the TCP stream is connected:
239239
// Extracted from: https://github.com/tokio-rs/mio/issues/1486
240240
if let Ok(Some(_)) = stream.take_error() {
241-
return PendingStatus::Disconnected
241+
return PendingStatus::Disconnected;
242242
}
243243
match stream.peer_addr() {
244244
Ok(_) => PendingStatus::Ready,

‎src/adapters/udp.rs‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -193,11 +193,11 @@ impl Remote for RemoteResource {
193193
}
194194
Err(ref err) if err.kind() == ErrorKind::ConnectionRefused => {
195195
// Avoid ICMP generated error to be logged
196-
break ReadStatus::WaitNextEvent
196+
break ReadStatus::WaitNextEvent;
197197
}
198198
Err(err) => {
199199
log::error!("UDP receive error: {}", err);
200-
break ReadStatus::WaitNextEvent // Should not happen
200+
break ReadStatus::WaitNextEvent; // Should not happen
201201
}
202202
}
203203
}
@@ -262,15 +262,15 @@ impl LocalResource {
262262
};
263263

264264
if !ingress_addresses.contains(&ingress_ip) {
265-
continue
265+
continue;
266266
}
267267

268268
fn convert_sockaddr(addr: SockaddrStorage) -> Option<SocketAddr> {
269269
if let Some(addr) = addr.as_sockaddr_in() {
270-
return Some(SocketAddr::V4((*addr).into()))
270+
return Some(SocketAddr::V4((*addr).into()));
271271
}
272272
if let Some(addr) = addr.as_sockaddr_in6() {
273-
return Some(SocketAddr::V6((*addr).into()))
273+
return Some(SocketAddr::V6((*addr).into()));
274274
}
275275
None
276276
}
@@ -386,16 +386,14 @@ impl Local for LocalResource {
386386
Some(ingress_addresses)
387387
}
388388
}
389-
}
390-
else {
389+
} else {
391390
None
392391
};
393392

394393
if let Some(multicast) = multicast {
395394
socket.join_multicast_v4(multicast.ip(), &Ipv4Addr::UNSPECIFIED)?;
396395
socket.bind(&SocketAddrV4::new(Ipv4Addr::UNSPECIFIED, addr.port()).into())?;
397-
}
398-
else {
396+
} else {
399397
socket.bind(&addr.into())?;
400398
}
401399

@@ -417,7 +415,7 @@ impl Local for LocalResource {
417415
#[cfg(target_os = "linux")]
418416
if let Some(ingress_addresses) = &self.ingress_addresses {
419417
self.accept_filtered(ingress_addresses, accept_remote);
420-
return
418+
return;
421419
}
422420

423421
let buffer: MaybeUninit<[u8; MAX_LOCAL_PAYLOAD_LEN]> = MaybeUninit::uninit();
@@ -464,7 +462,7 @@ fn send_packet(data: &[u8], send_method: impl Fn(&[u8]) -> io::Result<usize>) ->
464462
}
465463
Err(err) => {
466464
log::error!("UDP send error: {}", err);
467-
break SendStatus::ResourceNotFound // should not happen
465+
break SendStatus::ResourceNotFound; // should not happen
468466
}
469467
}
470468
}

‎src/adapters/ws.rs‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ impl Remote for RemoteResource {
139139

140140
#[cfg(not(target_os = "windows"))]
141141
if let Err(err) = _peek_result {
142-
break Self::io_error_to_read_status(&err)
142+
break Self::io_error_to_read_status(&err);
143143
}
144144
}
145145
Message::Close(_) => break ReadStatus::Disconnected,
@@ -148,7 +148,7 @@ impl Remote for RemoteResource {
148148
Err(Error::Io(ref err)) => break Self::io_error_to_read_status(err),
149149
Err(err) => {
150150
log::error!("WS receive error: {}", err);
151-
break ReadStatus::Disconnected // should not happen
151+
break ReadStatus::Disconnected; // should not happen
152152
}
153153
},
154154
RemoteState::Handshake(_) => unreachable!(),
@@ -174,7 +174,7 @@ impl Remote for RemoteResource {
174174
Err(Error::Capacity(_)) => break SendStatus::MaxPacketSizeExceeded,
175175
Err(err) => {
176176
log::error!("WS send error: {}", err);
177-
break SendStatus::ResourceNotFound // should not happen
177+
break SendStatus::ResourceNotFound; // should not happen
178178
}
179179
}
180180
}
@@ -195,7 +195,7 @@ impl Remote for RemoteResource {
195195
if tcp_status != PendingStatus::Ready {
196196
// TCP handshake not ready yet.
197197
*pending = Some(PendingHandshake::Connect(url, stream));
198-
return tcp_status
198+
return tcp_status;
199199
}
200200
let stream_backup = stream.clone();
201201
match ws_connect(url, stream) {
@@ -310,11 +310,9 @@ impl RemoteResource {
310310
fn io_error_to_read_status(err: &io::Error) -> ReadStatus {
311311
if err.kind() == io::ErrorKind::WouldBlock {
312312
ReadStatus::WaitNextEvent
313-
}
314-
else if err.kind() == io::ErrorKind::ConnectionReset {
313+
} else if err.kind() == io::ErrorKind::ConnectionReset {
315314
ReadStatus::Disconnected
316-
}
317-
else {
315+
} else {
318316
log::error!("WS receive error: {}", err);
319317
ReadStatus::Disconnected // should not happen
320318
}

‎src/events.rs‎

Lines changed: 19 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ pub struct EventReceiver<E> {
4545
}
4646

4747
impl<E> Default for EventReceiver<E>
48-
where E: Send + 'static
48+
where
49+
E: Send + 'static,
4950
{
5051
/// Creates a new event queue for generic incoming events.
5152
fn default() -> Self {
@@ -63,7 +64,8 @@ where E: Send + 'static
6364
}
6465

6566
impl<E> EventReceiver<E>
66-
where E: Send + 'static
67+
where
68+
E: Send + 'static,
6769
{
6870
/// Returns the internal sender reference to this queue.
6971
/// This reference can be safety cloned and shared to other threads
@@ -89,19 +91,16 @@ where E: Send + 'static
8991
// and the channel never can be considered disconnected.
9092
if !self.priority_receiver.is_empty() {
9193
self.priority_receiver.recv().unwrap()
92-
}
93-
else if self.timers.is_empty() {
94+
} else if self.timers.is_empty() {
9495
select! {
9596
recv(self.receiver) -> event => event.unwrap(),
9697
recv(self.priority_receiver) -> event => event.unwrap(),
9798
}
98-
}
99-
else {
99+
} else {
100100
let next_instant = *self.timers.iter().next().unwrap().0;
101101
if next_instant <= Instant::now() {
102102
self.timers.remove(&next_instant).unwrap()
103-
}
104-
else {
103+
} else {
105104
select! {
106105
recv(self.receiver) -> event => event.unwrap(),
107106
recv(self.priority_receiver) -> event => event.unwrap(),
@@ -120,20 +119,17 @@ where E: Send + 'static
120119

121120
if !self.priority_receiver.is_empty() {
122121
Some(self.priority_receiver.recv().unwrap())
123-
}
124-
else if self.timers.is_empty() {
122+
} else if self.timers.is_empty() {
125123
select! {
126124
recv(self.receiver) -> event => Some(event.unwrap()),
127125
recv(self.priority_receiver) -> event => Some(event.unwrap()),
128126
default(timeout) => None
129127
}
130-
}
131-
else {
128+
} else {
132129
let next_instant = *self.timers.iter().next().unwrap().0;
133130
if next_instant <= Instant::now() {
134131
self.timers.remove(&next_instant)
135-
}
136-
else {
132+
} else {
137133
select! {
138134
recv(self.receiver) -> event => Some(event.unwrap()),
139135
recv(self.priority_receiver) -> event => Some(event.unwrap()),
@@ -152,16 +148,14 @@ where E: Send + 'static
152148
self.enque_timers();
153149

154150
if let Ok(priority_event) = self.priority_receiver.try_recv() {
155-
return Some(priority_event)
156-
}
157-
else if let Some(next_instant) = self.timers.iter().next() {
151+
return Some(priority_event);
152+
} else if let Some(next_instant) = self.timers.iter().next() {
158153
if *next_instant.0 <= Instant::now() {
159154
let instant = *next_instant.0;
160-
return self.timers.remove(&instant)
155+
return self.timers.remove(&instant);
161156
}
162-
}
163-
else if let Ok(event) = self.receiver.try_recv() {
164-
return Some(event)
157+
} else if let Ok(event) = self.receiver.try_recv() {
158+
return Some(event);
165159
}
166160

167161
None
@@ -177,7 +171,8 @@ pub struct EventSender<E> {
177171
}
178172

179173
impl<E> EventSender<E>
180-
where E: Send + 'static
174+
where
175+
E: Send + 'static,
181176
{
182177
fn new(
183178
sender: Sender<E>,
@@ -217,7 +212,8 @@ where E: Send + 'static
217212
}
218213

219214
impl<E> Clone for EventSender<E>
220-
where E: Send + 'static
215+
where
216+
E: Send + 'static,
221217
{
222218
fn clone(&self) -> Self {
223219
EventSender::new(

0 commit comments

Comments
 (0)