From: Greg Burri <greg.burri@gmail.com>
Date: Mon, 28 Oct 2024 08:03:30 +0000 (+0100)
Subject: Exercise 08-05
X-Git-Url: http://git.euphorik.ch/?a=commitdiff_plain;h=c3c6732a052d83482a105dbb3ec86b0b89827785;p=rust_exercises.git

Exercise 08-05
---

diff --git a/exercises/08_futures/05_blocking/src/lib.rs b/exercises/08_futures/05_blocking/src/lib.rs
index e9b4354..8f4909a 100644
--- a/exercises/08_futures/05_blocking/src/lib.rs
+++ b/exercises/08_futures/05_blocking/src/lib.rs
@@ -2,17 +2,24 @@
 //  When running the tests, you should observe that it hangs, due to a
 //  deadlock between the caller and the server.
 //  Use `spawn_blocking` inside `echo` to resolve the issue.
-use std::io::{Read, Write};
+use std::{
+    any,
+    io::{Read, Write},
+};
 use tokio::net::TcpListener;
 
 pub async fn echo(listener: TcpListener) -> Result<(), anyhow::Error> {
     loop {
         let (socket, _) = listener.accept().await?;
         let mut socket = socket.into_std()?;
-        socket.set_nonblocking(false)?;
-        let mut buffer = Vec::new();
-        socket.read_to_end(&mut buffer)?;
-        socket.write_all(&buffer)?;
+
+        tokio::task::spawn_blocking(move || -> Result<(), anyhow::Error> {
+            socket.set_nonblocking(false)?;
+            let mut buffer = Vec::new();
+            socket.read_to_end(&mut buffer)?;
+            socket.write_all(&buffer)?;
+            Ok(())
+        });
     }
 }