Skip to content

Commit 01c8b19

Browse files
philipcphilipc
committed
cargo fmt
1 parent 36eda2b commit 01c8b19

File tree

7 files changed

+350
-70
lines changed

7 files changed

+350
-70
lines changed

‎src/read/any.rs

Lines changed: 50 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -307,16 +307,56 @@ impl<'data, R> Object<'data> for File<'data, R>
307307
where
308308
R: ReadRef<'data>,
309309
{
310-
type Segment<'file> = Segment<'data, 'file, R> where Self: 'file, 'data: 'file;
311-
type SegmentIterator<'file> = SegmentIterator<'data, 'file, R> where Self: 'file, 'data: 'file;
312-
type Section<'file> = Section<'data, 'file, R> where Self: 'file, 'data: 'file;
313-
type SectionIterator<'file> = SectionIterator<'data, 'file, R> where Self: 'file, 'data: 'file;
314-
type Comdat<'file> = Comdat<'data, 'file, R> where Self: 'file, 'data: 'file;
315-
type ComdatIterator<'file> = ComdatIterator<'data, 'file, R> where Self: 'file, 'data: 'file;
316-
type Symbol<'file> = Symbol<'data, 'file, R> where Self: 'file, 'data: 'file;
317-
type SymbolIterator<'file> = SymbolIterator<'data, 'file, R> where Self: 'file, 'data: 'file;
318-
type SymbolTable<'file> = SymbolTable<'data, 'file, R> where Self: 'file, 'data: 'file;
319-
type DynamicRelocationIterator<'file> = DynamicRelocationIterator<'data, 'file, R> where Self: 'file, 'data: 'file;
310+
type Segment<'file>
311+
= Segment<'data, 'file, R>
312+
where
313+
Self: 'file,
314+
'data: 'file;
315+
type SegmentIterator<'file>
316+
= SegmentIterator<'data, 'file, R>
317+
where
318+
Self: 'file,
319+
'data: 'file;
320+
type Section<'file>
321+
= Section<'data, 'file, R>
322+
where
323+
Self: 'file,
324+
'data: 'file;
325+
type SectionIterator<'file>
326+
= SectionIterator<'data, 'file, R>
327+
where
328+
Self: 'file,
329+
'data: 'file;
330+
type Comdat<'file>
331+
= Comdat<'data, 'file, R>
332+
where
333+
Self: 'file,
334+
'data: 'file;
335+
type ComdatIterator<'file>
336+
= ComdatIterator<'data, 'file, R>
337+
where
338+
Self: 'file,
339+
'data: 'file;
340+
type Symbol<'file>
341+
= Symbol<'data, 'file, R>
342+
where
343+
Self: 'file,
344+
'data: 'file;
345+
type SymbolIterator<'file>
346+
= SymbolIterator<'data, 'file, R>
347+
where
348+
Self: 'file,
349+
'data: 'file;
350+
type SymbolTable<'file>
351+
= SymbolTable<'data, 'file, R>
352+
where
353+
Self: 'file,
354+
'data: 'file;
355+
type DynamicRelocationIterator<'file>
356+
= DynamicRelocationIterator<'data, 'file, R>
357+
where
358+
Self: 'file,
359+
'data: 'file;
320360

321361
fn architecture(&self) -> Architecture {
322362
with_inner!(self, File, |x| x.architecture())

‎src/read/coff/file.rs

Lines changed: 50 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -90,16 +90,56 @@ where
9090
R: ReadRef<'data>,
9191
Coff: CoffHeader,
9292
{
93-
type Segment<'file> = CoffSegment<'data, 'file, R, Coff> where Self: 'file, 'data: 'file;
94-
type SegmentIterator<'file> = CoffSegmentIterator<'data, 'file, R, Coff> where Self: 'file, 'data: 'file;
95-
type Section<'file> = CoffSection<'data, 'file, R, Coff> where Self: 'file, 'data: 'file;
96-
type SectionIterator<'file> = CoffSectionIterator<'data, 'file, R, Coff> where Self: 'file, 'data: 'file;
97-
type Comdat<'file> = CoffComdat<'data, 'file, R, Coff> where Self: 'file, 'data: 'file;
98-
type ComdatIterator<'file> = CoffComdatIterator<'data, 'file, R, Coff> where Self: 'file, 'data: 'file;
99-
type Symbol<'file> = CoffSymbol<'data, 'file, R, Coff> where Self: 'file, 'data: 'file;
100-
type SymbolIterator<'file> = CoffSymbolIterator<'data, 'file, R, Coff> where Self: 'file, 'data: 'file;
101-
type SymbolTable<'file> = CoffSymbolTable<'data, 'file, R, Coff> where Self: 'file, 'data: 'file;
102-
type DynamicRelocationIterator<'file> = NoDynamicRelocationIterator where Self: 'file, 'data: 'file;
93+
type Segment<'file>
94+
= CoffSegment<'data, 'file, R, Coff>
95+
where
96+
Self: 'file,
97+
'data: 'file;
98+
type SegmentIterator<'file>
99+
= CoffSegmentIterator<'data, 'file, R, Coff>
100+
where
101+
Self: 'file,
102+
'data: 'file;
103+
type Section<'file>
104+
= CoffSection<'data, 'file, R, Coff>
105+
where
106+
Self: 'file,
107+
'data: 'file;
108+
type SectionIterator<'file>
109+
= CoffSectionIterator<'data, 'file, R, Coff>
110+
where
111+
Self: 'file,
112+
'data: 'file;
113+
type Comdat<'file>
114+
= CoffComdat<'data, 'file, R, Coff>
115+
where
116+
Self: 'file,
117+
'data: 'file;
118+
type ComdatIterator<'file>
119+
= CoffComdatIterator<'data, 'file, R, Coff>
120+
where
121+
Self: 'file,
122+
'data: 'file;
123+
type Symbol<'file>
124+
= CoffSymbol<'data, 'file, R, Coff>
125+
where
126+
Self: 'file,
127+
'data: 'file;
128+
type SymbolIterator<'file>
129+
= CoffSymbolIterator<'data, 'file, R, Coff>
130+
where
131+
Self: 'file,
132+
'data: 'file;
133+
type SymbolTable<'file>
134+
= CoffSymbolTable<'data, 'file, R, Coff>
135+
where
136+
Self: 'file,
137+
'data: 'file;
138+
type DynamicRelocationIterator<'file>
139+
= NoDynamicRelocationIterator
140+
where
141+
Self: 'file,
142+
'data: 'file;
103143

104144
fn architecture(&self) -> Architecture {
105145
match self.header.machine() {

‎src/read/elf/file.rs

Lines changed: 50 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -187,16 +187,56 @@ where
187187
Elf: FileHeader,
188188
R: ReadRef<'data>,
189189
{
190-
type Segment<'file> = ElfSegment<'data, 'file, Elf, R> where Self: 'file, 'data: 'file;
191-
type SegmentIterator<'file> = ElfSegmentIterator<'data, 'file, Elf, R> where Self: 'file, 'data: 'file;
192-
type Section<'file> = ElfSection<'data, 'file, Elf, R> where Self: 'file, 'data: 'file;
193-
type SectionIterator<'file> = ElfSectionIterator<'data, 'file, Elf, R> where Self: 'file, 'data: 'file;
194-
type Comdat<'file> = ElfComdat<'data, 'file, Elf, R> where Self: 'file, 'data: 'file;
195-
type ComdatIterator<'file> = ElfComdatIterator<'data, 'file, Elf, R> where Self: 'file, 'data: 'file;
196-
type Symbol<'file> = ElfSymbol<'data, 'file, Elf, R> where Self: 'file, 'data: 'file;
197-
type SymbolIterator<'file> = ElfSymbolIterator<'data, 'file, Elf, R> where Self: 'file, 'data: 'file;
198-
type SymbolTable<'file> = ElfSymbolTable<'data, 'file, Elf, R> where Self: 'file, 'data: 'file;
199-
type DynamicRelocationIterator<'file> = ElfDynamicRelocationIterator<'data, 'file, Elf, R> where Self: 'file, 'data: 'file;
190+
type Segment<'file>
191+
= ElfSegment<'data, 'file, Elf, R>
192+
where
193+
Self: 'file,
194+
'data: 'file;
195+
type SegmentIterator<'file>
196+
= ElfSegmentIterator<'data, 'file, Elf, R>
197+
where
198+
Self: 'file,
199+
'data: 'file;
200+
type Section<'file>
201+
= ElfSection<'data, 'file, Elf, R>
202+
where
203+
Self: 'file,
204+
'data: 'file;
205+
type SectionIterator<'file>
206+
= ElfSectionIterator<'data, 'file, Elf, R>
207+
where
208+
Self: 'file,
209+
'data: 'file;
210+
type Comdat<'file>
211+
= ElfComdat<'data, 'file, Elf, R>
212+
where
213+
Self: 'file,
214+
'data: 'file;
215+
type ComdatIterator<'file>
216+
= ElfComdatIterator<'data, 'file, Elf, R>
217+
where
218+
Self: 'file,
219+
'data: 'file;
220+
type Symbol<'file>
221+
= ElfSymbol<'data, 'file, Elf, R>
222+
where
223+
Self: 'file,
224+
'data: 'file;
225+
type SymbolIterator<'file>
226+
= ElfSymbolIterator<'data, 'file, Elf, R>
227+
where
228+
Self: 'file,
229+
'data: 'file;
230+
type SymbolTable<'file>
231+
= ElfSymbolTable<'data, 'file, Elf, R>
232+
where
233+
Self: 'file,
234+
'data: 'file;
235+
type DynamicRelocationIterator<'file>
236+
= ElfDynamicRelocationIterator<'data, 'file, Elf, R>
237+
where
238+
Self: 'file,
239+
'data: 'file;
200240

201241
fn architecture(&self) -> Architecture {
202242
match (

‎src/read/macho/file.rs

Lines changed: 50 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -221,16 +221,56 @@ where
221221
Mach: MachHeader,
222222
R: ReadRef<'data>,
223223
{
224-
type Segment<'file> = MachOSegment<'data, 'file, Mach, R> where Self: 'file, 'data: 'file;
225-
type SegmentIterator<'file> = MachOSegmentIterator<'data, 'file, Mach, R> where Self: 'file, 'data: 'file;
226-
type Section<'file> = MachOSection<'data, 'file, Mach, R> where Self: 'file, 'data: 'file;
227-
type SectionIterator<'file> = MachOSectionIterator<'data, 'file, Mach, R> where Self: 'file, 'data: 'file;
228-
type Comdat<'file> = MachOComdat<'data, 'file, Mach, R> where Self: 'file, 'data: 'file;
229-
type ComdatIterator<'file> = MachOComdatIterator<'data, 'file, Mach, R> where Self: 'file, 'data: 'file;
230-
type Symbol<'file> = MachOSymbol<'data, 'file, Mach, R> where Self: 'file, 'data: 'file;
231-
type SymbolIterator<'file> = MachOSymbolIterator<'data, 'file, Mach, R> where Self: 'file, 'data: 'file;
232-
type SymbolTable<'file> = MachOSymbolTable<'data, 'file, Mach, R> where Self: 'file, 'data: 'file;
233-
type DynamicRelocationIterator<'file> = NoDynamicRelocationIterator where Self: 'file, 'data: 'file;
224+
type Segment<'file>
225+
= MachOSegment<'data, 'file, Mach, R>
226+
where
227+
Self: 'file,
228+
'data: 'file;
229+
type SegmentIterator<'file>
230+
= MachOSegmentIterator<'data, 'file, Mach, R>
231+
where
232+
Self: 'file,
233+
'data: 'file;
234+
type Section<'file>
235+
= MachOSection<'data, 'file, Mach, R>
236+
where
237+
Self: 'file,
238+
'data: 'file;
239+
type SectionIterator<'file>
240+
= MachOSectionIterator<'data, 'file, Mach, R>
241+
where
242+
Self: 'file,
243+
'data: 'file;
244+
type Comdat<'file>
245+
= MachOComdat<'data, 'file, Mach, R>
246+
where
247+
Self: 'file,
248+
'data: 'file;
249+
type ComdatIterator<'file>
250+
= MachOComdatIterator<'data, 'file, Mach, R>
251+
where
252+
Self: 'file,
253+
'data: 'file;
254+
type Symbol<'file>
255+
= MachOSymbol<'data, 'file, Mach, R>
256+
where
257+
Self: 'file,
258+
'data: 'file;
259+
type SymbolIterator<'file>
260+
= MachOSymbolIterator<'data, 'file, Mach, R>
261+
where
262+
Self: 'file,
263+
'data: 'file;
264+
type SymbolTable<'file>
265+
= MachOSymbolTable<'data, 'file, Mach, R>
266+
where
267+
Self: 'file,
268+
'data: 'file;
269+
type DynamicRelocationIterator<'file>
270+
= NoDynamicRelocationIterator
271+
where
272+
Self: 'file,
273+
'data: 'file;
234274

235275
fn architecture(&self) -> Architecture {
236276
match self.header.cputype(self.endian) {

‎src/read/pe/file.rs

Lines changed: 50 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -143,16 +143,56 @@ where
143143
Pe: ImageNtHeaders,
144144
R: ReadRef<'data>,
145145
{
146-
type Segment<'file> = PeSegment<'data, 'file, Pe, R> where Self: 'file, 'data: 'file;
147-
type SegmentIterator<'file> = PeSegmentIterator<'data, 'file, Pe, R> where Self: 'file, 'data: 'file;
148-
type Section<'file> = PeSection<'data, 'file, Pe, R> where Self: 'file, 'data: 'file;
149-
type SectionIterator<'file> = PeSectionIterator<'data, 'file, Pe, R> where Self: 'file, 'data: 'file;
150-
type Comdat<'file> = PeComdat<'data, 'file, Pe, R> where Self: 'file, 'data: 'file;
151-
type ComdatIterator<'file> = PeComdatIterator<'data, 'file, Pe, R> where Self: 'file, 'data: 'file;
152-
type Symbol<'file> = CoffSymbol<'data, 'file, R> where Self: 'file, 'data: 'file;
153-
type SymbolIterator<'file> = CoffSymbolIterator<'data, 'file, R> where Self: 'file, 'data: 'file;
154-
type SymbolTable<'file> = CoffSymbolTable<'data, 'file, R> where Self: 'file, 'data: 'file;
155-
type DynamicRelocationIterator<'file> = NoDynamicRelocationIterator where Self: 'file, 'data: 'file;
146+
type Segment<'file>
147+
= PeSegment<'data, 'file, Pe, R>
148+
where
149+
Self: 'file,
150+
'data: 'file;
151+
type SegmentIterator<'file>
152+
= PeSegmentIterator<'data, 'file, Pe, R>
153+
where
154+
Self: 'file,
155+
'data: 'file;
156+
type Section<'file>
157+
= PeSection<'data, 'file, Pe, R>
158+
where
159+
Self: 'file,
160+
'data: 'file;
161+
type SectionIterator<'file>
162+
= PeSectionIterator<'data, 'file, Pe, R>
163+
where
164+
Self: 'file,
165+
'data: 'file;
166+
type Comdat<'file>
167+
= PeComdat<'data, 'file, Pe, R>
168+
where
169+
Self: 'file,
170+
'data: 'file;
171+
type ComdatIterator<'file>
172+
= PeComdatIterator<'data, 'file, Pe, R>
173+
where
174+
Self: 'file,
175+
'data: 'file;
176+
type Symbol<'file>
177+
= CoffSymbol<'data, 'file, R>
178+
where
179+
Self: 'file,
180+
'data: 'file;
181+
type SymbolIterator<'file>
182+
= CoffSymbolIterator<'data, 'file, R>
183+
where
184+
Self: 'file,
185+
'data: 'file;
186+
type SymbolTable<'file>
187+
= CoffSymbolTable<'data, 'file, R>
188+
where
189+
Self: 'file,
190+
'data: 'file;
191+
type DynamicRelocationIterator<'file>
192+
= NoDynamicRelocationIterator
193+
where
194+
Self: 'file,
195+
'data: 'file;
156196

157197
fn architecture(&self) -> Architecture {
158198
match self.nt_headers.file_header().machine.get(LE) {

0 commit comments

Comments
 (0)