Skip to content

Commit fe43d3d

Browse files
authored
Fixes a few typechecking errors in lute (#806)
There is a type error in the std test library caused by the type of the assertions table not being in the `asserts.luau` file anymore. This caused a number of downstream type errors in test scripts, because they were adding annotation for an assertions table that didn't exist in that file. Edit: also fixed an fs.luau tc error.
1 parent c245f71 commit fe43d3d

5 files changed

Lines changed: 12 additions & 100 deletions

File tree

lute/std/libs/fs.luau

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ end
7777
--- Also provides a `close` method to stop watching.
7878
--- Note: for loops do not support yielding generalized iterators, so we cannot use fs.watch as `for _ in fs.watch(...) do` directly. A while loop can be used instead. See example/watch_directory.luau for usage.
7979
function fslib.watch(path: pathlike): watcher
80-
local queue = {}
80+
local queue: { { filename: pathlib.path, event: watchevent } } = {}
8181
local handle = fs.watch(pathlib.format(path), function(filename: string, event: watchevent)
8282
table.insert(queue, { filename = pathlib.parse(filename), event = event })
8383
end)
@@ -88,6 +88,7 @@ function fslib.watch(path: pathlike): watcher
8888
return nil
8989
end
9090
local item = table.remove(queue, 1)
91+
assert(item)
9192
return item.event
9293
end,
9394
close = function(_self: watcher): ()

lute/std/libs/test/reporter.luau

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@
33
-- Standard test reporter library for Luau
44

55
local types = require("./types")
6-
local assert = require("./assert")
76

87
type FailedTest = types.failedtest
98
type TestRunResult = types.testrunresult
10-
type Assertions = assert.asserts
119

1210
local reporter = {}
1311

tests/std/syntax/printer.test.luau

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
local assertLib = require("@std/test/assert")
1+
local testtypes = require("@std/test/types")
22
local printer = require("@std/syntax/printer")
33
local query = require("@std/syntax/query")
44
local syntax = require("@std/syntax")
@@ -10,7 +10,7 @@ local function checkReplacement(
1010
source: string,
1111
expected: string,
1212
transformFn: (syntaxTypes.AstNode) -> syntaxTypes.replacements?,
13-
assert: assertLib.asserts
13+
assert: testtypes.asserts
1414
)
1515
local ast = syntax.parse(source)
1616
local replacements = transformFn(ast.root)

tests/std/test.test.luau

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
local assertions = require("@std/test/assert")
1+
local testtypes = require("@std/test/types")
22
local fs = require("@std/fs")
33
local path = require("@std/path")
44
local process = require("@std/process")
@@ -12,7 +12,7 @@ local function assertErrorsWithMsg(
1212
testName: string,
1313
testContents: string,
1414
expectedErrMsg: string,
15-
assert: assertions.asserts
15+
assert: testtypes.asserts
1616
)
1717
local testFilePath = path.join(tmpDir, `{testName}.test.luau`)
1818
fs.writestringtofile(testFilePath, testContents)

tools/check-faillist.txt

Lines changed: 6 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -105,20 +105,12 @@ lute/cli/commands/transform/lib/arguments.luau:47:26-37
105105
lute/cli/commands/transform/lib/arguments.luau:47:26-37
106106
lute/cli/commands/transform/lib/arguments.luau:75:9-14
107107
lute/cli/commands/transform/lib/arguments.luau:75:9-14
108-
lute/std/libs/fs.luau:82:3-14
109-
lute/std/libs/fs.luau:82:3-14
110-
lute/std/libs/fs.luau:90:17-28
111-
lute/std/libs/fs.luau:90:17-28
112-
lute/std/libs/fs.luau:91:11-20
113-
lute/std/libs/fs.luau:91:11-20
114-
lute/std/libs/fs.luau:91:11-20
115-
lute/std/libs/fs.luau:91:11-20
116-
lute/std/libs/fs.luau:135:34-39
117-
lute/std/libs/fs.luau:135:34-39
118-
lute/std/libs/fs.luau:184:52-68
119-
lute/std/libs/fs.luau:184:52-68
120-
lute/std/libs/fs.luau:192:11-17
121-
lute/std/libs/fs.luau:192:11-17
108+
lute/std/libs/fs.luau:136:34-39
109+
lute/std/libs/fs.luau:136:34-39
110+
lute/std/libs/fs.luau:185:52-68
111+
lute/std/libs/fs.luau:185:52-68
112+
lute/std/libs/fs.luau:193:11-17
113+
lute/std/libs/fs.luau:193:11-17
122114
lute/std/libs/syntax/printer.luau:41:23-27
123115
lute/std/libs/syntax/printer.luau:41:23-27
124116
lute/std/libs/syntax/printer.luau:42:25-29
@@ -213,8 +205,6 @@ lute/std/libs/syntax/visitor.luau:1074:22-25
213205
lute/std/libs/syntax/visitor.luau:1074:22-25
214206
lute/std/libs/test/failure.luau:18:35-38
215207
lute/std/libs/test/failure.luau:18:35-38
216-
lute/std/libs/test/reporter.luau:10:19-32
217-
lute/std/libs/test/reporter.luau:10:19-32
218208
tests/batteries/collections/deque.test.luau:9:13-16
219209
tests/batteries/collections/deque.test.luau:16:13-16
220210
tests/batteries/collections/deque.test.luau:24:13-16
@@ -270,68 +260,8 @@ tests/std/process.test.luau:123:41-42
270260
tests/std/process.test.luau:126:43-44
271261
tests/std/process.test.luau:130:41-53
272262
tests/std/process.test.luau:134:33-48
273-
tests/std/syntax/printer.test.luau:13:10-26
274-
tests/std/syntax/printer.test.luau:35:8-13
275-
tests/std/syntax/printer.test.luau:49:8-13
276-
tests/std/syntax/printer.test.luau:63:8-13
277-
tests/std/syntax/printer.test.luau:82:8-13
278263
tests/std/syntax/printer.test.luau:95:10-100
279264
tests/std/syntax/printer.test.luau:97:7-32
280-
tests/std/syntax/printer.test.luau:103:8-13
281-
tests/std/syntax/printer.test.luau:119:8-13
282-
tests/std/syntax/printer.test.luau:131:8-13
283-
tests/std/syntax/printer.test.luau:143:8-13
284-
tests/std/syntax/printer.test.luau:155:8-13
285-
tests/std/syntax/printer.test.luau:167:8-13
286-
tests/std/syntax/printer.test.luau:180:8-13
287-
tests/std/syntax/printer.test.luau:192:8-13
288-
tests/std/syntax/printer.test.luau:204:8-13
289-
tests/std/syntax/printer.test.luau:216:8-13
290-
tests/std/syntax/printer.test.luau:228:8-13
291-
tests/std/syntax/printer.test.luau:240:8-13
292-
tests/std/syntax/printer.test.luau:252:8-13
293-
tests/std/syntax/printer.test.luau:264:8-13
294-
tests/std/syntax/printer.test.luau:276:8-13
295-
tests/std/syntax/printer.test.luau:288:8-13
296-
tests/std/syntax/printer.test.luau:300:8-13
297-
tests/std/syntax/printer.test.luau:312:8-13
298-
tests/std/syntax/printer.test.luau:324:8-13
299-
tests/std/syntax/printer.test.luau:336:8-13
300-
tests/std/syntax/printer.test.luau:349:8-13
301-
tests/std/syntax/printer.test.luau:366:8-13
302-
tests/std/syntax/printer.test.luau:381:8-13
303-
tests/std/syntax/printer.test.luau:396:8-13
304-
tests/std/syntax/printer.test.luau:411:8-13
305-
tests/std/syntax/printer.test.luau:426:8-13
306-
tests/std/syntax/printer.test.luau:439:8-13
307-
tests/std/syntax/printer.test.luau:452:8-13
308-
tests/std/syntax/printer.test.luau:465:8-13
309-
tests/std/syntax/printer.test.luau:480:8-13
310-
tests/std/syntax/printer.test.luau:495:8-13
311-
tests/std/syntax/printer.test.luau:509:8-13
312-
tests/std/syntax/printer.test.luau:523:8-13
313-
tests/std/syntax/printer.test.luau:538:8-13
314-
tests/std/syntax/printer.test.luau:553:8-13
315-
tests/std/syntax/printer.test.luau:566:8-13
316-
tests/std/syntax/printer.test.luau:579:8-13
317-
tests/std/syntax/printer.test.luau:593:8-13
318-
tests/std/syntax/printer.test.luau:606:8-13
319-
tests/std/syntax/printer.test.luau:619:8-13
320-
tests/std/syntax/printer.test.luau:632:8-13
321-
tests/std/syntax/printer.test.luau:645:8-13
322-
tests/std/syntax/printer.test.luau:658:8-13
323-
tests/std/syntax/printer.test.luau:671:8-13
324-
tests/std/syntax/printer.test.luau:684:8-13
325-
tests/std/syntax/printer.test.luau:697:8-13
326-
tests/std/syntax/printer.test.luau:710:8-13
327-
tests/std/syntax/printer.test.luau:723:8-13
328-
tests/std/syntax/printer.test.luau:736:8-13
329-
tests/std/syntax/printer.test.luau:749:8-13
330-
tests/std/syntax/printer.test.luau:762:8-13
331-
tests/std/syntax/printer.test.luau:775:8-13
332-
tests/std/syntax/printer.test.luau:788:8-13
333-
tests/std/syntax/printer.test.luau:801:8-13
334-
tests/std/syntax/printer.test.luau:814:8-13
335265
tests/std/syntax/printer.test.luau:825:38-60
336266
tests/std/syntax/printer.test.luau:825:38-60
337267
tests/std/syntax/printer.test.luau:825:38-60
@@ -432,29 +362,12 @@ tests/std/syntax/printer.test.luau:825:38-60
432362
tests/std/syntax/printer.test.luau:825:38-60
433363
tests/std/syntax/printer.test.luau:825:38-60
434364
tests/std/syntax/printer.test.luau:825:38-60
435-
tests/std/syntax/printer.test.luau:828:8-13
436-
tests/std/syntax/printer.test.luau:849:8-13
437365
tests/std/syntax/printer.test.luau:877:23-31
438-
tests/std/syntax/printer.test.luau:884:8-13
439366
tests/std/syntax/query.test.luau:41:7-7
440367
tests/std/syntax/query.test.luau:41:7-7
441368
tests/std/tableext.test.luau:57:18-18
442369
tests/std/tableext.test.luau:62:18-18
443370
tests/std/tableext.test.luau:63:18-18
444-
tests/std/test.test.luau:15:10-27
445-
tests/std/test.test.luau:113:4-9
446-
tests/std/test.test.luau:132:4-9
447-
tests/std/test.test.luau:149:4-9
448-
tests/std/test.test.luau:168:4-9
449-
tests/std/test.test.luau:185:4-9
450-
tests/std/test.test.luau:204:4-9
451-
tests/std/test.test.luau:223:4-9
452-
tests/std/test.test.luau:246:4-9
453-
tests/std/test.test.luau:263:4-9
454-
tests/std/test.test.luau:282:4-9
455-
tests/std/test.test.luau:299:4-9
456-
tests/std/test.test.luau:318:4-9
457-
tests/std/test.test.luau:337:4-9
458371
tools/luthier.luau:158:2-26
459372
tools/luthier.luau:197:3-12
460373
tools/luthier.luau:198:11-25

0 commit comments

Comments
 (0)