Skip to content

Remove unused tslint comments / replace deprecated deepEqual #1670

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 5, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions bin/asc
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#!/usr/bin/env node

/* tslint:disable */

const tailArgs = process.argv.indexOf("--");
if (~tailArgs) {
require("child_process").spawnSync(
Expand Down
2 changes: 0 additions & 2 deletions bin/asinit
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#!/usr/bin/env node

/* tslint:disable */

const fs = require("fs");
const path = require("path");
const colors = require("../cli/util/colors");
Expand Down
2 changes: 0 additions & 2 deletions scripts/build-diagnostics.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ var header = `/**
* @license Apache-2.0
*/

/* tslint:disable:max-line-length */

`.replace(/\r\n/g, "\n");

var sb = [ header ];
Expand Down
2 changes: 0 additions & 2 deletions src/diagnosticMessages.generated.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
* @license Apache-2.0
*/

/* tslint:disable:max-line-length */

/** Enum of available diagnostic codes. */
export enum DiagnosticCode {
Not_implemented_0 = 100,
Expand Down
2 changes: 0 additions & 2 deletions std/assembly/bindings/wasi_snapshot_preview1.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Phase: wasi_snapshot_preview1
// See: https://github.com/WebAssembly/WASI/tree/master/phases/snapshot/witx

/* tslint:disable:max-line-length */

// helper types to be more explicit
type char = u8;
type ptr<T> = usize; // all pointers are usize'd
Expand Down
2 changes: 0 additions & 2 deletions std/assembly/bindings/wasi_unstable.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Phase: wasi_unstable / wasi_snapshot_preview0
// See: https://github.com/WebAssembly/WASI/tree/master/phases/old/snapshot_0/witx

/* tslint:disable:max-line-length */

// helper types to be more explicit
type char = u8;
type ptr<T> = usize; // all pointers are usize'd
Expand Down
22 changes: 11 additions & 11 deletions tests/cli/options.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,32 +18,32 @@ const config = {

// Present in both should concat
var merged = optionsUtil.merge(config, { enable: ["a"] }, { enable: ["b"] });
assert.deepEqual(merged.enable, ["a", "b"]);
assert.deepStrictEqual(merged.enable, ["a", "b"]);

merged = optionsUtil.merge(config, { enable: ["a"] }, { enable: ["a", "b"] });
assert.deepEqual(merged.enable, ["a", "b"]);
assert.deepStrictEqual(merged.enable, ["a", "b"]);

// Mutually exclusive should exclude
merged = optionsUtil.merge(config, { enable: ["a", "b"] }, { disable: ["a", "c"] });
assert.deepEqual(merged.enable, ["a", "b"]);
assert.deepEqual(merged.disable, ["c"]);
assert.deepStrictEqual(merged.enable, ["a", "b"]);
assert.deepStrictEqual(merged.disable, ["c"]);

merged = optionsUtil.merge(config, { disable: ["a", "b"] }, { enable: ["a", "c"] });
assert.deepEqual(merged.enable, ["c"]);
assert.deepEqual(merged.disable, ["a", "b"]);
assert.deepStrictEqual(merged.enable, ["c"]);
assert.deepStrictEqual(merged.disable, ["a", "b"]);

// Populating defaults should work after the fact
merged = optionsUtil.addDefaults(config, {});
assert.deepEqual(merged.other, ["x"]);
assert.deepStrictEqual(merged.other, ["x"]);

merged = optionsUtil.addDefaults(config, { other: ["y"] });
assert.deepEqual(merged.other, ["y"]);
assert.deepStrictEqual(merged.other, ["y"]);

// Complete usage test
var result = optionsUtil.parse(["--enable", "a", "--disable", "b"], config, false);
merged = optionsUtil.merge(config, result.options, { enable: ["b", "c"] });
merged = optionsUtil.merge(config, merged, { disable: ["a", "d"] });
optionsUtil.addDefaults(config, merged);
assert.deepEqual(merged.enable, ["a", "c"]);
assert.deepEqual(merged.disable, ["b", "d"]);
assert.deepEqual(merged.other, ["x"]);
assert.deepStrictEqual(merged.enable, ["a", "c"]);
assert.deepStrictEqual(merged.disable, ["b", "d"]);
assert.deepStrictEqual(merged.other, ["x"]);
2 changes: 0 additions & 2 deletions tests/compiler/import.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
/* tslint:disable:no-duplicate-imports */

import {
add,
sub as sub,
Expand Down