Commit ac5ffa5

authored

Rollup merge of rust-lang#123057 - sthibaul:systemtime, r=jhpratt

unix fs: Make hurd using explicit new rather than From 408c0ea ("unix time module now return result") dropped the From impl for SystemTime, breaking the hurd build (and probably the horizon build) Fixes rust-lang#123032

2 parents b8e8d65 + 7b4e507 commit ac5ffa5Copy full SHA for ac5ffa5

File tree

1 file changed

-2

lines changed

library/std/src/sys/pal/unix
- fs.rs

1 file changed

-2

lines changed

`‎library/std/src/sys/pal/unix/fs.rs‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -517,7 +517,7 @@ impl FileAttr {`
`517`	`517`
`518`	`518`	`#[cfg(any(target_os = "horizon", target_os = "hurd"))]`
`519`	`519`	`pub fn modified(&self) -> io::Result<SystemTime> {`
`520`		`- Ok(SystemTime::from(self.stat.st_mtim))`
	`520`	`+ SystemTime::new(self.stat.st_mtim.tv_secasi64,self.stat.st_mtim.tv_nsecasi64)`
`521`	`521`	`}`
`522`	`522`
`523`	`523`	`#[cfg(not(any(`
`@@ -545,7 +545,7 @@ impl FileAttr {`
`545`	`545`
`546`	`546`	`#[cfg(any(target_os = "horizon", target_os = "hurd"))]`
`547`	`547`	`pub fn accessed(&self) -> io::Result<SystemTime> {`
`548`		`- Ok(SystemTime::from(self.stat.st_atim))`
	`548`	`+ SystemTime::new(self.stat.st_atim.tv_secasi64,self.stat.st_atim.tv_nsecasi64)`
`549`	`549`	`}`
`550`	`550`
`551`	`551`	`#[cfg(any(`

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 ac5ffa5

File tree

1 file changed

1 file changed

`‎library/std/src/sys/pal/unix/fs.rs‎`

0 commit comments