Skip to content

Commit 2167ac3

Browse files
committed
edit imports a bit
1 parent 8d7a3a0 commit 2167ac3

File tree

5 files changed

+35
-30
lines changed

5 files changed

+35
-30
lines changed

src/elf.rs

+14-11
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,21 @@ mod info;
77
mod strings;
88
mod version;
99

10-
use disasm::display_elf_disasm;
11-
use dynamic::display_elf_dynamic_section;
12-
use headers::{
13-
display_elf_program_headers,
14-
display_elf_section_headers,
15-
display_elf_symbol_table,
10+
use crate::{
11+
common::{hashes::display_common_hashes, hex::display_hex},
12+
elf::{
13+
disasm::display_elf_disasm,
14+
dynamic::display_elf_dynamic_section,
15+
headers::{
16+
display_elf_program_headers,
17+
display_elf_section_headers,
18+
display_elf_symbol_table,
19+
},
20+
info::display_elf_info,
21+
strings::display_elf_strings,
22+
version::display_elf_version_info,
23+
},
1624
};
17-
use info::display_elf_info;
18-
use strings::display_elf_strings;
19-
use version::display_elf_version_info;
20-
21-
use crate::common::{hashes::display_common_hashes, hex::display_hex};
2225

2326
pub struct ElfInfo<'a> {
2427
pub filepath: String,

src/elf/version.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
use goblin::elf::Elf;
2-
use std::collections::HashMap;
32
use termimad::minimad::TextTemplate;
43

54
use crate::utils::style::init_skin;

src/main.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
use clap::{value_parser, Arg, ArgAction, Command};
22
use goblin::Object;
3-
use utils::convert::convert_option_string_to_option_usize;
43
use std::path::PathBuf;
54

65
mod common;
@@ -10,6 +9,8 @@ mod utils;
109
use elf::ElfInfo;
1110
use pe::PeInfo;
1211

12+
use crate::utils::convert::convert_option_string_to_option_usize;
13+
1314
fn main() -> Result<(), goblin::error::Error> {
1415
let app_name = env!("APP_NAME");
1516
let app_version = env!("APP_VERSION");

src/pe.rs

+19-16
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,26 @@ mod info;
1010
mod strings;
1111
mod tls;
1212

13-
use debug::display_pe_debug;
14-
use disasm::display_pe_disasm;
15-
use exceptions::display_pe_exceptions;
16-
use exports::display_pe_exports;
17-
use headers::{
18-
display_pe_coff_header,
19-
display_pe_dos_header,
20-
display_pe_optional_header,
21-
display_pe_rich_header,
22-
display_pe_sections,
13+
use crate::{
14+
common::{hashes::display_common_hashes, hex::display_hex},
15+
pe::{
16+
debug::display_pe_debug,
17+
disasm::display_pe_disasm,
18+
exceptions::display_pe_exceptions,
19+
exports::display_pe_exports,
20+
headers::{
21+
display_pe_coff_header,
22+
display_pe_dos_header,
23+
display_pe_optional_header,
24+
display_pe_rich_header,
25+
display_pe_sections,
26+
},
27+
imports::display_pe_imports,
28+
info::display_pe_info,
29+
strings::display_pe_strings,
30+
tls::display_pe_tls,
31+
},
2332
};
24-
use imports::display_pe_imports;
25-
use info::display_pe_info;
26-
use strings::display_pe_strings;
27-
use tls::display_pe_tls;
28-
29-
use crate::common::{hashes::display_common_hashes, hex::display_hex};
3033

3134
pub struct PeInfo<'a> {
3235
pub filepath: String,

src/pe/imports.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
use goblin::pe::PE;
22
use termimad::minimad::TextTemplate;
3-
use std::collections::HashMap;
43

54
use crate::utils::{
65
map::{MAP_COMCTL32_ORDINAL, MAP_OLEAUT32_ORDINAL, MAP_WS2_32_ORDINAL, MAP_WSOCK32_ORDINAL},

0 commit comments

Comments
 (0)