fix: Run fmt again there were still 2 issues

Author: Ryan-Gordon

index.js

@@ -50,7 +50,7 @@ class RustPlugin {
         strictMode: true,
       },
       (this.serverless.service.custom && this.serverless.service.custom.rust) ||
-        {}
+        {},
     );
 
     // Docker can't access resources outside of the current build directory.
@@ -80,8 +80,8 @@ class RustPlugin {
     const targetArgs = target
       ? ["--target", target]
       : MUSL_PLATFORMS.includes(platform)
-      ? ["--target", "x86_64-unknown-linux-musl"]
-      : [];
+        ? ["--target", "x86_64-unknown-linux-musl"]
+        : [];
     return [
       ...defaultArgs,
       ...profileArgs,
@@ -103,19 +103,19 @@ class RustPlugin {
           [`CC_${target || "x86_64_unknown_linux_musl"}`]: linker,
         }
       : "win32" === platform
-      ? {
-          RUSTFLAGS: (env["RUSTFLAGS"] || "") + " -Clinker=rust-lld",
-          TARGET_CC: "rust-lld",
-          CC_x86_64_unknown_linux_musl: "rust-lld",
-        }
-      : "darwin" === platform
-      ? {
-          RUSTFLAGS:
-            (env["RUSTFLAGS"] || "") + " -Clinker=x86_64-linux-musl-gcc",
-          TARGET_CC: "x86_64-linux-musl-gcc",
-          CC_x86_64_unknown_linux_musl: "x86_64-linux-musl-gcc",
-        }
-      : {};
+        ? {
+            RUSTFLAGS: (env["RUSTFLAGS"] || "") + " -Clinker=rust-lld",
+            TARGET_CC: "rust-lld",
+            CC_x86_64_unknown_linux_musl: "rust-lld",
+          }
+        : "darwin" === platform
+          ? {
+              RUSTFLAGS:
+                (env["RUSTFLAGS"] || "") + " -Clinker=x86_64-linux-musl-gcc",
+              TARGET_CC: "x86_64-linux-musl-gcc",
+              CC_x86_64_unknown_linux_musl: "x86_64-linux-musl-gcc",
+            }
+          : {};
     return {
       ...defaultEnv,
       ...platformEnv,
@@ -128,7 +128,7 @@ class RustPlugin {
       let target = (funcArgs || {}).target || this.custom.target;
       executable = path.join(
         executable,
-        target ? target : "x86_64-unknown-linux-musl"
+        target ? target : "x86_64-unknown-linux-musl",
       );
     }
     return path.join(executable, profile !== "dev" ? "release" : "debug");
@@ -138,7 +138,7 @@ class RustPlugin {
     return path.join(
       "target",
       "lambda",
-      profile !== "dev" ? "release" : "debug"
+      profile !== "dev" ? "release" : "debug",
     );
   }
 
@@ -148,7 +148,7 @@ class RustPlugin {
       cargoPackage,
       binary,
       profile,
-      platform()
+      platform(),
     );
 
     const env = this.localBuildEnv(funcArgs, process.env, platform());
@@ -170,7 +170,7 @@ class RustPlugin {
       "bootstrap",
       readFileSync(path.join(sourceDir, binary)),
       "",
-      0o755
+      0o755,
     );
     const targetDir = this.localArtifactDir(profile);
     try {
@@ -196,7 +196,7 @@ class RustPlugin {
     srcPath,
     cargoRegistry,
     cargoDownloads,
-    env
+    env,
   ) {
     const defaultArgs = [
       "run",
@@ -252,7 +252,7 @@ class RustPlugin {
       this.srcPath,
       cargoRegistry,
       cargoDownloads,
-      process.env
+      process.env,
     );
 
     this.serverless.cli.log("Running containerized build");
@@ -302,7 +302,7 @@ class RustPlugin {
       func.package = func.package || {};
       if (func.package.artifact && func.package.artifact !== "") {
         this.serverless.cli.log(
-          `Artifact defined for ${func.handler}, skipping build...`
+          `Artifact defined for ${func.handler}, skipping build...`,
         );
       } else {
         const { cargoPackage, binary } = this.cargoBinary(func);
@@ -315,7 +315,7 @@ class RustPlugin {
           : this.dockerBuild(func.rust, cargoPackage, binary, profile);
         if (res.error || res.status > 0) {
           this.serverless.cli.log(
-            `Rust build encountered an error: ${res.error} ${res.status}.`
+            `Rust build encountered an error: ${res.error} ${res.status}.`,
           );
           throw new Error(res.error);
         }
@@ -331,7 +331,7 @@ class RustPlugin {
         const artifactPath = path.join(
           this.srcPath,
           `target/lambda/${"dev" === profile ? "debug" : "release"}`,
-          `${binary}.zip`
+          `${binary}.zip`,
         );
         func.package = func.package || {};
         func.package.artifact = artifactPath;
@@ -349,7 +349,7 @@ class RustPlugin {
       throw new Error(
         `Error: no Rust functions found. ` +
           `Use 'runtime: ${RUST_RUNTIME}' in global or ` +
-          `function configuration to use this plugin.`
+          `function configuration to use this plugin.`,
       );
     }
   }

tests/unit/index.test.js

@@ -20,7 +20,7 @@ describe("RustPlugin", () => {
       },
       config: {},
     },
-    {}
+    {},
   );
 
   it("registers expected lifecycle hooks", () => {
@@ -34,7 +34,7 @@ describe("RustPlugin", () => {
   it("sets sensible defaults", () => {
     const unconfigured = new RustPlugin(
       { version: "1.71.3", service: { package: {} }, config: {} },
-      {}
+      {},
     );
     assert.deepEqual(unconfigured.custom, {
       cargoFlags: "",
@@ -63,7 +63,7 @@ describe("RustPlugin", () => {
         },
         config: {},
       },
-      {}
+      {},
     );
     assert.deepEqual(configured.custom, {
       cargoFlags: "--features foo",
@@ -99,7 +99,7 @@ describe("RustPlugin", () => {
         "--features",
         "foo",
       ],
-      "failed on linux"
+      "failed on linux",
     );
     assert.deepEqual(
       plugin.localBuildArgs({}, "foo", "bar", "release", "darwin"),
@@ -113,7 +113,7 @@ describe("RustPlugin", () => {
         "--features",
         "foo",
       ],
-      "failed on osx"
+      "failed on osx",
     );
     assert.deepEqual(
       plugin.localBuildArgs({}, "foo", "bar", "release", "win32"),
@@ -127,15 +127,15 @@ describe("RustPlugin", () => {
         "--features",
         "foo",
       ],
-      "failed on windows"
+      "failed on windows",
     );
   });
 
   it("configures expected localBuildEnv", () => {
     assert.deepEqual(
       plugin.localBuildEnv({}, {}, "linux"),
       {},
-      "failed on linux"
+      "failed on linux",
     );
     assert.deepEqual(
       plugin.localBuildEnv({}, {}, "darwin"),
@@ -145,7 +145,7 @@ describe("RustPlugin", () => {
         RUSTFLAGS: " -Clinker=x86_64-linux-musl-gcc",
         TARGET_CC: "x86_64-linux-musl-gcc",
       },
-      "failed on osx"
+      "failed on osx",
     );
     assert.deepEqual(
       plugin.localBuildEnv({}, {}, "win32"),
@@ -154,53 +154,53 @@ describe("RustPlugin", () => {
         RUSTFLAGS: " -Clinker=rust-lld",
         TARGET_CC: "rust-lld",
       },
-      "failed on windows"
+      "failed on windows",
     );
   });
 
   it("configures expected localSourceDir", () => {
     assert.equal(
       plugin.localSourceDir({}, "dev", "linux"),
       path.join("target", "x86_64-unknown-linux-musl", "debug"),
-      "failed on linux"
+      "failed on linux",
     );
     assert.equal(
       plugin.localSourceDir({}, "release", "linux"),
       path.join("target", "x86_64-unknown-linux-musl", "release"),
-      "failed on linux"
+      "failed on linux",
     );
     assert.equal(
       plugin.localSourceDir({}, "dev", "darwin"),
       path.join("target", "x86_64-unknown-linux-musl", "debug"),
-      "failed on osx"
+      "failed on osx",
     );
     assert.equal(
       plugin.localSourceDir({}, "release", "darwin"),
       path.join("target", "x86_64-unknown-linux-musl", "release"),
-      "failed on osx"
+      "failed on osx",
     );
     assert.equal(
       plugin.localSourceDir({}, "dev", "win32"),
       path.join("target", "x86_64-unknown-linux-musl", "debug"),
-      "failed on windows"
+      "failed on windows",
     );
     assert.equal(
       plugin.localSourceDir({}, "release", "win32"),
       path.join("target", "x86_64-unknown-linux-musl", "release"),
-      "failed on windows"
+      "failed on windows",
     );
   });
 
   it("configures expected localArtifactDir", () => {
     assert.equal(
       plugin.localArtifactDir("dev"),
       path.join("target", "lambda", "debug"),
-      "failed on linux"
+      "failed on linux",
     );
     assert.equal(
       plugin.localArtifactDir("release"),
       path.join("target", "lambda", "release"),
-      "failed on linux"
+      "failed on linux",
     );
   });
 
@@ -221,7 +221,7 @@ describe("RustPlugin", () => {
         },
         config: {},
       },
-      {}
+      {},
     );
     assert(dockerless.buildLocally({}));
 
@@ -238,7 +238,7 @@ describe("RustPlugin", () => {
         "source_path",
         "cargo_registry",
         "cargo_downloads",
-        {}
+        {},
       ),
       [
         "run",
@@ -257,7 +257,7 @@ describe("RustPlugin", () => {
         "-e",
         "CARGO_FLAGS=--features foo -p foo",
         "notsoftprops/lambda-rust:latest",
-      ]
+      ],
     );
   });
 });