Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

file: parameterize file position #6381

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

file: parameterize file position #6381

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b8e9521
parameterize the position value.
MarcusSorealheis Mar 6, 2024
964b481
move to &mut self
MarcusSorealheis Mar 6, 2024
26fa93f
revert the change to mocks
MarcusSorealheis Mar 7, 2024
6f12186
Update tokio/src/fs/file.rs
MarcusSorealheis Mar 19, 2024
9f760c5
fix a compilation issue.
MarcusSorealheis Mar 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions tokio/src/fs/file.rs
View file
Open in desktop
Expand Up @@ -233,13 +233,14 @@ impl File {
/// let std_file = std::fs::File::open("foo.txt").unwrap();
/// let file = tokio::fs::File::from_std(std_file);
/// ```
pub fn from_std(std: StdFile) -> File {
pub fn from_std(mut std: StdFile) -> File {
let pos = std.stream_position().unwrap();
MarcusSorealheis marked this conversation as resolved.
Show resolved Hide resolved
File {
std: Arc::new(std),
inner: Mutex::new(Inner {
state: State::Idle(Some(Buf::with_capacity(0))),
last_write_err: None,
pos: 0,
pos,
}),
}
}
Expand Down
2 changes: 1 addition & 1 deletion tokio/src/fs/mocks.rs
View file
Open in desktop
Expand Up @@ -65,7 +65,7 @@ impl Read for &'_ MockFile {
}
}

impl Seek for &'_ MockFile {
impl Seek for MockFile {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems to cause a compilation failure. Most likely, you can just undo the change.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My apologies. That was a mistake. I'm currently working through/experimenting offloading to spawn_blocking

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay. Hopefully it isn't too complicated to do that. What you're doing now may be preferable if offloading is very complicated.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will resolve it in just a moment.

fn seek(&mut self, pos: SeekFrom) -> io::Result<u64> {
self.inner_seek(pos)
}
Expand Down