Add flock shim
#3759
Add flock shim
#3759
Conversation
newpavlov
force-pushed
the
flock
branch
4 times, most recently
from
32b71a3
to
5979937
Compare
src/shims/unix/fs.rs
Outdated
| // in the `helpers` module | ||
| if lock_nb && matches!(code, ERROR_IO_PENDING | ERROR_LOCK_VIOLATION) { | ||
| let desc = format!("LockFileEx wouldblock error: {err}"); | ||
| err = io::Error::new(io::ErrorKind::WouldBlock, desc); |
There was a problem hiding this comment.
This remapping is a bit hacky, but I couldn't find a better solution. Mapping it here or in fd.rs conflicts with mapping in helpers.rs.
Also, according to LockFileEx non-blocking call should return ERROR_IO_PENDING, but in practice we get ERROR_LOCK_VIOLATION, so to be safe I remap both of those.
|
☔ The latest upstream changes (presumably #3766) made this pull request unmergeable. Please resolve the merge conflicts. |
|
There are merge commits (commits with multiple parents) in your changes. We have a no merge policy so these commits will need to be removed for this pull request to be merged. You can start a rebase with the following commands: The following commits are merge commits: |
newpavlov
force-pushed
the
flock
branch
2 times, most recently
from
9bd15b3
to
2313892
Compare
newpavlov
force-pushed
the
flock
branch
3 times, most recently
from
c4ece75
to
f4b70b0
Compare
|
@bors r+ |
|
☀️ Test successful - checks-actions |
| @@ -0,0 +1,71 @@ | |||
| // Flock tests are separate since they don't in general work on a Windows host. | |||
There was a problem hiding this comment.
The comment is confusing... CI seems to indicate that it works just fine on a windows host? It doesn't work with a windows target but that's normal for these libc tests.
There was a problem hiding this comment.
Yeah, it was copied from another test and I forgot to update it after the emulation was implemented.
flock: a bit of cleanup Follow-up to #3759
flock: a bit of cleanup Follow-up to rust-lang/miri#3759
No description provided.