add MSRV to manifest

Author: Renegade334

lib/update-v8/updateCrates.js

@@ -14,8 +14,8 @@ export default function updateCrates() {
       return task.newListr([
         enumerateTemporalDependencies(),
         removeExistingCrates(),
-        buildManifest(),
         vendorCrates(),
+        buildManifest(),
         generateLockfile(),
         updateGYP(),
         commitChanges()
@@ -57,40 +57,6 @@ function removeExistingCrates() {
   };
 }
 
-function buildManifest() {
-  return {
-    title: 'Build new manifest',
-    task: async(ctx) => {
-      const sourceManifest = TOML.parse(
-        await fs.readFile(path.join(ctx.nodeDir, chromiumCratesDir, 'Cargo.toml'), 'utf8')
-      );
-
-      const header =
-      '# This manifest is generated by node-core-utils. Do not modify it directly.\n\n';
-      const manifest = {
-        package: {
-          edition: sourceManifest.package.edition,
-          name: 'node_crates',
-          version: `${ctx.newVersion.major}.${ctx.newVersion.minor}.${ctx.newVersion.build}`
-        },
-        lib: {
-          'crate-type': ['staticlib']
-        },
-        dependencies: {}
-      };
-      for (const crate of ctx.temporalCrates) {
-        const name = crate.split('@', 1)[0];
-        if (name === 'temporal_capi' || typeof sourceManifest.dependencies[name] === 'object') {
-          manifest.dependencies[name] = sourceManifest.dependencies[name];
-        }
-      }
-
-      const cargoTOML = header + TOML.stringify(manifest);
-      await fs.writeFile(path.join(ctx.nodeDir, nodeCratesDir, 'Cargo.toml'), cargoTOML);
-    },
-  };
-}
-
 // Note that the crates vendored in third_party/rust/chromium_crates_io already have any custom
 // Chromium patches applied by gnrt, so we don't need to worry about patching them ourselves.
 function vendorCrates() {
@@ -102,12 +68,16 @@ function vendorCrates() {
       await fs.mkdir(nodeVendor);
 
       const subtasks = [];
+      const rustVersions = [];
       for (const dir of await fs.readdir(chromiumVendor)) {
         const crate = await getCrateInfo(dir);
         if (!crate || !ctx.temporalCrates.has(`${crate.name}@${crate.version}`)) continue;
         if (crate.name === 'temporal_capi') {
           ctx.temporalCAPIDirectory = dir;
         }
+        if (crate['rust-version']) {
+          rustVersions.push(crate['rust-version']);
+        }
         subtasks.push({
           title: dir,
           task: async(ctx) => {
@@ -120,6 +90,11 @@ function vendorCrates() {
         });
       }
 
+      if (rustVersions.length) {
+        const msrv = rustVersions.map(semver.coerce).reduce((a, b) => (semver.gt(a, b) ? a : b));
+        ctx.msrv = `${msrv.major}.${msrv.minor}`;
+      }
+
       return task.newListr(subtasks, { concurrent: ctx.concurrent });
 
       async function getCrateInfo(crate) {
@@ -136,6 +111,43 @@ function vendorCrates() {
   };
 }
 
+function buildManifest() {
+  return {
+    title: 'Build new manifest',
+    task: async(ctx) => {
+      const sourceManifest = TOML.parse(
+        await fs.readFile(path.join(ctx.nodeDir, chromiumCratesDir, 'Cargo.toml'), 'utf8')
+      );
+
+      const header =
+      '# This manifest is generated by node-core-utils. Do not modify it directly.\n\n';
+      const manifest = {
+        package: {
+          edition: sourceManifest.package.edition,
+          name: 'node_crates',
+          version: `${ctx.newVersion.major}.${ctx.newVersion.minor}.${ctx.newVersion.build}`
+        },
+        lib: {
+          'crate-type': ['staticlib']
+        },
+        dependencies: {}
+      };
+      if (ctx.msrv) {
+        manifest.package['rust-version'] = ctx.msrv;
+      }
+      for (const crate of ctx.temporalCrates) {
+        const name = crate.split('@', 1)[0];
+        if (name === 'temporal_capi' || typeof sourceManifest.dependencies[name] === 'object') {
+          manifest.dependencies[name] = sourceManifest.dependencies[name];
+        }
+      }
+
+      const cargoTOML = header + TOML.stringify(manifest);
+      await fs.writeFile(path.join(ctx.nodeDir, nodeCratesDir, 'Cargo.toml'), cargoTOML);
+    },
+  };
+}
+
 function generateLockfile() {
   return {
     title: 'Generate lockfile',