don't build extra tools if build.tools is explicitly an empty list

pietroalbini · pietroalbini · commit 2cfac3f04599 · 2021-07-23T15:08:08.000+02:00
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
@@ -50,12 +50,7 @@ fn should_build_extended_tool(builder: &Builder<'_>, tool: &str) -> bool {
     if !builder.config.extended {
         return false;
     }
-
-    if let Some(tools) = &builder.config.tools {
-        tools.is_empty() || tools.contains(tool)
-    } else {
-        true
-    }
+    builder.config.tools.as_ref().map_or(true, |tools| tools.contains(tool))
 }
 
 #[derive(Debug, PartialOrd, Ord, Copy, Clone, Hash, PartialEq, Eq)]

Original file line number	Diff line number	Diff line change
`@@ -50,12 +50,7 @@ fn should_build_extended_tool(builder: &Builder<'_>, tool: &str) -> bool {`
`50`	`50`	`if !builder.config.extended {`
`51`	`51`	`return false;`
`52`	`52`	`}`
`53`		`-`
`54`		`- if let Some(tools) = &builder.config.tools {`
`55`		`- tools.is_empty() \|\| tools.contains(tool)`
`56`		`- } else {`
`57`		`- true`
`58`		`- }`
	`53`	`+ builder.config.tools.as_ref().map_or(true, \|tools\| tools.contains(tool))`
`59`	`54`	`}`
`60`	`55`
`61`	`56`	`#[derive(Debug, PartialOrd, Ord, Copy, Clone, Hash, PartialEq, Eq)]`