fix: consolidate toolchain building

Author: kristof-mattei

dist/index.js

@@ -24,26 +24,24 @@ async function buildContext(program: Program, toolchain: string | undefined): Pr
         rustc: "",
     };
 
-    toolchain = `+${toolchain}` ?? "";
-
     await Promise.all([
-        await exec.exec("rustc", [toolchain, "-V"], {
+        await exec.exec("rustc", buildToolchainArguments(toolchain, ["-V"]), {
             silent: false,
             listeners: {
                 stdout: (buffer: Buffer) => {
                     return (context.rustc = buffer.toString().trim());
                 },
             },
         }),
-        await program.call([toolchain, "-V"], {
+        await program.call(buildToolchainArguments(toolchain, ["-V"]), {
             silent: false,
             listeners: {
                 stdout: (buffer: Buffer) => {
                     return (context.cargo = buffer.toString().trim());
                 },
             },
         }),
-        await program.call([toolchain, "clippy", "-V"], {
+        await program.call(buildToolchainArguments(toolchain, ["clippy", "-V"]), {
             silent: false,
             listeners: {
                 stdout: (buffer: Buffer) => {
@@ -57,7 +55,7 @@ async function buildContext(program: Program, toolchain: string | undefined): Pr
 }
 
 async function runClippy(actionInput: input.ParsedInput, program: Program): Promise<ClippyResult> {
-    const args = buildArgs(actionInput);
+    const args = buildClippyArguments(actionInput);
     const outputParser = new OutputParser();
 
     const options: exec.ExecOptions = {
@@ -112,20 +110,29 @@ export async function run(actionInput: input.ParsedInput): Promise<void> {
     }
 }
 
-function buildArgs(actionInput: input.ParsedInput): string[] {
-    const args: string[] = [];
+function buildToolchainArguments(toolchain: string | undefined, after: string[]): string[] {
+    const args = [];
 
-    // Toolchain selection MUST go first in any condition
-    if (actionInput.toolchain) {
-        args.push(`+${actionInput.toolchain}`);
+    if (toolchain) {
+        args.push(`+${toolchain}`);
     }
 
-    args.push("clippy");
+    args.push(...after);
+
+    return args;
+}
 
-    // `--message-format=json` should just right after the `cargo clippy`
-    // because usually people are adding the `-- -D warnings` at the end
-    // of arguments and it will mess up the output.
-    args.push("--message-format=json");
+function buildClippyArguments(actionInput: input.ParsedInput): string[] {
+    // Toolchain selection MUST go first in any condition!
+    return buildToolchainArguments(actionInput.toolchain, [
+        "clippy",
 
-    return args.concat(actionInput.args);
+        // `--message-format=json` should just right after the `cargo clippy`
+        // because usually people are adding the `-- -D warnings` at the end
+        // of arguments and it will mess up the output.
+        "--message-format=json",
+
+        // and the rest
+        ...actionInput.args,
+    ]);
 }

dist/index.js.map

@@ -62,6 +62,33 @@ describe("clippy", () => {
         await expect(run(actionInput)).rejects.toThrow(/Clippy had exited with the (\d)+ exit code/);
     });
 
+    it("records versions with toolchain", async () => {
+        const reportSpy = jest.spyOn(Reporter.prototype, "report");
+        jest.spyOn(exec, "exec").mockImplementation((commandline: string, args?: string[], options?: exec.ExecOptions) => {
+            if (commandline.endsWith("cargo")) {
+                if (args?.[0] === "+nightly" && args?.[1] === "-V") {
+                    options?.listeners?.stdout?.(Buffer.from("cargo version"));
+                } else if (args?.[0] === "+nightly" && args?.[1] === "clippy" && args?.[2] === "-V") {
+                    options?.listeners?.stdout?.(Buffer.from("clippy version"));
+                }
+            } else if (commandline === "rustc" && args?.[0] === "+nightly" && args?.[1] === "-V") {
+                options?.listeners?.stdout?.(Buffer.from("rustc version"));
+            }
+            return Promise.resolve(0);
+        });
+
+        const actionInput: ParsedInput = {
+            toolchain: "nightly",
+            args: [],
+            useCross: false,
+            workingDirectory: undefined,
+        };
+
+        await expect(run(actionInput)).resolves.toBeUndefined();
+
+        expect(reportSpy).toBeCalledWith({ error: 0, help: 0, ice: 0, note: 0, warning: 0 }, [], { cargo: "cargo version", clippy: "clippy version", rustc: "rustc version" });
+    });
+
     it("records versions", async () => {
         const reportSpy = jest.spyOn(Reporter.prototype, "report");
         jest.spyOn(exec, "exec").mockImplementation((commandline: string, args?: string[], options?: exec.ExecOptions) => {
@@ -78,7 +105,7 @@ describe("clippy", () => {
         });
 
         const actionInput: ParsedInput = {
-            toolchain: "stable",
+            toolchain: undefined,
             args: [],
             useCross: false,
             workingDirectory: undefined,