From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
Date: Tue, 29 Mar 2022 11:23:46 +0000 (+0100)
Subject: d-bootstrap-no-assume-tools
X-Git-Tag: archive/raspbian/1.58.1+dfsg1-1+rpi1^2~12
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ff70da82abf30b98e184d8dc4f0d0168513a871c;p=rustc.git

d-bootstrap-no-assume-tools


Gbp-Pq: Name d-bootstrap-no-assume-tools.patch
---

diff --git a/src/bootstrap/builder/tests.rs b/src/bootstrap/builder/tests.rs
index bb3ea04d4a..1468c3b21d 100644
--- a/src/bootstrap/builder/tests.rs
+++ b/src/bootstrap/builder/tests.rs
@@ -277,8 +277,12 @@ mod dist {
         let a = TargetSelection::from_user("A");
         let b = TargetSelection::from_user("B");
         let mut build = Build::new(configure(&["A", "B"], &["A", "B"]));
+        let mut tools = std::collections::HashSet::new();
+        tools.insert("clippy".to_string());
+        tools.insert("rustfmt".to_string());
         build.config.docs = false;
         build.config.extended = true;
+        build.config.tools = Some(tools);
         build.hosts = vec![b];
         let mut builder = Builder::new(&build);
         builder.run_step_descriptions(&Builder::get_step_descriptions(Kind::Dist), &[]);