about summary refs log tree commit diff
path: root/editors/code/src
diff options
context:
space:
mode:
authorVeetaha <gerzoh1@gmail.com>2020-02-29 00:46:48 +0200
committerVeetaha <gerzoh1@gmail.com>2020-02-29 00:59:42 +0200
commit6dc598fa6331de6124a255527e37804d82372fdc (patch)
treedb6d7cdc86d299685e6d206676dd08d80c61e801 /editors/code/src
parente7bf99e6fdddc1ec66611a0b145d796f17c46039 (diff)
downloadrust-6dc598fa6331de6124a255527e37804d82372fdc.tar.gz
rust-6dc598fa6331de6124a255527e37804d82372fdc.zip
vscode: simplify assert.eq() to assert() as per matklad
Diffstat (limited to 'editors/code/src')
-rw-r--r--editors/code/src/installation/download_artifact.ts7
-rw-r--r--editors/code/src/util.ts12
2 files changed, 4 insertions, 15 deletions
diff --git a/editors/code/src/installation/download_artifact.ts b/editors/code/src/installation/download_artifact.ts
index c60014c8c4e..97e4d67c21d 100644
--- a/editors/code/src/installation/download_artifact.ts
+++ b/editors/code/src/installation/download_artifact.ts
@@ -19,11 +19,10 @@ export async function downloadArtifact(
     installationDir: string,
     displayName: string,
 ) {
-    await fs.mkdir(installationDir).catch(err => assert.eq(
-        err?.code,
-        "EEXIST",
+    await fs.mkdir(installationDir).catch(err => assert(
+        err?.code === "EEXIST",
         `Couldn't create directory "${installationDir}" to download ` +
-        `${artifactFileName} artifact: ${err.message}`
+        `${artifactFileName} artifact: ${err?.message}`
     ));
 
     const installationPath = path.join(installationDir, artifactFileName);
diff --git a/editors/code/src/util.ts b/editors/code/src/util.ts
index 5c89bc62c12..f56c6badaf3 100644
--- a/editors/code/src/util.ts
+++ b/editors/code/src/util.ts
@@ -2,7 +2,7 @@ import * as lc from "vscode-languageclient";
 import * as vscode from "vscode";
 import { strict as nativeAssert } from "assert";
 
-export function assert(condition: unknown, explanation: string): asserts condition {
+export function assert(condition: boolean, explanation: string): asserts condition {
     try {
         nativeAssert(condition, explanation);
     } catch (err) {
@@ -11,16 +11,6 @@ export function assert(condition: unknown, explanation: string): asserts conditi
     }
 }
 
-assert.eq = <T>(bibba: unknown, bobba: T, explanation: string): asserts bibba is T => {
-    try {
-        nativeAssert.strictEqual(bibba, bobba, explanation);
-    } catch (err) {
-        log.error(`Equality assertion failed:`, explanation);
-        throw err;
-    }
-};
-
-
 export const log = {
     enabled: true,
     debug(message?: any, ...optionalParams: any[]): void {