@@ -13,7 +13,6 @@ use crate::archive::ArchiveInner;
13
13
use crate :: error:: TarError ;
14
14
use crate :: header:: bytes2path;
15
15
use crate :: other;
16
- use crate :: pax:: pax_extensions;
17
16
use crate :: { Archive , Header , PaxExtensions } ;
18
17
19
18
/// A read-only view into an entry of an archive.
@@ -300,7 +299,7 @@ impl<'a> EntryFields<'a> {
300
299
}
301
300
None => {
302
301
if let Some ( ref pax) = self . pax_extensions {
303
- let pax = pax_extensions ( pax)
302
+ let pax = PaxExtensions :: new ( pax)
304
303
. filter_map ( |f| f. ok ( ) )
305
304
. find ( |f| f. key_bytes ( ) == b"path" )
306
305
. map ( |f| f. value_bytes ( ) ) ;
@@ -336,7 +335,7 @@ impl<'a> EntryFields<'a> {
336
335
}
337
336
None => {
338
337
if let Some ( ref pax) = self . pax_extensions {
339
- let pax = pax_extensions ( pax)
338
+ let pax = PaxExtensions :: new ( pax)
340
339
. filter_map ( |f| f. ok ( ) )
341
340
. find ( |f| f. key_bytes ( ) == b"linkpath" )
342
341
. map ( |f| f. value_bytes ( ) ) ;
@@ -358,7 +357,9 @@ impl<'a> EntryFields<'a> {
358
357
}
359
358
self . pax_extensions = Some ( self . read_all ( ) ?) ;
360
359
}
361
- Ok ( Some ( pax_extensions ( self . pax_extensions . as_ref ( ) . unwrap ( ) ) ) )
360
+ Ok ( Some ( PaxExtensions :: new (
361
+ self . pax_extensions . as_ref ( ) . unwrap ( ) ,
362
+ ) ) )
362
363
}
363
364
364
365
fn unpack_in ( & mut self , dst : & Path ) -> io:: Result < bool > {
0 commit comments