From fe7a343d3bbf6e12af7d4b0a504d8714ac479460 Mon Sep 17 00:00:00 2001
From: link2xt <link2xt@testrun.org>
Date: Sun, 17 Jul 2022 12:17:06 +0000
Subject: [PATCH] Simplify Drop implementation for File

Do not try to spawn new tasks as this sometimes
leads to deadlocks on 1-CPU machines, in particular VMs
and old Android phones.
---
 src/fs/file.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/fs/file.rs b/src/fs/file.rs
index 9a4ab77b4..b83475c4f 100644
--- a/src/fs/file.rs
+++ b/src/fs/file.rs
@@ -11,7 +11,6 @@ use crate::fs::{Metadata, Permissions};
 use crate::future;
 use crate::io::{self, Read, Seek, SeekFrom, Write};
 use crate::path::Path;
-use crate::prelude::*;
 use crate::task::{spawn_blocking, Context, Poll, Waker};
 use crate::utils::Context as _;
 
@@ -315,7 +314,7 @@ impl Drop for File {
         // non-blocking fashion, but our only other option here is losing data remaining in the
         // write cache. Good task schedulers should be resilient to occasional blocking hiccups in
         // file destructors so we don't expect this to be a common problem in practice.
-        let _ = futures_lite::future::block_on(self.flush());
+        (&*self.file).flush().ok();
     }
 }
 
@@ -883,6 +882,7 @@ impl LockGuard<State> {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::prelude::*;
 
     #[test]
     fn async_file_drop() {