Skip to content

Commit 310a16f

Browse files
committed
Remove unnecessary optional return type
1 parent 8749301 commit 310a16f

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

src/lib/ast.zig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,13 +219,13 @@ test "deferBlock - has expected children" {
219219
var tmp = std.testing.tmpDir(.{});
220220
defer tmp.cleanup();
221221

222-
var doc = (try testing.loadFakeDocument(
222+
var doc = try testing.loadFakeDocument(
223223
&ctx,
224224
tmp.dir,
225225
"test.zig",
226226
"fn main() void {\n" ++ source ++ "\n}",
227227
arena.allocator(),
228-
)).?;
228+
);
229229
defer doc.deinit(arena.allocator());
230230

231231
const decl_ref = try deferBlock(

src/lib/session.zig

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -620,13 +620,13 @@ test "LintDocument.isEnclosedInTestBlock" {
620620
\\}
621621
;
622622

623-
var doc = (try testing.loadFakeDocument(
623+
var doc = try testing.loadFakeDocument(
624624
&ctx,
625625
tmp.dir,
626626
"test.zig",
627627
source,
628628
arena.allocator(),
629-
)).?;
629+
);
630630
defer doc.deinit(ctx.gpa);
631631

632632
try std.testing.expect(
@@ -988,13 +988,13 @@ test "LintDocument.resolveTypeKind" {
988988
var arena = std.heap.ArenaAllocator.init(std.testing.allocator);
989989
defer arena.deinit();
990990

991-
var doc = (try testing.loadFakeDocument(
991+
var doc = try testing.loadFakeDocument(
992992
&ctx,
993993
tmp.dir,
994994
"test.zig",
995995
test_case.contents,
996996
arena.allocator(),
997-
)).?;
997+
);
998998
defer doc.deinit(ctx.gpa);
999999

10001000
const node = doc.handle.tree.rootDecls()[0];

src/lib/testing.zig

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ pub fn loadFakeDocument(
77
file_name: []const u8,
88
contents: [:0]const u8,
99
arena: std.mem.Allocator,
10-
) !?LintDocument {
10+
) !LintDocument {
1111
assertTestOnly();
1212

1313
if (std.fs.path.dirname(file_name)) |dir_name|
@@ -214,13 +214,13 @@ fn runRule(rule: LintRule, file_name: []const u8, contents: [:0]const u8, option
214214
var arena = std.heap.ArenaAllocator.init(std.testing.allocator);
215215
defer arena.deinit();
216216

217-
var doc = (try loadFakeDocument(
217+
var doc = try loadFakeDocument(
218218
&ctx,
219219
tmp.dir,
220220
file_name,
221221
contents,
222222
arena.allocator(),
223-
)).?;
223+
);
224224
defer doc.deinit(ctx.gpa);
225225

226226
const tree = doc.handle.tree;
@@ -388,13 +388,13 @@ pub fn initDocForTesting(
388388
const doc = try arena.create(LintDocument);
389389
errdefer arena.destroy(doc);
390390

391-
doc.* = (try loadFakeDocument(
391+
doc.* = try loadFakeDocument(
392392
ctx,
393393
tmp.dir,
394394
"test.zig",
395395
source,
396396
arena,
397-
)).?;
397+
);
398398

399399
return doc;
400400
}

src/rules/require_errdefer_dealloc.zig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -399,13 +399,13 @@ test "hasNonFreeingAllocatorParam" {
399399
var tmp = std.testing.tmpDir(.{});
400400
defer tmp.cleanup();
401401

402-
var doc = (try zlinter.testing.loadFakeDocument(
402+
var doc = try zlinter.testing.loadFakeDocument(
403403
&ctx,
404404
tmp.dir,
405405
"test.zig",
406406
"fn main() void {\n" ++ source ++ "\n}",
407407
arena.allocator(),
408-
)).?;
408+
);
409409
defer doc.deinit(ctx.gpa);
410410

411411
const tree = doc.handle.tree;

0 commit comments

Comments
 (0)