Rename to CoffImportFIle

crates/examples/src/objdump.rs

@@ -22,7 +22,7 @@ pub fn print<W: Write, E: Write>(
                         writeln!(w)?;
                         writeln!(w, "{}:", String::from_utf8_lossy(member.name()))?;
                         if let Ok(data) = member.data(file) {
-                            if FileKind::parse(data) == Ok(FileKind::MsImportFile) {
+                            if FileKind::parse(data) == Ok(FileKind::CoffImportFile) {
                                 dump_import(w, e, data)?;
                             } else {
                                 dump_object(w, e, data)?;
@@ -252,7 +252,7 @@ fn dump_parsed_object<W: Write, E: Write>(w: &mut W, e: &mut E, file: &object::F
 }
 
 fn dump_import<W: Write, E: Write>(w: &mut W, e: &mut E, data: &[u8]) -> Result<()> {
-    let file = match coff::MsImportFile::parse(data) {
+    let file = match coff::CoffImportFile::parse(data) {
         Ok(import) => import,
         Err(err) => {
             writeln!(e, "Failed to parse short import: {}", err)?;

src/read/coff/import.rs

@@ -9,14 +9,14 @@ use crate::{pe, ByteString, Bytes, LittleEndian as LE};
 /// A Windows short form description of a symbol to import.
 /// Used in Windows import libraries. This is not an object file.
 #[derive(Debug, Clone)]
-pub struct MsImportFile<'data> {
+pub struct CoffImportFile<'data> {
     header: &'data pe::ImportObjectHeader,
     dll: ByteString<'data>,
     symbol: ByteString<'data>,
     kind: ImportType,
     import: Option<ByteString<'data>>,
 }
-impl<'data> MsImportFile<'data> {
+impl<'data> CoffImportFile<'data> {
     /// Parse it.
     pub fn parse<R: ReadRef<'data>>(data: R) -> Result<Self> {
         let mut offset = 0;

src/read/mod.rs

@@ -156,6 +156,9 @@ pub enum FileKind {
     /// This supports a larger number of sections.
     #[cfg(feature = "coff")]
     CoffBig,
+    /// A Windows short import file.
+    #[cfg(feature = "coff")]
+    CoffImportFile,
     /// A dyld cache file containing Mach-O images.
     #[cfg(feature = "macho")]
     DyldCache,
@@ -165,9 +168,6 @@ pub enum FileKind {
     /// A 64-bit ELF file.
     #[cfg(feature = "elf")]
     Elf64,
-    /// A Windows short import file.
-    #[cfg(feature = "coff")]
-    MsImportFile,
     /// A 32-bit Mach-O file.
     #[cfg(feature = "macho")]
     MachO32,
@@ -267,7 +267,7 @@ impl FileKind {
             #[cfg(feature = "xcoff")]
             [0x01, 0xF7, ..] => FileKind::Xcoff64,
             #[cfg(feature = "coff")]
-            [0, 0, 0xFF, 0xFF, ..] => FileKind::MsImportFile,
+            [0, 0, 0xFF, 0xFF, ..] => FileKind::CoffImportFile,
             _ => return Err(Error("Unknown file magic")),
         };
         Ok(kind)