Skip to content

Commit d867ee0

Browse files
author
iHsin
committed
style: cargo fmt
1 parent 30a70ca commit d867ee0

File tree

7 files changed

+100
-33
lines changed

7 files changed

+100
-33
lines changed

‎tuic-quinn/src/lib.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,9 @@ impl Connect {
408408
pub fn addr(&self) -> &Address {
409409
match &self.model {
410410
Side::Client(model) => {
411-
let Header::Connect(conn) = model.header() else { unreachable!() };
411+
let Header::Connect(conn) = model.header() else {
412+
unreachable!()
413+
};
412414
conn.addr()
413415
}
414416
Side::Server(model) => model.addr(),

‎tuic-server/src/connection/handle_task.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,10 @@ impl Connection {
134134
};
135135

136136
let Some(socket_addr) = resolve_dns(&addr).await?.next() else {
137-
return Err(Error::from(IoError::new(ErrorKind::NotFound, "no address resolved")));
137+
return Err(Error::from(IoError::new(
138+
ErrorKind::NotFound,
139+
"no address resolved",
140+
)));
138141
};
139142

140143
session.send(pkt, socket_addr).await

‎tuic/src/model/authenticate.rs

+18-6
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,18 @@ impl Authenticate<side::Tx> {
3232

3333
/// Returns the header of the `Authenticate` command
3434
pub fn header(&self) -> &Header {
35-
let Side::Tx(tx) = &self.inner else { unreachable!() };
35+
let Side::Tx(tx) = &self.inner else {
36+
unreachable!()
37+
};
3638
&tx.header
3739
}
3840
}
3941

4042
impl Debug for Authenticate<side::Tx> {
4143
fn fmt(&self, f: &mut Formatter<'_>) -> FmtResult {
42-
let Side::Tx(tx) = &self.inner else { unreachable!() };
44+
let Side::Tx(tx) = &self.inner else {
45+
unreachable!()
46+
};
4347
f.debug_struct("Authenticate")
4448
.field("header", &tx.header)
4549
.finish()
@@ -61,13 +65,17 @@ impl Authenticate<side::Rx> {
6165

6266
/// Returns the UUID of the peer
6367
pub fn uuid(&self) -> Uuid {
64-
let Side::Rx(rx) = &self.inner else { unreachable!() };
68+
let Side::Rx(rx) = &self.inner else {
69+
unreachable!()
70+
};
6571
rx.uuid
6672
}
6773

6874
/// Returns the token of the peer
6975
pub fn token(&self) -> [u8; 32] {
70-
let Side::Rx(rx) = &self.inner else { unreachable!() };
76+
let Side::Rx(rx) = &self.inner else {
77+
unreachable!()
78+
};
7179
rx.token
7280
}
7381

@@ -77,14 +85,18 @@ impl Authenticate<side::Rx> {
7785
password: impl AsRef<[u8]>,
7886
exporter: &impl KeyingMaterialExporter,
7987
) -> bool {
80-
let Side::Rx(rx) = &self.inner else { unreachable!() };
88+
let Side::Rx(rx) = &self.inner else {
89+
unreachable!()
90+
};
8191
rx.token == exporter.export_keying_material(rx.uuid.as_ref(), password.as_ref())
8292
}
8393
}
8494

8595
impl Debug for Authenticate<side::Rx> {
8696
fn fmt(&self, f: &mut Formatter<'_>) -> FmtResult {
87-
let Side::Rx(rx) = &self.inner else { unreachable!() };
97+
let Side::Rx(rx) = &self.inner else {
98+
unreachable!()
99+
};
88100
f.debug_struct("Authenticate")
89101
.field("uuid", &rx.uuid)
90102
.field("token", &rx.token)

‎tuic/src/model/connect.rs

+12-4
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,18 @@ impl Connect<side::Tx> {
2727

2828
/// Returns the header of the `Connect` command
2929
pub fn header(&self) -> &Header {
30-
let Side::Tx(tx) = &self.inner else { unreachable!() };
30+
let Side::Tx(tx) = &self.inner else {
31+
unreachable!()
32+
};
3133
&tx.header
3234
}
3335
}
3436

3537
impl Debug for Connect<side::Tx> {
3638
fn fmt(&self, f: &mut Formatter<'_>) -> FmtResult {
37-
let Side::Tx(tx) = &self.inner else { unreachable!() };
39+
let Side::Tx(tx) = &self.inner else {
40+
unreachable!()
41+
};
3842
f.debug_struct("Connect")
3943
.field("header", &tx.header)
4044
.finish()
@@ -59,14 +63,18 @@ impl Connect<side::Rx> {
5963

6064
/// Returns the address
6165
pub fn addr(&self) -> &Address {
62-
let Side::Rx(rx) = &self.inner else { unreachable!() };
66+
let Side::Rx(rx) = &self.inner else {
67+
unreachable!()
68+
};
6369
&rx.addr
6470
}
6571
}
6672

6773
impl Debug for Connect<side::Rx> {
6874
fn fmt(&self, f: &mut Formatter<'_>) -> FmtResult {
69-
let Side::Rx(rx) = &self.inner else { unreachable!() };
75+
let Side::Rx(rx) = &self.inner else {
76+
unreachable!()
77+
};
7078
f.debug_struct("Connect").field("addr", &rx.addr).finish()
7179
}
7280
}

‎tuic/src/model/dissociate.rs

+12-4
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,18 @@ impl Dissociate<side::Tx> {
2424

2525
/// Returns the header of the `Dissociate` command
2626
pub fn header(&self) -> &Header {
27-
let Side::Tx(tx) = &self.inner else { unreachable!() };
27+
let Side::Tx(tx) = &self.inner else {
28+
unreachable!()
29+
};
2830
&tx.header
2931
}
3032
}
3133

3234
impl Debug for Dissociate<side::Tx> {
3335
fn fmt(&self, f: &mut Formatter<'_>) -> FmtResult {
34-
let Side::Tx(tx) = &self.inner else { unreachable!() };
36+
let Side::Tx(tx) = &self.inner else {
37+
unreachable!()
38+
};
3539
f.debug_struct("Dissociate")
3640
.field("header", &tx.header)
3741
.finish()
@@ -52,14 +56,18 @@ impl Dissociate<side::Rx> {
5256

5357
/// Returns the UDP session ID
5458
pub fn assoc_id(&self) -> u16 {
55-
let Side::Rx(rx) = &self.inner else { unreachable!() };
59+
let Side::Rx(rx) = &self.inner else {
60+
unreachable!()
61+
};
5662
rx.assoc_id
5763
}
5864
}
5965

6066
impl Debug for Dissociate<side::Rx> {
6167
fn fmt(&self, f: &mut Formatter<'_>) -> FmtResult {
62-
let Side::Rx(rx) = &self.inner else { unreachable!() };
68+
let Side::Rx(rx) = &self.inner else {
69+
unreachable!()
70+
};
6371
f.debug_struct("Dissociate")
6472
.field("assoc_id", &rx.assoc_id)
6573
.finish()

‎tuic/src/model/heartbeat.rs

+6-2
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,18 @@ impl Heartbeat<side::Tx> {
2323

2424
/// Returns the header of the `Heartbeat` command
2525
pub fn header(&self) -> &Header {
26-
let Side::Tx(tx) = &self.inner else { unreachable!() };
26+
let Side::Tx(tx) = &self.inner else {
27+
unreachable!()
28+
};
2729
&tx.header
2830
}
2931
}
3032

3133
impl Debug for Heartbeat<side::Tx> {
3234
fn fmt(&self, f: &mut Formatter<'_>) -> FmtResult {
33-
let Side::Tx(tx) = &self.inner else { unreachable!() };
35+
let Side::Tx(tx) = &self.inner else {
36+
unreachable!()
37+
};
3438
f.debug_struct("Heartbeat")
3539
.field("header", &tx.header)
3640
.finish()

‎tuic/src/model/packet.rs

+45-15
Original file line numberDiff line numberDiff line change
@@ -41,32 +41,42 @@ impl<B> Packet<side::Tx, B> {
4141
where
4242
P: AsRef<[u8]> + 'a,
4343
{
44-
let Side::Tx(tx) = self.inner else { unreachable!() };
44+
let Side::Tx(tx) = self.inner else {
45+
unreachable!()
46+
};
4547
Fragments::new(tx.assoc_id, tx.pkt_id, tx.addr, tx.max_pkt_size, payload)
4648
}
4749

4850
/// Returns the UDP session ID
4951
pub fn assoc_id(&self) -> u16 {
50-
let Side::Tx(tx) = &self.inner else { unreachable!() };
52+
let Side::Tx(tx) = &self.inner else {
53+
unreachable!()
54+
};
5155
tx.assoc_id
5256
}
5357

5458
/// Returns the packet ID
5559
pub fn pkt_id(&self) -> u16 {
56-
let Side::Tx(tx) = &self.inner else { unreachable!() };
60+
let Side::Tx(tx) = &self.inner else {
61+
unreachable!()
62+
};
5763
tx.pkt_id
5864
}
5965

6066
/// Returns the address
6167
pub fn addr(&self) -> &Address {
62-
let Side::Tx(tx) = &self.inner else { unreachable!() };
68+
let Side::Tx(tx) = &self.inner else {
69+
unreachable!()
70+
};
6371
&tx.addr
6472
}
6573
}
6674

6775
impl Debug for Packet<side::Tx, ()> {
6876
fn fmt(&self, f: &mut Formatter<'_>) -> FmtResult {
69-
let Side::Tx(tx) = &self.inner else { unreachable!() };
77+
let Side::Tx(tx) = &self.inner else {
78+
unreachable!()
79+
};
7080
f.debug_struct("Packet")
7181
.field("assoc_id", &tx.assoc_id)
7282
.field("pkt_id", &tx.pkt_id)
@@ -115,7 +125,9 @@ where
115125

116126
/// Reassembles the packet. If the packet is not complete yet, `None` is returned.
117127
pub fn assemble(self, data: B) -> Result<Option<Assemblable<B>>, AssembleError> {
118-
let Side::Rx(rx) = self.inner else { unreachable!() };
128+
let Side::Rx(rx) = self.inner else {
129+
unreachable!()
130+
};
119131
let mut sessions = rx.sessions.lock();
120132

121133
sessions.insert(
@@ -131,44 +143,58 @@ where
131143

132144
/// Returns the UDP session ID
133145
pub fn assoc_id(&self) -> u16 {
134-
let Side::Rx(rx) = &self.inner else { unreachable!() };
146+
let Side::Rx(rx) = &self.inner else {
147+
unreachable!()
148+
};
135149
rx.assoc_id
136150
}
137151

138152
/// Returns the packet ID
139153
pub fn pkt_id(&self) -> u16 {
140-
let Side::Rx(rx) = &self.inner else { unreachable!() };
154+
let Side::Rx(rx) = &self.inner else {
155+
unreachable!()
156+
};
141157
rx.pkt_id
142158
}
143159

144160
/// Returns the fragment ID
145161
pub fn frag_id(&self) -> u8 {
146-
let Side::Rx(rx) = &self.inner else { unreachable!() };
162+
let Side::Rx(rx) = &self.inner else {
163+
unreachable!()
164+
};
147165
rx.frag_id
148166
}
149167

150168
/// Returns the total number of fragments
151169
pub fn frag_total(&self) -> u8 {
152-
let Side::Rx(rx) = &self.inner else { unreachable!() };
170+
let Side::Rx(rx) = &self.inner else {
171+
unreachable!()
172+
};
153173
rx.frag_total
154174
}
155175

156176
/// Returns the address
157177
pub fn addr(&self) -> &Address {
158-
let Side::Rx(rx) = &self.inner else { unreachable!() };
178+
let Side::Rx(rx) = &self.inner else {
179+
unreachable!()
180+
};
159181
&rx.addr
160182
}
161183

162184
/// Returns the size of the (fragmented) packet
163185
pub fn size(&self) -> u16 {
164-
let Side::Rx(rx) = &self.inner else { unreachable!() };
186+
let Side::Rx(rx) = &self.inner else {
187+
unreachable!()
188+
};
165189
rx.size
166190
}
167191
}
168192

169193
impl<B> Debug for Packet<side::Rx, B> {
170194
fn fmt(&self, f: &mut Formatter<'_>) -> FmtResult {
171-
let Side::Rx(rx) = &self.inner else { unreachable!() };
195+
let Side::Rx(rx) = &self.inner else {
196+
unreachable!()
197+
};
172198
f.debug_struct("Packet")
173199
.field("assoc_id", &rx.assoc_id)
174200
.field("pkt_id", &rx.pkt_id)
@@ -205,7 +231,9 @@ where
205231
let first_frag_size = max_pkt_size - header_addr_ref.len();
206232
let frag_size_addr_none = max_pkt_size - header_addr_none_ref.len();
207233

208-
let Header::Packet(pkt) = header_addr_ref else { unreachable!() };
234+
let Header::Packet(pkt) = header_addr_ref else {
235+
unreachable!()
236+
};
209237
let (_, _, _, _, _, addr) = pkt.into();
210238

211239
let frag_total = if first_frag_size < payload.as_ref().len() {
@@ -242,7 +270,9 @@ where
242270
let next_frag_end =
243271
(self.next_frag_start + payload_size).min(self.payload.as_ref().len());
244272

245-
let Header::Packet(pkt) = header_ref else { unreachable!() };
273+
let Header::Packet(pkt) = header_ref else {
274+
unreachable!()
275+
};
246276
let (_, _, _, _, _, addr) = pkt.into();
247277

248278
let header = Header::Packet(PacketHeader::new(

0 commit comments

Comments
 (0)