Merge pull request #697 from Mark-Simulacrum/skip-rustdoc-early

Skip doc build-kind on 1.45.0 and lower versions

Author: Mark-Simulacrum

collector/src/lib.rs

@@ -97,6 +97,15 @@ where
     Ok(Option::deserialize(deserializer)?.unwrap_or(0.0))
 }
 
+pub fn version_supports_doc(version_str: &str) -> bool {
+    if let Some(version) = version_str.parse::<semver::Version>().ok() {
+        version >= semver::Version::new(1, 46, 0)
+    } else {
+        assert!(version_str.starts_with("beta") || version_str.starts_with("master"));
+        true
+    }
+}
+
 pub fn version_supports_incremental(version_str: &str) -> bool {
     if let Some(version) = version_str.parse::<semver::Version>().ok() {
         version >= semver::Version::new(1, 24, 0)

collector/src/main.rs

@@ -646,6 +646,14 @@ fn main_result() -> anyhow::Result<i32> {
             } else {
                 RunKind::all_non_incr()
             };
+            let build_kinds = if collector::version_supports_doc(toolchain) {
+                BuildKind::all()
+            } else {
+                let mut all = BuildKind::all();
+                let doc = all.iter().position(|bk| *bk == BuildKind::Doc).unwrap();
+                all.remove(doc);
+                all
+            };
 
             let which = |tool| {
                 String::from_utf8(
@@ -672,7 +680,7 @@ fn main_result() -> anyhow::Result<i32> {
                 &mut rt,
                 conn,
                 &ArtifactId::Artifact(toolchain.to_string()),
-                &BuildKind::all(),
+                &build_kinds,
                 &run_kinds,
                 Compiler {
                     rustc: Path::new(rustc.trim()),