Skip to content

Commit 6bed475

Browse files
committed
Use consistent interface
1 parent d1acf11 commit 6bed475

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

buildpacks/ruby/src/layers/bundle_download_layer.rs

+5-6
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
use crate::RubyBuildpack;
88
use crate::RubyBuildpackError;
99
use bullet_stream::state::SubBullet;
10-
use bullet_stream::{style, Print};
10+
use bullet_stream::Print;
1111
use cache_diff::CacheDiff;
1212
use commons::gemfile_lock::ResolvedBundlerVersion;
1313
use commons::layer::diff_migrate::DiffMigrateLayer;
@@ -80,7 +80,7 @@ pub(crate) struct MetadataV1 {
8080
}
8181

8282
fn download_bundler(
83-
bullet: Print<SubBullet<Stdout>>,
83+
mut bullet: Print<SubBullet<Stdout>>,
8484
env: &Env,
8585
metadata: &Metadata,
8686
gem_path: &Path,
@@ -103,13 +103,12 @@ fn download_bundler(
103103
"--env-shebang", // Start the `bundle` executable with `#! /usr/bin/env ruby`
104104
]);
105105

106-
let timer = bullet.start_timer(format!("Running {}", style::command(short_name)));
107-
108-
cmd.named_output()
106+
bullet
107+
.time_cmd(&mut cmd.named(short_name))
109108
.map_err(|error| fun_run::map_which_problem(error, cmd.mut_cmd(), env.get("PATH").cloned()))
110109
.map_err(RubyBuildpackError::GemInstallBundlerCommandError)?;
111110

112-
Ok(timer.done())
111+
Ok(bullet)
113112
}
114113

115114
#[cfg(test)]

0 commit comments

Comments
 (0)