Skip to content

Commit 0a557c6

Browse files
committed
Update dependencies
1 parent 74904b8 commit 0a557c6

File tree

2 files changed

+44
-18
lines changed

2 files changed

+44
-18
lines changed

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ image = ["dep:image"]
3333

3434
[dependencies]
3535

36-
indexmap = { version = "2.0" }
36+
indexmap = { version = "2.1" }
3737
log = { version = "0.4" }
3838
thiserror = { version = "1.0" }
39-
zerocopy = { version = "0.6" }
39+
zerocopy = { version = "0.7", features = ["derive"] }
4040
debug-ignore = { version = "1.0" }
4141

4242
[dependencies.image]

src/types.rs

Lines changed: 42 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,36 @@
44
55
use std::{mem, slice};
66

7-
use zerocopy::{AsBytes, FromBytes};
7+
use zerocopy::{AsBytes, FromBytes, FromZeroes};
88

99
#[repr(C, packed(1))]
10-
#[derive(Debug, Clone, Copy, Eq, PartialEq, Ord, PartialOrd, FromBytes, AsBytes, Default)]
10+
#[derive(
11+
Debug, Clone, Copy, Eq, PartialEq, Ord, PartialOrd, FromBytes, FromZeroes, AsBytes, Default,
12+
)]
1113
pub struct VersionU8 {
1214
pub major: u8,
1315
pub minor: u8,
1416
}
1517
#[repr(C, packed(2))]
16-
#[derive(Debug, Clone, Copy, Eq, PartialEq, Ord, PartialOrd, FromBytes, AsBytes, Default)]
18+
#[derive(
19+
Debug, Clone, Copy, Eq, PartialEq, Ord, PartialOrd, FromBytes, FromZeroes, AsBytes, Default,
20+
)]
1721
pub struct VersionU16 {
1822
pub major: u16,
1923
pub minor: u16,
2024
}
2125
#[repr(C, packed(4))]
22-
#[derive(Debug, Clone, Copy, Eq, PartialEq, Ord, PartialOrd, FromBytes, AsBytes, Default)]
26+
#[derive(
27+
Debug, Clone, Copy, Eq, PartialEq, Ord, PartialOrd, FromBytes, FromZeroes, AsBytes, Default,
28+
)]
2329
pub struct VersionU32 {
2430
pub major: u32,
2531
pub minor: u32,
2632
}
2733
#[repr(C, packed(2))]
28-
#[derive(Debug, Clone, Copy, Eq, PartialEq, Ord, PartialOrd, FromBytes, AsBytes, Default)]
34+
#[derive(
35+
Debug, Clone, Copy, Eq, PartialEq, Ord, PartialOrd, FromBytes, FromZeroes, AsBytes, Default,
36+
)]
2937
pub struct CoffHeader {
3038
pub machine: u16,
3139
pub number_of_sections: u16,
@@ -36,7 +44,9 @@ pub struct CoffHeader {
3644
pub characteristics: u16,
3745
}
3846
#[repr(C, packed(2))]
39-
#[derive(Debug, Clone, Copy, Eq, PartialEq, Ord, PartialOrd, FromBytes, AsBytes, Default)]
47+
#[derive(
48+
Debug, Clone, Copy, Eq, PartialEq, Ord, PartialOrd, FromBytes, FromZeroes, AsBytes, Default,
49+
)]
4050
pub struct StandardHeader {
4151
pub magic: u16,
4252
pub linker_version: VersionU8,
@@ -47,7 +57,7 @@ pub struct StandardHeader {
4757
pub base_of_code: u32,
4858
}
4959
#[repr(C)]
50-
#[derive(Debug, Clone, Copy, Eq, PartialEq, Ord, PartialOrd, FromBytes, Default)]
60+
#[derive(Debug, Clone, Copy, Eq, PartialEq, Ord, PartialOrd, FromBytes, FromZeroes, Default)]
5161
pub struct WindowsHeader<UXX> {
5262
pub image_base: UXX,
5363
pub section_alignment: u32,
@@ -187,14 +197,18 @@ impl GenericWindowsHeader {
187197
}
188198

189199
#[repr(C, packed(4))]
190-
#[derive(Debug, Clone, Copy, Eq, PartialEq, Ord, PartialOrd, FromBytes, AsBytes, Default)]
200+
#[derive(
201+
Debug, Clone, Copy, Eq, PartialEq, Ord, PartialOrd, FromBytes, FromZeroes, AsBytes, Default,
202+
)]
191203
pub struct ImageDataDirectory {
192204
pub virtual_address: u32,
193205
pub size: u32,
194206
}
195207

196208
#[repr(C, packed(4))]
197-
#[derive(Debug, Clone, Copy, Eq, PartialEq, Ord, PartialOrd, FromBytes, AsBytes, Default)]
209+
#[derive(
210+
Debug, Clone, Copy, Eq, PartialEq, Ord, PartialOrd, FromBytes, FromZeroes, AsBytes, Default,
211+
)]
198212
pub struct SectionHeader {
199213
pub name: u64,
200214
pub virtual_size: u32,
@@ -220,7 +234,9 @@ impl SectionHeader {
220234
}
221235

222236
#[repr(C, packed(2))]
223-
#[derive(Debug, Clone, Copy, Eq, PartialEq, Ord, PartialOrd, FromBytes, AsBytes, Default)]
237+
#[derive(
238+
Debug, Clone, Copy, Eq, PartialEq, Ord, PartialOrd, FromBytes, FromZeroes, AsBytes, Default,
239+
)]
224240
pub struct ResourceDirectoryTable {
225241
pub characteristics: u32,
226242
pub time_date_stamp: u32,
@@ -230,14 +246,18 @@ pub struct ResourceDirectoryTable {
230246
}
231247

232248
#[repr(C, packed(4))]
233-
#[derive(Debug, Clone, Copy, Eq, PartialEq, Ord, PartialOrd, FromBytes, AsBytes, Default)]
249+
#[derive(
250+
Debug, Clone, Copy, Eq, PartialEq, Ord, PartialOrd, FromBytes, FromZeroes, AsBytes, Default,
251+
)]
234252
pub struct ResourceDirectoryEntry {
235253
pub name_offset_or_integer_id: u32,
236254
pub data_entry_or_subdirectory_offset: u32,
237255
}
238256

239257
#[repr(C, packed(4))]
240-
#[derive(Debug, Clone, Copy, Eq, PartialEq, Ord, PartialOrd, FromBytes, AsBytes, Default)]
258+
#[derive(
259+
Debug, Clone, Copy, Eq, PartialEq, Ord, PartialOrd, FromBytes, FromZeroes, AsBytes, Default,
260+
)]
241261
pub struct ResourceDataEntry {
242262
pub data_rva: u32,
243263
pub size: u32,
@@ -246,15 +266,19 @@ pub struct ResourceDataEntry {
246266
}
247267

248268
#[repr(C, packed(2))]
249-
#[derive(Debug, Clone, Copy, Eq, PartialEq, Ord, PartialOrd, FromBytes, AsBytes, Default)]
269+
#[derive(
270+
Debug, Clone, Copy, Eq, PartialEq, Ord, PartialOrd, FromBytes, FromZeroes, AsBytes, Default,
271+
)]
250272
pub struct IconDirectory {
251273
pub reserved: u16,
252274
pub type_: u16,
253275
pub count: u16,
254276
}
255277

256278
#[repr(C, packed(1))]
257-
#[derive(Debug, Clone, Copy, Eq, PartialEq, Ord, PartialOrd, FromBytes, AsBytes, Default)]
279+
#[derive(
280+
Debug, Clone, Copy, Eq, PartialEq, Ord, PartialOrd, FromBytes, FromZeroes, AsBytes, Default,
281+
)]
258282
pub struct IconDirectoryEntry {
259283
pub width: u8,
260284
pub height: u8,
@@ -267,7 +291,7 @@ pub struct IconDirectoryEntry {
267291
}
268292

269293
#[repr(C, packed(4))]
270-
#[derive(Debug, Clone, Copy, Eq, PartialEq, Ord, PartialOrd, FromBytes, AsBytes)]
294+
#[derive(Debug, Clone, Copy, Eq, PartialEq, Ord, PartialOrd, FromBytes, FromZeroes, AsBytes)]
271295
pub struct FixedFileInfo {
272296
pub signature: u32,
273297
pub struct_version: VersionU16,
@@ -298,7 +322,9 @@ impl Default for FixedFileInfo {
298322
}
299323

300324
#[repr(C, packed(2))]
301-
#[derive(Debug, Clone, Copy, Eq, PartialEq, Ord, PartialOrd, FromBytes, AsBytes, Default)]
325+
#[derive(
326+
Debug, Clone, Copy, Eq, PartialEq, Ord, PartialOrd, FromBytes, FromZeroes, AsBytes, Default,
327+
)]
302328
pub struct VersionHeader {
303329
pub length: u16,
304330
pub value_length: u16,

0 commit comments

Comments
 (0)