From 8031644e65647bdc3a6a0561ad31da9228e9723d Mon Sep 17 00:00:00 2001 From: Yusuke Tanaka Date: Fri, 18 Jun 2021 04:56:30 +0900 Subject: chore: upgrade Rust to 1.53.0 (#11021) --- runtime/ops/io.rs | 4 ++-- runtime/web_worker.rs | 6 ++---- runtime/worker.rs | 6 ++---- 3 files changed, 6 insertions(+), 10 deletions(-) (limited to 'runtime') diff --git a/runtime/ops/io.rs b/runtime/ops/io.rs index d9f21e1f5..18279c0eb 100644 --- a/runtime/ops/io.rs +++ b/runtime/ops/io.rs @@ -429,7 +429,7 @@ impl StdFileResource { .borrow_mut() .await; let nwritten = fs_file.0.as_mut().unwrap().read(buf).await?; - return Ok(nwritten); + Ok(nwritten) } else { Err(resource_unavailable()) } @@ -442,7 +442,7 @@ impl StdFileResource { .await; let nwritten = fs_file.0.as_mut().unwrap().write(buf).await?; fs_file.0.as_mut().unwrap().flush().await?; - return Ok(nwritten); + Ok(nwritten) } else { Err(resource_unavailable()) } diff --git a/runtime/web_worker.rs b/runtime/web_worker.rs index 948d063fc..7a58314a9 100644 --- a/runtime/web_worker.rs +++ b/runtime/web_worker.rs @@ -408,8 +408,7 @@ impl WebWorker { // If `None` is returned it means that runtime was destroyed before // evaluation was complete. This can happen in Web Worker when `self.close()` // is called at top level. - let result = maybe_result.unwrap_or(Ok(())); - return result; + maybe_result.unwrap_or(Ok(())) } event_loop_result = self.run_event_loop(false) => { @@ -418,8 +417,7 @@ impl WebWorker { } event_loop_result?; let maybe_result = receiver.next().await; - let result = maybe_result.unwrap_or(Ok(())); - return result; + maybe_result.unwrap_or(Ok(())) } } } diff --git a/runtime/worker.rs b/runtime/worker.rs index 83594fc4a..3d7640404 100644 --- a/runtime/worker.rs +++ b/runtime/worker.rs @@ -215,15 +215,13 @@ impl MainWorker { tokio::select! { maybe_result = receiver.next() => { debug!("received module evaluate {:#?}", maybe_result); - let result = maybe_result.expect("Module evaluation result not provided."); - return result; + maybe_result.expect("Module evaluation result not provided.") } event_loop_result = self.run_event_loop(false) => { event_loop_result?; let maybe_result = receiver.next().await; - let result = maybe_result.expect("Module evaluation result not provided."); - return result; + maybe_result.expect("Module evaluation result not provided.") } } } -- cgit v1.2.3