diff options
| author | bors <bors@rust-lang.org> | 2016-07-12 06:54:46 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-12 06:54:46 -0700 |
| commit | 3085ec78487712ed77a506d9cba8d69cd3a44684 (patch) | |
| tree | e39bdd1c36af215f5a2cd65da7146f049e5252bf /src/libstd | |
| parent | 31e9ed5d6cf567557d2219add7afedae93aaf2a5 (diff) | |
| parent | bba33ecd8685e2ecb83d40abd9682d7dc2536382 (diff) | |
| download | rust-3085ec78487712ed77a506d9cba8d69cd3a44684.tar.gz rust-3085ec78487712ed77a506d9cba8d69cd3a44684.zip | |
Auto merge of #34757 - sourcefrog:debug-filetype, r=alexcrichton
Derive Debug on FileType. Partially fixes #32054
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/fs.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sys/unix/fs.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sys/windows/fs.rs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/fs.rs b/src/libstd/fs.rs index 668fa1fb303..83439b3f132 100644 --- a/src/libstd/fs.rs +++ b/src/libstd/fs.rs @@ -141,7 +141,7 @@ pub struct Permissions(fs_imp::FilePermissions); /// An structure representing a type of file with accessors for each file type. #[stable(feature = "file_type", since = "1.1.0")] -#[derive(Copy, Clone, PartialEq, Eq, Hash)] +#[derive(Copy, Clone, PartialEq, Eq, Hash, Debug)] pub struct FileType(fs_imp::FileType); /// A builder used to create directories in various manners. diff --git a/src/libstd/sys/unix/fs.rs b/src/libstd/sys/unix/fs.rs index 0524851df91..a004ff7afe1 100644 --- a/src/libstd/sys/unix/fs.rs +++ b/src/libstd/sys/unix/fs.rs @@ -84,7 +84,7 @@ pub struct OpenOptions { #[derive(Clone, PartialEq, Eq, Debug)] pub struct FilePermissions { mode: mode_t } -#[derive(Copy, Clone, PartialEq, Eq, Hash)] +#[derive(Copy, Clone, PartialEq, Eq, Hash, Debug)] pub struct FileType { mode: mode_t } pub struct DirBuilder { mode: mode_t } diff --git a/src/libstd/sys/windows/fs.rs b/src/libstd/sys/windows/fs.rs index 38a17caa2f6..2683e57256d 100644 --- a/src/libstd/sys/windows/fs.rs +++ b/src/libstd/sys/windows/fs.rs @@ -38,7 +38,7 @@ pub struct FileAttr { reparse_tag: c::DWORD, } -#[derive(Copy, Clone, PartialEq, Eq, Hash)] +#[derive(Copy, Clone, PartialEq, Eq, Hash, Debug)] pub enum FileType { Dir, File, SymlinkFile, SymlinkDir, ReparsePoint, MountPoint, } |