Simplify Drop implementation for File

link2xt · link2xt · commit 5f1260f8d2de · 2022-07-17T12:17:06.000Z
Do not try to spawn new tasks as this sometimes
leads to deadlocks on 1-CPU machines, in particular VMs
and old Android phones.
diff --git 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();
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@ use crate::fs::{Metadata, Permissions};`
`11`	`11`	`use crate::future;`
`12`	`12`	`use crate::io::{self, Read, Seek, SeekFrom, Write};`
`13`	`13`	`use crate::path::Path;`
`14`		`-use crate::prelude::*;`
`15`	`14`	`use crate::task::{spawn_blocking, Context, Poll, Waker};`
`16`	`15`	`use crate::utils::Context as _;`
`17`	`16`
`@@ -315,7 +314,7 @@ impl Drop for File {`
`315`	`314`	`// non-blocking fashion, but our only other option here is losing data remaining in the`
`316`	`315`	`// write cache. Good task schedulers should be resilient to occasional blocking hiccups in`
`317`	`316`	`// file destructors so we don't expect this to be a common problem in practice.`
`318`		`- let _ = futures_lite::future::block_on(self.flush());`
	`317`	`+ (&*self.file).flush().ok();`
`319`	`318`	`}`
`320`	`319`	`}`
`321`	`320`