Skip to content

Commit 5f2916f

Browse files
committed
trim whitespace from failure descriptions
Damn CRLF newlines...
1 parent 31ddee9 commit 5f2916f

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

ClarTestStep.zig

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,8 @@ const TapParser = struct {
176176
// Failure parsing
177177
.desc => {
178178
const name_start = skip(line, keyword.spacer1, keyword.not_ok.len) orelse @panic("expected spacer");
179-
try p.wip_failure.description.appendSlice(step_arena, line[name_start..]);
179+
const name = std.mem.trim(u8, line[name_start..], &std.ascii.whitespace);
180+
try p.wip_failure.description.appendSlice(step_arena, name);
180181
try p.wip_failure.description.appendSlice(step_arena, ": ");
181182
p.state = .yaml_start;
182183
},
@@ -198,14 +199,15 @@ const TapParser = struct {
198199
},
199200
.file => {
200201
const file_start = skip(line, keyword.file, 0) orelse @panic("expected file");
201-
const file = std.mem.trim(u8, line[file_start..], &.{'\''});
202+
const file = std.mem.trim(u8, line[file_start..], std.ascii.whitespace ++ "'");
202203
try p.wip_failure.description.appendSlice(step_arena, file);
203204
try p.wip_failure.description.append(step_arena, ':');
204205
p.state = .line;
205206
},
206207
.line => {
207208
const line_start = skip(line, keyword.line, 0) orelse @panic("expected line");
208-
try p.wip_failure.description.appendSlice(step_arena, line[line_start..]);
209+
const fail_line = std.mem.trim(u8, line[line_start..], &std.ascii.whitespace);
210+
try p.wip_failure.description.appendSlice(step_arena, fail_line);
209211
p.state = .start;
210212
return .{ .failure = p.wip_failure };
211213
},

0 commit comments

Comments
 (0)