@@ -200,8 +200,9 @@ impl DockerPaths {
200
200
metadata : CargoMetadata ,
201
201
cwd : PathBuf ,
202
202
toolchain : QualifiedToolchain ,
203
+ msg_info : & mut MessageInfo ,
203
204
) -> Result < Self > {
204
- let mount_finder = MountFinder :: create ( engine) ?;
205
+ let mount_finder = MountFinder :: create ( engine, msg_info ) ?;
205
206
let ( directories, metadata) =
206
207
Directories :: assemble ( & mount_finder, metadata, & cwd, toolchain) ?;
207
208
Ok ( Self {
@@ -1325,7 +1326,10 @@ pub(crate) fn get_image(config: &Config, target: &Target, uses_zig: bool) -> Res
1325
1326
Ok ( image)
1326
1327
}
1327
1328
1328
- fn docker_read_mount_paths ( engine : & Engine ) -> Result < Vec < MountDetail > > {
1329
+ fn docker_read_mount_paths (
1330
+ engine : & Engine ,
1331
+ msg_info : & mut MessageInfo ,
1332
+ ) -> Result < Vec < MountDetail > > {
1329
1333
let hostname = env:: var ( "HOSTNAME" ) . wrap_err ( "HOSTNAME environment variable not found" ) ?;
1330
1334
1331
1335
let mut docker: Command = {
@@ -1334,7 +1338,7 @@ fn docker_read_mount_paths(engine: &Engine) -> Result<Vec<MountDetail>> {
1334
1338
command
1335
1339
} ;
1336
1340
1337
- let output = docker. run_and_get_stdout ( & mut Verbosity :: Quiet . into ( ) ) ?;
1341
+ let output = docker. run_and_get_stdout ( msg_info ) ?;
1338
1342
let info = serde_json:: from_str ( & output) . wrap_err ( "failed to parse docker inspect output" ) ?;
1339
1343
dockerinfo_parse_mounts ( & info)
1340
1344
}
@@ -1410,9 +1414,9 @@ impl MountFinder {
1410
1414
MountFinder { mounts }
1411
1415
}
1412
1416
1413
- pub fn create ( engine : & Engine ) -> Result < MountFinder > {
1417
+ pub fn create ( engine : & Engine , msg_info : & mut MessageInfo ) -> Result < MountFinder > {
1414
1418
Ok ( if engine. in_docker {
1415
- MountFinder :: new ( docker_read_mount_paths ( engine) ?)
1419
+ MountFinder :: new ( docker_read_mount_paths ( engine, msg_info ) ?)
1416
1420
} else {
1417
1421
MountFinder :: default ( )
1418
1422
} )
@@ -1695,12 +1699,12 @@ mod tests {
1695
1699
return Ok ( ( ) ) ;
1696
1700
}
1697
1701
1698
- let mount_finder = MountFinder :: create ( & engine) ?;
1702
+ let mount_finder = MountFinder :: create ( & engine, & mut msg_info ) ?;
1699
1703
let metadata = cargo_metadata ( true , & mut msg_info) ?;
1700
1704
let ( directories, _) = get_directories ( metadata, & mount_finder) ?;
1701
1705
let toolchain_dirs = directories. toolchain_directories ( ) ;
1702
1706
let package_dirs = directories. package_directories ( ) ;
1703
- let mount_finder = MountFinder :: new ( docker_read_mount_paths ( & engine) ?) ;
1707
+ let mount_finder = MountFinder :: new ( docker_read_mount_paths ( & engine, & mut msg_info ) ?) ;
1704
1708
let mount_path = |p| mount_finder. find_mount_path ( p) ;
1705
1709
1706
1710
paths_equal ( toolchain_dirs. cargo ( ) , & mount_path ( home ( ) ?. join ( ".cargo" ) ) ) ?;
0 commit comments