Skip to content

Commit 2cc7b2b

Browse files
committed
Fix compilation on Rust beta in more places.
1 parent cd966ac commit 2cc7b2b

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

cap-primitives/src/rustix/fs/set_times_impl.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
//! with setting the file times.
33
44
use crate::fs::{open, OpenOptions, SystemTimeSpec};
5-
use fs_set_times::SetTimes;
65
use rustix::io::Errno;
76
use std::path::Path;
87
use std::{fs, io};
@@ -17,7 +16,8 @@ pub(crate) fn set_times_impl(
1716
// access, so first try write.
1817
match open(start, path, OpenOptions::new().write(true)) {
1918
Ok(file) => {
20-
return file.set_times(
19+
return fs_set_times::SetTimes::set_times(
20+
&file,
2121
atime.map(SystemTimeSpec::into_std),
2222
mtime.map(SystemTimeSpec::into_std),
2323
)
@@ -31,7 +31,8 @@ pub(crate) fn set_times_impl(
3131
// Next try read.
3232
match open(start, path, OpenOptions::new().read(true)) {
3333
Ok(file) => {
34-
return file.set_times(
34+
return fs_set_times::SetTimes::set_times(
35+
&file,
3536
atime.map(SystemTimeSpec::into_std),
3637
mtime.map(SystemTimeSpec::into_std),
3738
)

cap-primitives/src/windows/fs/set_times_impl.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
use crate::fs::{open, OpenOptions, SystemTimeSpec};
2-
use fs_set_times::SetTimes;
32
use std::os::windows::fs::OpenOptionsExt;
43
use std::path::Path;
54
use std::{fs, io};
@@ -37,12 +36,13 @@ fn set_times_inner(
3736
let custom_flags = custom_flags | FILE_FLAG_BACKUP_SEMANTICS;
3837

3938
// On Windows, `set_times` requires write permissions.
40-
open(
39+
let file = open(
4140
start,
4241
path,
4342
OpenOptions::new().write(true).custom_flags(custom_flags),
44-
)?
45-
.set_times(
43+
)?;
44+
fs_set_times::SetTimes::set_times(
45+
&file,
4646
atime.map(SystemTimeSpec::into_std),
4747
mtime.map(SystemTimeSpec::into_std),
4848
)

0 commit comments

Comments
 (0)