fix ~ touch: fix and test for windows #1319
Conversation
rivy
commented
Nov 26, 2018
rivy
commented
- fix windows compilation
- enable testing windows
- re-categorize as "generic"
src/touch/touch.rs
Outdated
| @@ -18,7 +18,9 @@ extern crate uucore; | |||
|
|
|||
| use filetime::*; | |||
| use std::fs::{self, File}; | |||
| use std::io::{self, Error}; | |||
| #[cfg(not(windows))] | |||
| use std::io::{self}; | |||
There was a problem hiding this comment.
This can just be use std::io;
src/touch/touch.rs
Outdated
| @@ -52,7 +55,7 @@ macro_rules! to_timeval { | |||
| } | |||
|
|
|||
| #[cfg(unix)] | |||
| fn set_symlink_times(p: &str, atime: FileTime, mtime: FileTime) -> io::Result<()> { | |||
| fn set_symlink_file_times(p: &str, atime: FileTime, mtime: FileTime) -> io::Result<()> { | |||
There was a problem hiding this comment.
I don't think this function as actually necessary even on Unix. set_symlink_file_times() in filetime seems to say it does the same thing.
|
@Arcterus , I'll review and update the code this weekend. Thanks for getting back to it. |
src/touch/touch.rs
Outdated
| @@ -42,6 +44,7 @@ macro_rules! local_tm_to_filetime( | |||
| }) | |||
| ); | |||
|
|
|||
| #[cfg(unix)] | |||
There was a problem hiding this comment.
Because the other function is now gone, this macro actually isn't used anywhere now, so it can be deleted too.
src/touch/touch.rs
Outdated
| use std::io::{self, Error}; | ||
| #[cfg(not(windows))] | ||
| use std::io; | ||
| use std::io::{Error}; |
There was a problem hiding this comment.
Sorry, I missed this one. Can you remove the braces around Error?
|
I squashed the code change and dead-code removal into a single commit. |
|
Looks good, thanks! |
