Fix dist search (#99)

simple check for 'rls-preview' no longer works

Author: alexheretic

lib/dist-fetch.js

@@ -4,6 +4,14 @@ const _ = require('underscore-plus')
 const datedNightlyHasRlsCache = new Map()
 const DATED_REGEX = /(^[^-]+)-(\d{4,}-\d{2}-\d{2})$/
 
+/**
+ * @param {string} manifest toml
+ * @return {boolean}
+ */
+function manifest_includes_rls(manifest) {
+  return manifest.includes('rls-preview') && !manifest.includes('[pkg.rls-preview]\nversion = ""')
+}
+
 /**
  * @param {Date|string} date
  * @param {string=} channel defaults to `nightly`
@@ -22,7 +30,7 @@ async function checkDatedDistHasRls(date, channel='nightly') {
         let body = ""
         res.on("data", data => {
           body += data
-          if (body.includes('rls-preview')) resolve(cacheKey)
+          if (manifest_includes_rls(body)) resolve(cacheKey)
         })
         res.on("end", () => reject(new Error("no 'rls-preview'")))
       })
@@ -82,9 +90,9 @@ async function fetchLatestDist({ toolchain, currentVersion="none" }) {
         if (!rustcInfo) return reject(new Error('could not split channel toml output'))
         let rustcVersion = require('toml').parse(rustcInfo[1]).pkg.rustc.version.trim()
         resolve(
-          !currentVersion.trim().endsWith(rustcVersion) &&
-          body.includes('rls-preview') &&
-          `rustc ${rustcVersion}`
+          !currentVersion.trim().endsWith(rustcVersion)
+          && manifest_includes_rls(body)
+          && `rustc ${rustcVersion}`
         )
       })
     })