Merge #329

bors[bot] · mkroening · web-flow · commit 1c61526dc277 · 2022-06-29T10:05:44.000Z
329: Upgrade to nightly-2022-06-29 r=mkroening a=mkroening Closes #300. 🎉 Closes #322. Closes #320. Co-authored-by: Martin Kröning <mkroening@posteo.net>
diff --git a/hermit-sys/src/net/mod.rs b/hermit-sys/src/net/mod.rs
@@ -277,7 +277,7 @@ impl AsyncSocket {
 	}
 
 	pub(crate) async fn write(&self, buffer: &[u8]) -> Result<usize, Error> {
-		let ret = future::poll_fn(|cx| {
+		future::poll_fn(|cx| {
 			self.with(|socket| match socket.state() {
 				TcpState::FinWait1
 				| TcpState::FinWait2
@@ -296,9 +296,7 @@ impl AsyncSocket {
 				}
 			})
 		})
-		.await;
-
-		ret
+		.await
 	}
 
 	pub(crate) async fn close(&self) -> Result<(), Error> {
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,5 +1,5 @@
 [toolchain]
-channel = "nightly-2022-05-15"
+channel = "nightly-2022-06-29"
 components = [
     "rust-src",
     "llvm-tools-preview",

Original file line number	Diff line number	Diff line change
`@@ -277,7 +277,7 @@ impl AsyncSocket {`
`277`	`277`	`}`
`278`	`278`
`279`	`279`	`pub(crate) async fn write(&self, buffer: &[u8]) -> Result<usize, Error> {`
`280`		`- let ret = future::poll_fn(\|cx\| {`
	`280`	`+ future::poll_fn(\|cx\| {`
`281`	`281`	`self.with(\|socket\| match socket.state() {`
`282`	`282`	`TcpState::FinWait1`
`283`	`283`	`\| TcpState::FinWait2`
`@@ -296,9 +296,7 @@ impl AsyncSocket {`
`296`	`296`	`}`
`297`	`297`	`})`
`298`	`298`	`})`
`299`		`- .await;`
`300`		`-`
`301`		`- ret`
	`299`	`+ .await`
`302`	`300`	`}`
`303`	`301`
`304`	`302`	`pub(crate) async fn close(&self) -> Result<(), Error> {`