Skip to content
This repository was archived by the owner on Jan 6, 2025. It is now read-only.

Commit a554b23

Browse files
tnulltnull
authored
Merge pull request #108 from tnull/2024-02-align-rustfmt
Align `rustfmt.toml` with `rust-lightning`
2 parents d08fc2e + d3e3e53 commit a554b23

File tree

9 files changed

+158
-151
lines changed

9 files changed

+158
-151
lines changed

‎rustfmt.toml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
1-
hard_tabs = true # use tab characters for indentation, spaces for alignment
2-
use_field_init_shorthand = true
3-
max_width = 100
41
use_small_heuristics = "Max"
52
fn_params_layout = "Compressed"
3+
hard_tabs = true
4+
use_field_init_shorthand = true
5+
max_width = 100
6+
match_block_trailing_comma = true
7+
# UNSTABLE: format_code_in_doc_comments = true
8+
# UNSTABLE: overflow_delimited_expr = true
9+
# UNSTABLE: comment_width = 100
10+
# UNSTABLE: format_macro_matchers = true
11+
# UNSTABLE: format_strings = true
12+
# UNSTABLE: group_imports = "StdExternalCrate"

‎src/lsps0/client.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ where
6969
},
7070
));
7171
Ok(())
72-
}
72+
},
7373
LSPS0Response::ListProtocolsError(ResponseError { code, message, data, .. }) => {
7474
Err(LightningError {
7575
err: format!(
@@ -78,7 +78,7 @@ where
7878
),
7979
action: ErrorAction::IgnoreAndLog(Level::Info),
8080
})
81-
}
81+
},
8282
}
8383
}
8484
}
@@ -96,14 +96,14 @@ where
9696
match message {
9797
LSPS0Message::Response(_, response) => {
9898
self.handle_response(response, counterparty_node_id)
99-
}
99+
},
100100
LSPS0Message::Request(..) => {
101101
debug_assert!(
102102
false,
103103
"Client handler received LSPS0 request message. This should never happen."
104104
);
105105
Err(LightningError { err: format!("Client handler received LSPS0 request message from node {:?}. This should never happen.", counterparty_node_id), action: ErrorAction::IgnoreAndLog(Level::Info)})
106-
}
106+
},
107107
}
108108
}
109109
}

‎src/lsps0/ser.rs

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -222,14 +222,14 @@ impl LSPSMessage {
222222
match self {
223223
LSPSMessage::LSPS0(LSPS0Message::Request(request_id, request)) => {
224224
Some((RequestId(request_id.0.clone()), request.into()))
225-
}
225+
},
226226
#[cfg(lsps1)]
227227
LSPSMessage::LSPS1(LSPS1Message::Request(request_id, request)) => {
228228
Some((RequestId(request_id.0.clone()), request.into()))
229-
}
229+
},
230230
LSPSMessage::LSPS2(LSPS2Message::Request(request_id, request)) => {
231231
Some((RequestId(request_id.0.clone()), request.into()))
232-
}
232+
},
233233
_ => None,
234234
}
235235
}
@@ -254,21 +254,21 @@ impl Serialize for LSPSMessage {
254254
match request {
255255
LSPS0Request::ListProtocols(params) => {
256256
jsonrpc_object.serialize_field(JSONRPC_PARAMS_FIELD_KEY, params)?
257-
}
257+
},
258258
};
259-
}
259+
},
260260
LSPSMessage::LSPS0(LSPS0Message::Response(request_id, response)) => {
261261
jsonrpc_object.serialize_field(JSONRPC_ID_FIELD_KEY, &request_id.0)?;
262262

263263
match response {
264264
LSPS0Response::ListProtocols(result) => {
265265
jsonrpc_object.serialize_field(JSONRPC_RESULT_FIELD_KEY, result)?;
266-
}
266+
},
267267
LSPS0Response::ListProtocolsError(error) => {
268268
jsonrpc_object.serialize_field(JSONRPC_ERROR_FIELD_KEY, error)?;
269-
}
269+
},
270270
}
271-
}
271+
},
272272
#[cfg(lsps1)]
273273
LSPSMessage::LSPS1(LSPS1Message::Request(request_id, request)) => {
274274
jsonrpc_object.serialize_field(JSONRPC_ID_FIELD_KEY, &request_id.0)?;
@@ -278,40 +278,40 @@ impl Serialize for LSPSMessage {
278278
match request {
279279
LSPS1Request::GetInfo(params) => {
280280
jsonrpc_object.serialize_field(JSONRPC_PARAMS_FIELD_KEY, params)?
281-
}
281+
},
282282
LSPS1Request::CreateOrder(params) => {
283283
jsonrpc_object.serialize_field(JSONRPC_PARAMS_FIELD_KEY, params)?
284-
}
284+
},
285285
LSPS1Request::GetOrder(params) => {
286286
jsonrpc_object.serialize_field(JSONRPC_PARAMS_FIELD_KEY, params)?
287-
}
287+
},
288288
}
289-
}
289+
},
290290
#[cfg(lsps1)]
291291
LSPSMessage::LSPS1(LSPS1Message::Response(request_id, response)) => {
292292
jsonrpc_object.serialize_field(JSONRPC_ID_FIELD_KEY, &request_id.0)?;
293293

294294
match response {
295295
LSPS1Response::GetInfo(result) => {
296296
jsonrpc_object.serialize_field(JSONRPC_RESULT_FIELD_KEY, result)?
297-
}
297+
},
298298
LSPS1Response::GetInfoError(error) => {
299299
jsonrpc_object.serialize_field(JSONRPC_ERROR_FIELD_KEY, error)?
300-
}
300+
},
301301
LSPS1Response::CreateOrder(result) => {
302302
jsonrpc_object.serialize_field(JSONRPC_RESULT_FIELD_KEY, result)?
303-
}
303+
},
304304
LSPS1Response::CreateOrderError(error) => {
305305
jsonrpc_object.serialize_field(JSONRPC_ERROR_FIELD_KEY, error)?
306-
}
306+
},
307307
LSPS1Response::GetOrder(result) => {
308308
jsonrpc_object.serialize_field(JSONRPC_RESULT_FIELD_KEY, result)?
309-
}
309+
},
310310
LSPS1Response::GetOrderError(error) => {
311311
jsonrpc_object.serialize_field(JSONRPC_ERROR_FIELD_KEY, error)?
312-
}
312+
},
313313
}
314-
}
314+
},
315315
LSPSMessage::LSPS2(LSPS2Message::Request(request_id, request)) => {
316316
jsonrpc_object.serialize_field(JSONRPC_ID_FIELD_KEY, &request_id.0)?;
317317
jsonrpc_object
@@ -320,34 +320,34 @@ impl Serialize for LSPSMessage {
320320
match request {
321321
LSPS2Request::GetInfo(params) => {
322322
jsonrpc_object.serialize_field(JSONRPC_PARAMS_FIELD_KEY, params)?
323-
}
323+
},
324324
LSPS2Request::Buy(params) => {
325325
jsonrpc_object.serialize_field(JSONRPC_PARAMS_FIELD_KEY, params)?
326-
}
326+
},
327327
}
328-
}
328+
},
329329
LSPSMessage::LSPS2(LSPS2Message::Response(request_id, response)) => {
330330
jsonrpc_object.serialize_field(JSONRPC_ID_FIELD_KEY, &request_id.0)?;
331331

332332
match response {
333333
LSPS2Response::GetInfo(result) => {
334334
jsonrpc_object.serialize_field(JSONRPC_RESULT_FIELD_KEY, result)?
335-
}
335+
},
336336
LSPS2Response::GetInfoError(error) => {
337337
jsonrpc_object.serialize_field(JSONRPC_ERROR_FIELD_KEY, error)?
338-
}
338+
},
339339
LSPS2Response::Buy(result) => {
340340
jsonrpc_object.serialize_field(JSONRPC_RESULT_FIELD_KEY, result)?
341-
}
341+
},
342342
LSPS2Response::BuyError(error) => {
343343
jsonrpc_object.serialize_field(JSONRPC_ERROR_FIELD_KEY, error)?
344-
}
344+
},
345345
}
346-
}
346+
},
347347
LSPSMessage::Invalid(error) => {
348348
jsonrpc_object.serialize_field(JSONRPC_ID_FIELD_KEY, &serde_json::Value::Null)?;
349349
jsonrpc_object.serialize_field(JSONRPC_ERROR_FIELD_KEY, &error)?;
350-
}
350+
},
351351
}
352352

353353
jsonrpc_object.end()
@@ -379,22 +379,22 @@ impl<'de, 'a> Visitor<'de> for LSPSMessageVisitor<'a> {
379379
match key {
380380
"id" => {
381381
id = map.next_value()?;
382-
}
382+
},
383383
"method" => {
384384
method = Some(map.next_value()?);
385-
}
385+
},
386386
"params" => {
387387
params = Some(map.next_value()?);
388-
}
388+
},
389389
"result" => {
390390
result = Some(map.next_value()?);
391-
}
391+
},
392392
"error" => {
393393
error = Some(map.next_value()?);
394-
}
394+
},
395395
_ => {
396396
let _: serde_json::Value = map.next_value()?;
397-
}
397+
},
398398
}
399399
}
400400

@@ -415,7 +415,7 @@ impl<'de, 'a> Visitor<'de> for LSPSMessageVisitor<'a> {
415415

416416
return Err(de::Error::custom("Received unknown error message"));
417417
}
418-
}
418+
},
419419
};
420420

421421
match method {
@@ -432,7 +432,7 @@ impl<'de, 'a> Visitor<'de> for LSPSMessageVisitor<'a> {
432432
id,
433433
LSPS1Request::GetInfo(request),
434434
)))
435-
}
435+
},
436436
#[cfg(lsps1)]
437437
LSPSMethod::LSPS1CreateOrder => {
438438
let request = serde_json::from_value(params.unwrap_or(json!({})))
@@ -441,7 +441,7 @@ impl<'de, 'a> Visitor<'de> for LSPSMessageVisitor<'a> {
441441
id,
442442
LSPS1Request::CreateOrder(request),
443443
)))
444-
}
444+
},
445445
#[cfg(lsps1)]
446446
LSPSMethod::LSPS1GetOrder => {
447447
let request = serde_json::from_value(params.unwrap_or(json!({})))
@@ -450,20 +450,20 @@ impl<'de, 'a> Visitor<'de> for LSPSMessageVisitor<'a> {
450450
id,
451451
LSPS1Request::GetOrder(request),
452452
)))
453-
}
453+
},
454454
LSPSMethod::LSPS2GetInfo => {
455455
let request = serde_json::from_value(params.unwrap_or(json!({})))
456456
.map_err(de::Error::custom)?;
457457
Ok(LSPSMessage::LSPS2(LSPS2Message::Request(
458458
id,
459459
LSPS2Request::GetInfo(request),
460460
)))
461-
}
461+
},
462462
LSPSMethod::LSPS2Buy => {
463463
let request = serde_json::from_value(params.unwrap_or(json!({})))
464464
.map_err(de::Error::custom)?;
465465
Ok(LSPSMessage::LSPS2(LSPS2Message::Request(id, LSPS2Request::Buy(request))))
466-
}
466+
},
467467
},
468468
None => match self.request_id_to_method_map.remove(&id) {
469469
Some(method) => match method {
@@ -483,7 +483,7 @@ impl<'de, 'a> Visitor<'de> for LSPSMessageVisitor<'a> {
483483
} else {
484484
Err(de::Error::custom("Received invalid JSON-RPC object: one of method, result, or error required"))
485485
}
486-
}
486+
},
487487
#[cfg(lsps1)]
488488
LSPSMethod::LSPS1GetInfo => {
489489
if let Some(error) = error {
@@ -501,7 +501,7 @@ impl<'de, 'a> Visitor<'de> for LSPSMessageVisitor<'a> {
501501
} else {
502502
Err(de::Error::custom("Received invalid JSON-RPC object: one of method, result, or error required"))
503503
}
504-
}
504+
},
505505
#[cfg(lsps1)]
506506
LSPSMethod::LSPS1CreateOrder => {
507507
if let Some(error) = error {
@@ -519,7 +519,7 @@ impl<'de, 'a> Visitor<'de> for LSPSMessageVisitor<'a> {
519519
} else {
520520
Err(de::Error::custom("Received invalid JSON-RPC object: one of method, result, or error required"))
521521
}
522-
}
522+
},
523523
#[cfg(lsps1)]
524524
LSPSMethod::LSPS1GetOrder => {
525525
if let Some(error) = error {
@@ -537,7 +537,7 @@ impl<'de, 'a> Visitor<'de> for LSPSMessageVisitor<'a> {
537537
} else {
538538
Err(de::Error::custom("Received invalid JSON-RPC object: one of method, result, or error required"))
539539
}
540-
}
540+
},
541541
LSPSMethod::LSPS2GetInfo => {
542542
if let Some(error) = error {
543543
Ok(LSPSMessage::LSPS2(LSPS2Message::Response(
@@ -554,7 +554,7 @@ impl<'de, 'a> Visitor<'de> for LSPSMessageVisitor<'a> {
554554
} else {
555555
Err(de::Error::custom("Received invalid JSON-RPC object: one of method, result, or error required"))
556556
}
557-
}
557+
},
558558
LSPSMethod::LSPS2Buy => {
559559
if let Some(error) = error {
560560
Ok(LSPSMessage::LSPS2(LSPS2Message::Response(
@@ -571,7 +571,7 @@ impl<'de, 'a> Visitor<'de> for LSPSMessageVisitor<'a> {
571571
} else {
572572
Err(de::Error::custom("Received invalid JSON-RPC object: one of method, result, or error required"))
573573
}
574-
}
574+
},
575575
},
576576
None => Err(de::Error::custom(format!(
577577
"Received response for unknown request id: {}",

‎src/lsps0/service.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ impl LSPS0ServiceHandler {
4949
);
5050
self.pending_messages.enqueue(counterparty_node_id, msg.into());
5151
Ok(())
52-
}
52+
},
5353
}
5454
}
5555
}
@@ -64,14 +64,14 @@ impl ProtocolMessageHandler for LSPS0ServiceHandler {
6464
match message {
6565
LSPS0Message::Request(request_id, request) => {
6666
self.handle_request(request_id, request, counterparty_node_id)
67-
}
67+
},
6868
LSPS0Message::Response(..) => {
6969
debug_assert!(
7070
false,
7171
"Service handler received LSPS0 response message. This should never happen."
7272
);
7373
Err(LightningError { err: format!("Service handler received LSPS0 response message from node {:?}. This should never happen.", counterparty_node_id), action: ErrorAction::IgnoreAndLog(Level::Info)})
74-
}
74+
},
7575
}
7676
}
7777
}

0 commit comments

Comments
 (0)