Fix merge

Author: jasonbking

src/dir.rs

@@ -227,9 +227,8 @@ impl Entry {
     /// See platform `readdir(3)` or `dirent(5)` manpage for when the file type is known;
     /// notably, some Linux filesystems don't implement this. The caller should use `stat` or
     /// `fstat` if this returns `None`.
-    #[cfg(not(any(target_os = "illumos", target_os = "solaris")))]
     pub fn file_type(&self) -> Option<Type> {
-        #[cfg(not(target_os = "illumos"))]
+        #[cfg(not(any(target_os = "illumos", target_os = "solaris")))]
         match self.0.d_type {
             libc::DT_FIFO => Some(Type::Fifo),
             libc::DT_CHR => Some(Type::CharacterDevice),
@@ -241,13 +240,8 @@ impl Entry {
             /* libc::DT_UNKNOWN | */ _ => None,
         }
 
-        // illumos systems do not have the d_type member at all:
-        #[cfg(target_os = "illumos")]
-        None
-    }
-
-    #[cfg(any(target_os = "illumos", target_os = "solaris"))]
-    pub fn file_type(&self) -> Option<Type> {
+        // illumos and Solaris systems do not have the d_type member at all:
+        #[cfg(any(target_os = "illumos", target_os = "solaris"))]
         None
     }
 }

src/errno.rs

@@ -496,8 +496,7 @@ fn desc(errno: Errno) -> &'static str {
         #[cfg(any(target_os = "freebsd", target_os = "dragonfly"))]
         EDOOFUS         => "Programming error",
 
-        #[cfg(any(target_os = "freebsd", target_os = "dragonfly",
-                  target_os = "redox"))]
+        #[cfg(any(target_os = "freebsd", target_os = "dragonfly", target_os = "redox"))]
         EMULTIHOP       => "Multihop attempted",
 
         #[cfg(any(target_os = "freebsd", target_os = "dragonfly",