Skip to content

Commit

Permalink
fix no-inner-declaration lint rule (denoland#7287)
Browse files Browse the repository at this point in the history
  • Loading branch information
magurotuna committed Aug 31, 2020
1 parent 0071dfd commit 71f0171
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 18 deletions.
4 changes: 2 additions & 2 deletions cli/tests/unit/timers_test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -379,9 +379,9 @@ unitTest(async function timerIgnoresDateOverride(): Promise<void> {
reject("global Date override used over original Date object");
return 0;
};
function DateOverride(): void {
const DateOverride = (): void => {
overrideCalled();
}
};
globalThis.Date = DateOverride as DateConstructor;
globalThis.Date.now = overrideCalled;
globalThis.Date.UTC = overrideCalled;
Expand Down
32 changes: 16 additions & 16 deletions std/node/_util/_util_callbackify_test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@ Deno.test(

for (const value of values) {
// eslint-disable-next-line require-await
async function asyncFn(): Promise<typeof value> {
const asyncFn = async (): Promise<typeof value> => {
return value;
}
};
const cbAsyncFn = callbackify(asyncFn);
testQueue.enqueue((done) => {
cbAsyncFn((err: unknown, ret: unknown) => {
Expand All @@ -93,9 +93,9 @@ Deno.test(
});
});

function promiseFn(): Promise<typeof value> {
const promiseFn = (): Promise<typeof value> => {
return Promise.resolve(value);
}
};
const cbPromiseFn = callbackify(promiseFn);
testQueue.enqueue((done) => {
cbPromiseFn((err: unknown, ret: unknown) => {
Expand All @@ -106,7 +106,7 @@ Deno.test(
});

// eslint-disable-next-line @typescript-eslint/no-explicit-any
function thenableFn(): PromiseLike<any> {
const thenableFn = (): PromiseLike<any> => {
return {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
then(onfulfilled): PromiseLike<any> {
Expand All @@ -115,7 +115,7 @@ Deno.test(
return this;
},
};
}
};
const cbThenableFn = callbackify(thenableFn);
testQueue.enqueue((done) => {
cbThenableFn((err: unknown, ret: unknown) => {
Expand All @@ -137,9 +137,9 @@ Deno.test(

for (const value of values) {
// eslint-disable-next-line require-await
async function asyncFn(): Promise<never> {
const asyncFn = async (): Promise<never> => {
return Promise.reject(value);
}
};
const cbAsyncFn = callbackify(asyncFn);
assertStrictEquals(cbAsyncFn.length, 1);
assertStrictEquals(cbAsyncFn.name, "asyncFnCallbackified");
Expand All @@ -166,9 +166,9 @@ Deno.test(
});
});

function promiseFn(): Promise<never> {
const promiseFn = (): Promise<never> => {
return Promise.reject(value);
}
};
const obj = {};
Object.defineProperty(promiseFn, "name", {
value: obj,
Expand Down Expand Up @@ -202,15 +202,15 @@ Deno.test(
});
});

function thenableFn(): PromiseLike<never> {
const thenableFn = (): PromiseLike<never> => {
return {
then(onfulfilled, onrejected): PromiseLike<never> {
assert(onrejected);
onrejected(value);
return this;
},
};
}
};

const cbThenableFn = callbackify(thenableFn);
testQueue.enqueue((done) => {
Expand Down Expand Up @@ -246,10 +246,10 @@ Deno.test("callbackify passes arguments to the original", async () => {

for (const value of values) {
// eslint-disable-next-line require-await
async function asyncFn(arg: typeof value): Promise<typeof value> {
const asyncFn = async (arg: typeof value): Promise<typeof value> => {
assertStrictEquals(arg, value);
return arg;
}
};

const cbAsyncFn = callbackify(asyncFn);
assertStrictEquals(cbAsyncFn.length, 2);
Expand All @@ -263,10 +263,10 @@ Deno.test("callbackify passes arguments to the original", async () => {
});
});

function promiseFn<T>(arg: typeof value): Promise<typeof value> {
const promiseFn = <T>(arg: typeof value): Promise<typeof value> => {
assertStrictEquals(arg, value);
return Promise.resolve(arg);
}
};
const obj = {};
Object.defineProperty(promiseFn, "length", {
value: obj,
Expand Down

0 comments on commit 71f0171

Please sign in to comment.