Skip to content

Commit 6244f1e

Browse files
committed
reformat
1 parent b5b5103 commit 6244f1e

5 files changed

Lines changed: 32 additions & 35 deletions

File tree

demo/picows_server.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
11
import asyncio
22
import rsloop
33

4-
from picows import ws_create_server, WSFrame, WSTransport, WSListener, WSMsgType, WSUpgradeRequest
4+
from picows import (
5+
ws_create_server,
6+
WSFrame,
7+
WSTransport,
8+
WSListener,
9+
WSMsgType,
10+
WSUpgradeRequest,
11+
)
512

613

714
class ServerClientListener(WSListener):
@@ -28,6 +35,5 @@ def listener_factory(r: WSUpgradeRequest):
2835
await server.serve_forever()
2936

3037

31-
3238
if __name__ == "__main__":
3339
rsloop.run(main())

src/loop_core.rs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -448,11 +448,9 @@ impl LoopCore {
448448
}
449449
ReadyItem::ServerAccepted { server, stream } => {
450450
profiling::scope!("ready.server_accepted");
451-
if let Err(err) =
452-
crate::stream_transport::spawn_accepted_transport_with_py(
453-
py, &server, stream,
454-
)
455-
{
451+
if let Err(err) = crate::stream_transport::spawn_accepted_transport_with_py(
452+
py, &server, stream,
453+
) {
456454
server.report_error(err, "failed to accept connection");
457455
}
458456
}
@@ -740,9 +738,12 @@ impl LoopCore {
740738
ReadyItem::ProcessTransport(core) => {
741739
LoopCommand::Transport(LoopTransportCommand::Process(core))
742740
}
743-
ReadyItem::ServerAccepted { server, stream } => LoopCommand::Transport(
744-
LoopTransportCommand::ServerAccepted { server, stream },
745-
),
741+
ReadyItem::ServerAccepted { server, stream } => {
742+
LoopCommand::Transport(LoopTransportCommand::ServerAccepted {
743+
server,
744+
stream,
745+
})
746+
}
746747
}),
747748
LoopCommand::Future(LoopFutureCommand::SetResult { future, value }) => self
748749
.try_enqueue_local_ready(ReadyItem::FutureSetResult { future, value })

src/loop_core/commands.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,14 @@ use crate::stream_transport::{
1414

1515
pub enum ReadyItem {
1616
Callback(Arc<ReadyCallback>),
17-
FutureSetResult { future: Py<PyAny>, value: Py<PyAny> },
18-
FutureSetException { future: Py<PyAny>, value: Py<PyAny> },
17+
FutureSetResult {
18+
future: Py<PyAny>,
19+
value: Py<PyAny>,
20+
},
21+
FutureSetException {
22+
future: Py<PyAny>,
23+
value: Py<PyAny>,
24+
},
1925
StreamTransportRead(Arc<StreamTransportCore>),
2026
ProcessTransport(Arc<ProcessTransportCore>),
2127
ServerAccepted {

src/python_api.rs

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1998,28 +1998,14 @@ impl PyLoop {
19981998
)?;
19991999
transport_from_socket_tls(
20002000
py,
2001-
stream_spawn_context(
2002-
py,
2003-
&core,
2004-
&loop_obj,
2005-
&protocol,
2006-
&context,
2007-
context_needs_run,
2008-
),
2001+
stream_spawn_context(py, &core, &loop_obj, &protocol, &context, context_needs_run),
20092002
socket_obj,
20102003
tls,
20112004
)
20122005
} else {
20132006
transport_from_socket(
20142007
py,
2015-
stream_spawn_context(
2016-
py,
2017-
&core,
2018-
&loop_obj,
2019-
&protocol,
2020-
&context,
2021-
context_needs_run,
2022-
),
2008+
stream_spawn_context(py, &core, &loop_obj, &protocol, &context, context_needs_run),
20232009
socket_obj,
20242010
)
20252011
}?;

src/stream_transport.rs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3146,8 +3146,7 @@ pub(crate) fn spawn_accepted_transport_with_py(
31463146

31473147
fn schedule_accepted_transport(server: &Arc<ServerCore>, stream: AcceptedStream, message: &str) {
31483148
if server.tls.is_some() {
3149-
let result =
3150-
Python::try_attach(|py| spawn_accepted_transport_with_py(py, server, stream));
3149+
let result = Python::try_attach(|py| spawn_accepted_transport_with_py(py, server, stream));
31513150
match result {
31523151
Some(Ok(_)) => {}
31533152
Some(Err(err)) => server.report_error(err, message),
@@ -3156,13 +3155,12 @@ fn schedule_accepted_transport(server: &Arc<ServerCore>, stream: AcceptedStream,
31563155
return;
31573156
}
31583157

3159-
if let Err(err) = server
3160-
.loop_core
3161-
.send_command(LoopCommand::Transport(LoopTransportCommand::ServerAccepted {
3158+
if let Err(err) = server.loop_core.send_command(LoopCommand::Transport(
3159+
LoopTransportCommand::ServerAccepted {
31623160
server: Arc::clone(server),
31633161
stream,
3164-
}))
3165-
{
3162+
},
3163+
)) {
31663164
server.report_error(PyRuntimeError::new_err(err.to_string()), message);
31673165
}
31683166
}

0 commit comments

Comments
 (0)