From 286ac5ca59f43982d4f754bc09565a9559f685c4 Mon Sep 17 00:00:00 2001
From: Denis Cornehl <denis@cornehl.org>
Date: Sun, 13 Oct 2024 12:08:17 +0200
Subject: [PATCH] upgrade rustwide to 0.18.0, capture output for more errors

---
 Cargo.lock                         | 4 ++--
 Cargo.toml                         | 2 +-
 src/docbuilder/rustwide_builder.rs | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 553309cc8..2eef66457 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5453,9 +5453,9 @@ checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
 
 [[package]]
 name = "rustwide"
-version = "0.17.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af779495d93498c4a328950fe9e09c403dd5eb3beedd49dcfa9aa8fdd3b577c3"
+checksum = "a5bfcfc09bb16fa66d66fca9a8ea65471447bf9dbf76a28688922500c7937b0f"
 dependencies = [
  "anyhow",
  "attohttpc",
diff --git a/Cargo.toml b/Cargo.toml
index 900b1975a..e572aa4dd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -45,7 +45,7 @@ comrak = { version = "0.29.0", default-features = false }
 syntect = { version = "5.0.0", default-features = false, features = ["parsing", "html", "dump-load", "regex-onig"] }
 toml = "0.8.0"
 prometheus = { version = "0.13.0", default-features = false }
-rustwide = { version = "0.17.0", features = ["unstable-toolchain-ci", "unstable"] }
+rustwide = { version = "0.18.0", features = ["unstable-toolchain-ci", "unstable"] }
 mime_guess = "2"
 zstd = "0.13.0"
 hostname = "0.4.0"
diff --git a/src/docbuilder/rustwide_builder.rs b/src/docbuilder/rustwide_builder.rs
index 0b3fdd79f..055e0ae33 100644
--- a/src/docbuilder/rustwide_builder.rs
+++ b/src/docbuilder/rustwide_builder.rs
@@ -507,14 +507,14 @@ impl RustwideBuilder {
                         Command::new(&self.workspace, self.toolchain.cargo())
                             .cd(build.host_source_dir())
                             .args(&["generate-lockfile"])
-                            .run()?;
+                            .run_capture()?;
                     }
                     {
                         let _span = info_span!("cargo fetch --locked").entered();
                         Command::new(&self.workspace, self.toolchain.cargo())
                             .cd(build.host_source_dir())
                             .args(&["fetch", "--locked"])
-                            .run()?;
+                            .run_capture()?;
                     }
                     res =
                         self.execute_build(default_target, true, build, &limits, &metadata, false)?;