authorgravatar for joachim.schmidt557@outlook.comJoachim Schmidt <joachim.schmidt557@outlook.com> 2020-04-09 14:46:13+02:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-04-09 14:57:14-04:00
logf1360bee1ce6096f1c123347313a7d24a0d90650
treec1affb3e0749cdccefc3fa25ea7d32751ff49aae
parentbeae932e0f8ab39f97a142282c67c83c979f8be1

Update docgen to new ArrayList API

1 files changed, 16 insertions(+), 16 deletions(-)

doc/docgen.zig+16-16
...@@ -1108,7 +1108,7 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var...@@ -1108,7 +1108,7 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var
1108 if (expected_outcome == .BuildFail) {1108 if (expected_outcome == .BuildFail) {
1109 const result = try ChildProcess.exec(.{1109 const result = try ChildProcess.exec(.{
1110 .allocator = allocator,1110 .allocator = allocator,
1111 .argv = build_args.span(),1111 .argv = build_args.items,
1112 .env_map = &env_map,1112 .env_map = &env_map,
1113 .max_output_bytes = max_doc_file_size,1113 .max_output_bytes = max_doc_file_size,
1114 });1114 });
...@@ -1116,7 +1116,7 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var...@@ -1116,7 +1116,7 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var
1116 .Exited => |exit_code| {1116 .Exited => |exit_code| {
1117 if (exit_code == 0) {1117 if (exit_code == 0) {
1118 warn("{}\nThe following command incorrectly succeeded:\n", .{result.stderr});1118 warn("{}\nThe following command incorrectly succeeded:\n", .{result.stderr});
1119 for (build_args.span()) |arg|1119 for (build_args.items) |arg|
1120 warn("{} ", .{arg})1120 warn("{} ", .{arg})
1121 else1121 else
1122 warn("\n", .{});1122 warn("\n", .{});
...@@ -1125,7 +1125,7 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var...@@ -1125,7 +1125,7 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var
1125 },1125 },
1126 else => {1126 else => {
1127 warn("{}\nThe following command crashed:\n", .{result.stderr});1127 warn("{}\nThe following command crashed:\n", .{result.stderr});
1128 for (build_args.span()) |arg|1128 for (build_args.items) |arg|
1129 warn("{} ", .{arg})1129 warn("{} ", .{arg})
1130 else1130 else
1131 warn("\n", .{});1131 warn("\n", .{});
...@@ -1137,7 +1137,7 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var...@@ -1137,7 +1137,7 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var
1137 try out.print("\n{}</code></pre>\n", .{colored_stderr});1137 try out.print("\n{}</code></pre>\n", .{colored_stderr});
1138 break :code_block;1138 break :code_block;
1139 }1139 }
1140 const exec_result = exec(allocator, &env_map, build_args.span()) catch1140 const exec_result = exec(allocator, &env_map, build_args.items) catch
1141 return parseError(tokenizer, code.source_token, "example failed to compile", .{});1141 return parseError(tokenizer, code.source_token, "example failed to compile", .{});
11421142
1143 if (code.target_str) |triple| {1143 if (code.target_str) |triple| {
...@@ -1238,7 +1238,7 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var...@@ -1238,7 +1238,7 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var
1238 try test_args.appendSlice(&[_][]const u8{ "-target", triple });1238 try test_args.appendSlice(&[_][]const u8{ "-target", triple });
1239 try out.print(" -target {}", .{triple});1239 try out.print(" -target {}", .{triple});
1240 }1240 }
1241 const result = exec(allocator, &env_map, test_args.span()) catch return parseError(tokenizer, code.source_token, "test failed", .{});1241 const result = exec(allocator, &env_map, test_args.items) catch return parseError(tokenizer, code.source_token, "test failed", .{});
1242 const escaped_stderr = try escapeHtml(allocator, result.stderr);1242 const escaped_stderr = try escapeHtml(allocator, result.stderr);
1243 const escaped_stdout = try escapeHtml(allocator, result.stdout);1243 const escaped_stdout = try escapeHtml(allocator, result.stdout);
1244 try out.print("\n{}{}</code></pre>\n", .{ escaped_stderr, escaped_stdout });1244 try out.print("\n{}{}</code></pre>\n", .{ escaped_stderr, escaped_stdout });
...@@ -1274,7 +1274,7 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var...@@ -1274,7 +1274,7 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var
1274 }1274 }
1275 const result = try ChildProcess.exec(.{1275 const result = try ChildProcess.exec(.{
1276 .allocator = allocator,1276 .allocator = allocator,
1277 .argv = test_args.span(),1277 .argv = test_args.items,
1278 .env_map = &env_map,1278 .env_map = &env_map,
1279 .max_output_bytes = max_doc_file_size,1279 .max_output_bytes = max_doc_file_size,
1280 });1280 });
...@@ -1282,7 +1282,7 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var...@@ -1282,7 +1282,7 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var
1282 .Exited => |exit_code| {1282 .Exited => |exit_code| {
1283 if (exit_code == 0) {1283 if (exit_code == 0) {
1284 warn("{}\nThe following command incorrectly succeeded:\n", .{result.stderr});1284 warn("{}\nThe following command incorrectly succeeded:\n", .{result.stderr});
1285 for (test_args.span()) |arg|1285 for (test_args.items) |arg|
1286 warn("{} ", .{arg})1286 warn("{} ", .{arg})
1287 else1287 else
1288 warn("\n", .{});1288 warn("\n", .{});
...@@ -1291,7 +1291,7 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var...@@ -1291,7 +1291,7 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var
1291 },1291 },
1292 else => {1292 else => {
1293 warn("{}\nThe following command crashed:\n", .{result.stderr});1293 warn("{}\nThe following command crashed:\n", .{result.stderr});
1294 for (test_args.span()) |arg|1294 for (test_args.items) |arg|
1295 warn("{} ", .{arg})1295 warn("{} ", .{arg})
1296 else1296 else
1297 warn("\n", .{});1297 warn("\n", .{});
...@@ -1337,7 +1337,7 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var...@@ -1337,7 +1337,7 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var
13371337
1338 const result = try ChildProcess.exec(.{1338 const result = try ChildProcess.exec(.{
1339 .allocator = allocator,1339 .allocator = allocator,
1340 .argv = test_args.span(),1340 .argv = test_args.items,
1341 .env_map = &env_map,1341 .env_map = &env_map,
1342 .max_output_bytes = max_doc_file_size,1342 .max_output_bytes = max_doc_file_size,
1343 });1343 });
...@@ -1345,7 +1345,7 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var...@@ -1345,7 +1345,7 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var
1345 .Exited => |exit_code| {1345 .Exited => |exit_code| {
1346 if (exit_code == 0) {1346 if (exit_code == 0) {
1347 warn("{}\nThe following command incorrectly succeeded:\n", .{result.stderr});1347 warn("{}\nThe following command incorrectly succeeded:\n", .{result.stderr});
1348 for (test_args.span()) |arg|1348 for (test_args.items) |arg|
1349 warn("{} ", .{arg})1349 warn("{} ", .{arg})
1350 else1350 else
1351 warn("\n", .{});1351 warn("\n", .{});
...@@ -1354,7 +1354,7 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var...@@ -1354,7 +1354,7 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var
1354 },1354 },
1355 else => {1355 else => {
1356 warn("{}\nThe following command crashed:\n", .{result.stderr});1356 warn("{}\nThe following command crashed:\n", .{result.stderr});
1357 for (test_args.span()) |arg|1357 for (test_args.items) |arg|
1358 warn("{} ", .{arg})1358 warn("{} ", .{arg})
1359 else1359 else
1360 warn("\n", .{});1360 warn("\n", .{});
...@@ -1434,7 +1434,7 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var...@@ -1434,7 +1434,7 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var
1434 if (maybe_error_match) |error_match| {1434 if (maybe_error_match) |error_match| {
1435 const result = try ChildProcess.exec(.{1435 const result = try ChildProcess.exec(.{
1436 .allocator = allocator,1436 .allocator = allocator,
1437 .argv = build_args.span(),1437 .argv = build_args.items,
1438 .env_map = &env_map,1438 .env_map = &env_map,
1439 .max_output_bytes = max_doc_file_size,1439 .max_output_bytes = max_doc_file_size,
1440 });1440 });
...@@ -1442,7 +1442,7 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var...@@ -1442,7 +1442,7 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var
1442 .Exited => |exit_code| {1442 .Exited => |exit_code| {
1443 if (exit_code == 0) {1443 if (exit_code == 0) {
1444 warn("{}\nThe following command incorrectly succeeded:\n", .{result.stderr});1444 warn("{}\nThe following command incorrectly succeeded:\n", .{result.stderr});
1445 for (build_args.span()) |arg|1445 for (build_args.items) |arg|
1446 warn("{} ", .{arg})1446 warn("{} ", .{arg})
1447 else1447 else
1448 warn("\n", .{});1448 warn("\n", .{});
...@@ -1451,7 +1451,7 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var...@@ -1451,7 +1451,7 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var
1451 },1451 },
1452 else => {1452 else => {
1453 warn("{}\nThe following command crashed:\n", .{result.stderr});1453 warn("{}\nThe following command crashed:\n", .{result.stderr});
1454 for (build_args.span()) |arg|1454 for (build_args.items) |arg|
1455 warn("{} ", .{arg})1455 warn("{} ", .{arg})
1456 else1456 else
1457 warn("\n", .{});1457 warn("\n", .{});
...@@ -1466,7 +1466,7 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var...@@ -1466,7 +1466,7 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var
1466 const colored_stderr = try termColor(allocator, escaped_stderr);1466 const colored_stderr = try termColor(allocator, escaped_stderr);
1467 try out.print("\n{}", .{colored_stderr});1467 try out.print("\n{}", .{colored_stderr});
1468 } else {1468 } else {
1469 _ = exec(allocator, &env_map, build_args.span()) catch return parseError(tokenizer, code.source_token, "example failed to compile", .{});1469 _ = exec(allocator, &env_map, build_args.items) catch return parseError(tokenizer, code.source_token, "example failed to compile", .{});
1470 }1470 }
1471 if (!code.is_inline) {1471 if (!code.is_inline) {
1472 try out.print("</code></pre>\n", .{});1472 try out.print("</code></pre>\n", .{});
...@@ -1503,7 +1503,7 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var...@@ -1503,7 +1503,7 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var
1503 try test_args.appendSlice(&[_][]const u8{ "-target", triple });1503 try test_args.appendSlice(&[_][]const u8{ "-target", triple });
1504 try out.print(" -target {}", .{triple});1504 try out.print(" -target {}", .{triple});
1505 }1505 }
1506 const result = exec(allocator, &env_map, test_args.span()) catch return parseError(tokenizer, code.source_token, "test failed", .{});1506 const result = exec(allocator, &env_map, test_args.items) catch return parseError(tokenizer, code.source_token, "test failed", .{});
1507 const escaped_stderr = try escapeHtml(allocator, result.stderr);1507 const escaped_stderr = try escapeHtml(allocator, result.stderr);
1508 const escaped_stdout = try escapeHtml(allocator, result.stdout);1508 const escaped_stdout = try escapeHtml(allocator, result.stdout);
1509 try out.print("\n{}{}</code></pre>\n", .{ escaped_stderr, escaped_stdout });1509 try out.print("\n{}{}</code></pre>\n", .{ escaped_stderr, escaped_stdout });