add docs and clean up logic for toolchain override

Author: ecklf

Cargo.toml

@@ -12,5 +12,6 @@ exclude = [
     "test/fixtures/02-with-utility",
     "test/fixtures/03-with-function",
     "test/fixtures/04-with-parameter",
-    "test/fixtures/05-with-similar-entrypaths"
+    "test/fixtures/05-with-similar-entrypaths",
+    "test/fixtures/06-with-toolchain-override"
 ]

rust-toolchain.toml

@@ -0,0 +1,2 @@
+[toolchain]
+channel = "nightly"

src/lib/rust-toolchain.ts

@@ -1,14 +1,10 @@
 import { debug } from '@vercel/build-utils';
 import execa from 'execa';
 
-async function downloadRustToolchain({
-  version = 'stable',
-}: {
-  version?: string;
-}): Promise<void> {
+async function downloadRustToolchain(): Promise<void> {
   try {
     await execa(
-      `curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain ${version}`,
+      `curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y`,
       [],
       { shell: true, stdio: 'inherit' },
     );
@@ -21,11 +17,11 @@ async function downloadRustToolchain({
   }
 }
 
-export const installRustToolchain = async (version?: string): Promise<void> => {
+export const installRustToolchain = async (): Promise<void> => {
   try {
     await execa(`rustup -V`, [], { shell: true, stdio: 'ignore' });
     debug('Rust Toolchain is already installed, skipping download');
   } catch (err) {
-    await downloadRustToolchain({ version });
+    await downloadRustToolchain();
   }
 };

test/fixtures.test.ts

@@ -1,21 +1,12 @@
 import { join } from 'node:path';
 import ms from 'ms';
 import execa from 'execa';
-import { writeJSON } from 'fs-extra';
 import fetch from 'node-fetch';
 
-const vercelFileName = 'test.vercel.json';
-const pkgRootFile = `file:${process.cwd()}`;
 const readyRegex = /Ready!\s+Available at (?<url>https?:\/\/\w+:\d+)/;
 
 jest.setTimeout(ms('50m'));
 
-interface Config {
-  builds: {
-    use: string;
-  }[];
-}
-
 interface Probe {
   path: string;
   status?: number;
@@ -30,19 +21,6 @@ async function importJSON<T>(path: string): Promise<T> {
   return (await import(path)) as unknown as Promise<T>;
 }
 
-async function injectConf(confPath: string): Promise<Config> {
-  const conf = await importJSON<Config>(join(confPath, vercelFileName));
-
-  conf.builds[0].use = pkgRootFile;
-
-  await writeJSON(join(confPath, 'vercel.json'), conf, {
-    spaces: 2,
-    EOL: '\n',
-  });
-
-  return conf;
-}
-
 async function checkProbes(baseUrl: string, probes: Probe[]): Promise<void> {
   for (const probe of probes) {
     // eslint-disable-next-line no-await-in-loop
@@ -121,4 +99,7 @@ describe('vercel-rust', () => {
   it('deploy 05-with-similar-entrypaths', async () => {
     await expect(testFixture('05-with-similar-entrypaths')).resolves.toBe('ok');
   });
+  it('deploy 06-with-toolchain-override', async () => {
+    await expect(testFixture('06-with-toolchain-override')).resolves.toBe('ok');
+  });
 });

test/fixtures/06-with-toolchain-override/.gitignore

@@ -0,0 +1 @@
+.vercel

test/fixtures/06-with-toolchain-override/.vercelignore

@@ -0,0 +1 @@
+target/