Skip to content

Commit e58ee86

Browse files
committed
docker: fix the root cause instead of the proximate cause
1 parent d35beb1 commit e58ee86

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

src/bin/cratesfyi.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ pub fn main() {
182182
}
183183

184184
let mut builder = RustwideBuilder::init().unwrap();
185-
builder.add_essential_files().expect("failed to add essential files");
185+
builder.update_toolchain().expect("failed to add essential files");
186186
} else if let Some(_) = matches.subcommand_matches("lock") {
187187
docbuilder.lock().expect("Failed to lock");
188188
} else if let Some(_) = matches.subcommand_matches("unlock") {

src/docbuilder/rustwide_builder.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ impl RustwideBuilder {
9393
})
9494
}
9595

96-
fn update_toolchain(&mut self) -> Result<()> {
96+
pub fn update_toolchain(&mut self) -> Result<()> {
9797
// Ignore errors if detection fails.
9898
let old_version = self.detect_rustc_version().ok();
9999

@@ -112,7 +112,6 @@ impl RustwideBuilder {
112112

113113
fn detect_rustc_version(&self) -> Result<String> {
114114
info!("detecting rustc's version...");
115-
self.toolchain.install(&self.workspace)?;
116115
let res = Command::new(&self.workspace, self.toolchain.rustc())
117116
.args(&["--version"])
118117
.log_output(false)
@@ -128,7 +127,7 @@ impl RustwideBuilder {
128127
}
129128
}
130129

131-
pub fn add_essential_files(&mut self) -> Result<()> {
130+
fn add_essential_files(&mut self) -> Result<()> {
132131
self.rustc_version = self.detect_rustc_version()?;
133132
let rustc_version = parse_rustc_version(&self.rustc_version)?;
134133

0 commit comments

Comments
 (0)