From 601d24810e89efd42f7cd69d4a7ccecd4e35364d Mon Sep 17 00:00:00 2001 From: Eric Huss Date: Tue, 22 Jun 2021 22:10:25 -0700 Subject: [PATCH 1/2] Don't dist miri on stable or beta. --- src/bootstrap/dist.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs index 71ed0af4a7c04..e0c33f7357741 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -1171,6 +1171,9 @@ impl Step for Miri { } fn run(self, builder: &Builder<'_>) -> Option { + if !builder.build.unstable_features() { + return None; + } let compiler = self.compiler; let target = self.target; assert!(builder.config.extended); From 6aa79a34d87252deaae11e75663e5740a22f14ea Mon Sep 17 00:00:00 2001 From: Eric Huss Date: Wed, 23 Jun 2021 07:03:42 -0700 Subject: [PATCH 2/2] Comment and include rust-analyzer. --- src/bootstrap/dist.rs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs index e0c33f7357741..19895baf08f16 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -1072,6 +1072,12 @@ impl Step for RustAnalyzer { } fn run(self, builder: &Builder<'_>) -> Option { + // This prevents rust-analyzer from being built for "dist" or "install" + // on the stable/beta channels. It is a nightly-only tool and should + // not be included. + if !builder.build.unstable_features() { + return None; + } let compiler = self.compiler; let target = self.target; assert!(builder.config.extended); @@ -1171,6 +1177,9 @@ impl Step for Miri { } fn run(self, builder: &Builder<'_>) -> Option { + // This prevents miri from being built for "dist" or "install" + // on the stable/beta channels. It is a nightly-only tool and should + // not be included. if !builder.build.unstable_features() { return None; }