@@ -6,6 +6,7 @@ use std::{
6
6
use crate :: builder:: Builder ;
7
7
use crate :: misc:: channel;
8
8
use crate :: util:: t;
9
+ use crate :: commands:: dist:: distdir;
9
10
10
11
#[ derive( Copy , Clone ) ]
11
12
pub ( crate ) enum OverlayKind {
@@ -112,7 +113,7 @@ impl<'a> Tarball<'a> {
112
113
}
113
114
114
115
fn new_inner ( builder : & ' a Builder < ' a > , component : & str , target : Option < String > ) -> Self {
115
- let pkgname = crate :: dist:: pkgname ( builder, component) ;
116
+ let pkgname = crate :: commands :: dist:: pkgname ( builder, component) ;
116
117
117
118
let mut temp_dir = builder. out . join ( "tmp" ) . join ( "tarball" ) . join ( component) ;
118
119
if let Some ( target) = & target {
@@ -265,7 +266,7 @@ impl<'a> Tarball<'a> {
265
266
t ! ( std:: fs:: rename( & self . image_dir, & dest) ) ;
266
267
267
268
self . run ( |this, cmd| {
268
- let distdir = crate :: dist :: distdir ( this. builder ) ;
269
+ let distdir = distdir ( this. builder ) ;
269
270
t ! ( std:: fs:: create_dir_all( & distdir) ) ;
270
271
cmd. arg ( "tarball" )
271
272
. arg ( "--input" )
@@ -292,7 +293,7 @@ impl<'a> Tarball<'a> {
292
293
. arg ( "--non-installed-overlay" )
293
294
. arg ( & self . overlay_dir )
294
295
. arg ( "--output-dir" )
295
- . arg ( crate :: dist :: distdir ( self . builder ) ) ;
296
+ . arg ( distdir ( self . builder ) ) ;
296
297
}
297
298
298
299
fn run ( self , build_cli : impl FnOnce ( & Tarball < ' a > , & mut Command ) ) -> GeneratedTarball {
@@ -344,7 +345,7 @@ impl<'a> Tarball<'a> {
344
345
. unwrap_or ( "gz" ) ;
345
346
346
347
GeneratedTarball {
347
- path : crate :: dist :: distdir ( self . builder ) . join ( format ! ( "{package_name}.tar.{ext}" ) ) ,
348
+ path : distdir ( self . builder ) . join ( format ! ( "{package_name}.tar.{ext}" ) ) ,
348
349
decompressed_output,
349
350
work : self . temp_dir ,
350
351
}
0 commit comments