Commit 09e9984

committed

Implement Clone for File.

Implement `Clone` for `File` so that `File`s can be passed into closures for use in `spawn_blocking`. `File`'s contents are already wrapped in `Arc`s, so the implementation of `clone` is straightforward. This also aligns with `TcpStream` which already implements `Clone` using its internal `Arc`.

1 parent b210ee3 commit 09e9984Copy full SHA for 09e9984

File tree

1 file changed

+25

-0

lines changed

src/fs
- file.rs

1 file changed

+25

-0

lines changed

`‎src/fs/file.rs`

Lines changed: 25 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,7 @@ use crate::utils::Context as _;`
`58`	`58`	`/// #`
`59`	`59`	`/// # Ok(()) }) }`
`60`	`60`	/// ```
	`61`	`+#[derive(Clone)]`
`61`	`62`	`pub struct File {`
`62`	`63`	`/// A reference to the inner file.`
`63`	`64`	`file: Arc<std::fs::File>,`
`@@ -470,6 +471,13 @@ struct Lock<T>(Arc<LockState<T>>);`
`470`	`471`	`unsafe impl<T: Send> Send for Lock<T> {}`
`471`	`472`	`unsafe impl<T: Send> Sync for Lock<T> {}`
`472`	`473`
	`474`	`+impl<T> Clone for Lock<T> {`
	`475`	`+ #[inline]`
	`476`	`+ fn clone(&self) -> Self {`
	`477`	`+ Self(Arc::clone(&self.0))`
	`478`	`+ }`
	`479`	`+}`
	`480`	`+`
`473`	`481`	`/// The state of a lock.`
`474`	`482`	`struct LockState<T> {`
`475`	`483`	/// Set to `true` when locked.
`@@ -878,4 +886,21 @@ mod tests {`
`878`	`886`	`File::open(file!()).await.unwrap();`
`879`	`887`	`});`
`880`	`888`	`}`
	`889`	`+`
	`890`	`+ #[test]`
	`891`	`+ fn async_file_clone() {`
	`892`	`+ crate::task::block_on(async move {`
	`893`	`+ let file = File::open(file!()).await.unwrap();`
	`894`	`+ let mut clone = file.clone();`
	`895`	`+ let len = crate::task::spawn_blocking(move \|\| {`
	`896`	`+ let mut buf = Vec::new();`
	`897`	`+ crate::task::block_on(async move {`
	`898`	`+ clone.read_to_end(&mut buf).await.unwrap();`
	`899`	`+ drop(clone);`
	`900`	`+ buf.len()`
	`901`	`+ })`
	`902`	`+ }).await;`
	`903`	`+ assert_eq!(len as u64, file.metadata().await.unwrap().len());`
	`904`	`+ });`
	`905`	`+ }`
`881`	`906`	`}`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 09e9984

File tree

1 file changed

1 file changed

`‎src/fs/file.rs`

0 commit comments