Skip to content

Commit 3f59f7a

Browse files
committed
wip: Have Bin implement FromMessageParts and Data implement FromMessage
1 parent f856599 commit 3f59f7a

File tree

17 files changed

+47
-41
lines changed

17 files changed

+47
-41
lines changed

e2e/socketioxide/socketioxide.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ fn on_connect(socket: SocketRef, Data(data): Data<PayloadValue>) {
2727
// keep this handler async to test async message handlers
2828
socket.on(
2929
"message-with-ack",
30-
|Data::<PayloadValue>(data), ack: AckSender| async move {
30+
|ack: AckSender, Data::<PayloadValue>(data)| async move {
3131
info!("Received event: {:?}", data);
3232
ack.send(data).ok();
3333
},

examples/angular-todomvc/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
4343

4444
s.on(
4545
"update-store",
46-
|s: SocketRef, Data::<Vec<Todo>>(new_todos), State(Todos(todos))| {
46+
|s: SocketRef, State(Todos(todos)), Data::<Vec<Todo>>(new_todos)| {
4747
info!("Received update-store event: {:?}", new_todos);
4848

4949
let mut todos = todos.lock().unwrap();

examples/axum-echo-tls/axum_echo-tls.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ fn on_connect(socket: SocketRef, Data(data): Data<PayloadValue>) {
2323

2424
socket.on(
2525
"message-with-ack",
26-
|Data::<PayloadValue>(data), ack: AckSender| {
26+
|ack: AckSender, Data::<PayloadValue>(data)| {
2727
info!("Received event: {:?}", data);
2828
ack.send(data).ok();
2929
},

examples/axum-echo/axum_echo.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ fn on_connect(socket: SocketRef, Data(data): Data<PayloadValue>) {
2020

2121
socket.on(
2222
"message-with-ack",
23-
|Data::<PayloadValue>(data), ack: AckSender| {
23+
|ack: AckSender, Data::<PayloadValue>(data)| {
2424
info!("Received event: {:?}", data);
2525
ack.send(data).ok();
2626
},

examples/basic-crud-application/src/handlers/todo.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ impl Todos {
4141
}
4242
}
4343

44-
pub fn create(s: SocketRef, Data(data): Data<PartialTodo>, ack: AckSender, todos: State<Todos>) {
44+
pub fn create(s: SocketRef, ack: AckSender, todos: State<Todos>, Data(data): Data<PartialTodo>) {
4545
let id = Uuid::new_v4();
4646
let todo = Todo { id, inner: data };
4747

@@ -53,12 +53,12 @@ pub fn create(s: SocketRef, Data(data): Data<PartialTodo>, ack: AckSender, todos
5353
s.broadcast().emit("todo:created", todo).ok();
5454
}
5555

56-
pub async fn read(Data(id): Data<Uuid>, ack: AckSender, todos: State<Todos>) {
56+
pub async fn read(ack: AckSender, todos: State<Todos>, Data(id): Data<Uuid>) {
5757
let todo = todos.get(&id).ok_or(Error::NotFound);
5858
ack.send(todo).ok();
5959
}
6060

61-
pub async fn update(s: SocketRef, Data(data): Data<Todo>, ack: AckSender, todos: State<Todos>) {
61+
pub async fn update(s: SocketRef, ack: AckSender, todos: State<Todos>, Data(data): Data<Todo>) {
6262
let res = todos
6363
.get_mut(&data.id)
6464
.ok_or(Error::NotFound)
@@ -70,7 +70,7 @@ pub async fn update(s: SocketRef, Data(data): Data<Todo>, ack: AckSender, todos:
7070
ack.send(res).ok();
7171
}
7272

73-
pub async fn delete(s: SocketRef, Data(id): Data<Uuid>, ack: AckSender, todos: State<Todos>) {
73+
pub async fn delete(s: SocketRef, ack: AckSender, todos: State<Todos>, Data(id): Data<Uuid>) {
7474
let res = todos.remove(&id).ok_or(Error::NotFound).map(|_| {
7575
s.broadcast().emit("todo:deleted", id).ok();
7676
});

examples/chat/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
7070

7171
s.on(
7272
"add user",
73-
|s: SocketRef, Data::<String>(username), user_cnt: State<UserCnt>| {
73+
|s: SocketRef, user_cnt: State<UserCnt>, Data::<String>(username)| {
7474
if s.extensions.get::<Username>().is_some() {
7575
return;
7676
}

examples/hyper-echo/hyper_echo.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ fn on_connect(socket: SocketRef, Data(data): Data<PayloadValue>) {
2424

2525
socket.on(
2626
"message-with-ack",
27-
|Data::<PayloadValue>(data), ack: AckSender| {
27+
|ack: AckSender, Data::<PayloadValue>(data)| {
2828
info!("Received event: {:?}", data);
2929
ack.send(data).ok();
3030
},

examples/loco-rooms-chat/src/channels/application.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ pub async fn on_connect(socket: SocketRef) {
1818

1919
socket.on(
2020
"join",
21-
|socket: SocketRef, Data::<String>(room), store: State<state::MessageStore>| async move {
21+
|socket: SocketRef, store: State<state::MessageStore>, Data::<String>(room)| async move {
2222
tracing::info!("Received join: {:?}", room);
2323
let _ = socket.leave_all();
2424
let _ = socket.join(room.clone());
@@ -29,7 +29,7 @@ pub async fn on_connect(socket: SocketRef) {
2929

3030
socket.on(
3131
"message",
32-
|socket: SocketRef, Data::<MessageIn>(data), store: State<state::MessageStore>| async move {
32+
|socket: SocketRef, store: State<state::MessageStore>, Data::<MessageIn>(data)| async move {
3333
tracing::info!("Received message: {:?}", data);
3434

3535
let response = state::Message {

examples/private-messaging/src/handlers.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ pub fn on_connection(
5353

5454
s.on(
5555
"private message",
56-
|s: SocketRef, Data(PrivateMessageReq { to, content }), State(Messages(msg))| {
56+
|s: SocketRef, State(Messages(msg)), Data(PrivateMessageReq { to, content })| {
5757
let user_id = s.extensions.get::<Session>().unwrap().user_id;
5858
let message = Message {
5959
from: user_id,

examples/react-rooms-chat/src/main.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ async fn on_connect(socket: SocketRef) {
2727

2828
socket.on(
2929
"join",
30-
|socket: SocketRef, Data::<String>(room), store: State<state::MessageStore>| async move {
30+
|socket: SocketRef, store: State<state::MessageStore>, Data::<String>(room)| async move {
3131
info!("Received join: {:?}", room);
3232
let _ = socket.leave_all();
3333
let _ = socket.join(room.clone());
@@ -38,7 +38,7 @@ async fn on_connect(socket: SocketRef) {
3838

3939
socket.on(
4040
"message",
41-
|socket: SocketRef, Data::<MessageIn>(data), store: State<state::MessageStore>| async move {
41+
|socket: SocketRef, store: State<state::MessageStore>, Data::<MessageIn>(data)| async move {
4242
info!("Received message: {:?}", data);
4343

4444
let response = state::Message {

0 commit comments

Comments
 (0)