allow disabling targets

Author: Emilgardis

xtask/src/build_docker_image.rs

@@ -137,6 +137,7 @@ pub fn build_docker_image(
             targets = get_matrix()
                 .iter()
                 .filter(|m| m.os.starts_with("ubuntu"))
+                .filter(|m| !m.disabled)
                 .map(|m| m.to_image_target())
                 .collect();
         } else {

xtask/src/ci/target_matrix.rs

@@ -34,6 +34,7 @@ pub enum TargetMatrixSub {
 impl TargetMatrix {
     pub(crate) fn run(&self) -> Result<(), color_eyre::Report> {
         let mut matrix: Vec<CiTarget> = get_matrix().clone();
+        matrix.retain(|t| !t.disabled);
         let mut is_default_try = false;
         let pr: Option<String>;
         let (prs, mut app) = match self {
@@ -411,6 +412,7 @@ mod tests {
     #[track_caller]
     fn run<'a>(args: impl IntoIterator<Item = &'a str>) -> Vec<CiTarget> {
         let mut matrix = get_matrix().clone();
+        matrix.retain_mut(|t| !t.disabled);
         TargetMatrixArgs::try_parse_from(args)
             .unwrap()
             .filter(&mut matrix);
@@ -468,7 +470,9 @@ mod tests {
     #[test]
     fn all() {
         let matrix = run([]);
-        assert_eq!(get_matrix(), &matrix);
+        let mut all = get_matrix().clone();
+        all.retain(|t| !t.disabled);
+        assert_eq!(&all, &matrix);
     }
 
     #[test]

xtask/src/codegen.rs

@@ -5,11 +5,7 @@ use std::fmt::Write;
 use crate::util::{get_cargo_workspace, get_matrix};
 
 #[derive(Args, Debug)]
-pub struct Codegen {
-    /// Provide verbose diagnostic output.
-    #[clap(short, long)]
-    verbose: bool,
-}
+pub struct Codegen {}
 
 pub fn codegen(Codegen { .. }: Codegen) -> cross::Result<()> {
     let path = get_cargo_workspace().join("src/docker/provided_images.rs");
@@ -28,7 +24,7 @@ pub static PROVIDED_IMAGES: &[ProvidedImage] = &["#,
 
     for image_target in get_matrix()
         .iter()
-        .filter(|i| i.builds_image() && i.to_image_target().is_toolchain_image())
+        .filter(|i| i.builds_image() && i.to_image_target().is_toolchain_image() && !i.disabled)
     {
         write!(
             &mut images,

xtask/src/util.rs

@@ -64,6 +64,12 @@ pub struct CiTarget {
     /// if `true` test no std support as if std does exists. If `false` build https://github.com/rust-lang/compiler-builtins
     #[serde(skip_serializing_if = "Option::is_none")]
     pub std: Option<bool>,
+    #[serde(skip_serializing_if = "is_false", default)]
+    pub disabled: bool,
+}
+
+pub fn is_false(b: &bool) -> bool {
+    !*b
 }
 
 impl CiTarget {