authorgravatar for marc@tiehu.isMarc Tiehuis <marc@tiehu.is> 2019-08-19 22:28:13+12:00
committergravatar for marc@tiehu.isMarc Tiehuis <marc@tiehu.is> 2019-08-19 22:28:13+12:00
loge0447c6ddd71d400fc501bf33c4cb33dde4e3300
tree5dcc5766d590588a7ce86b89fab71e1bd4535110
parent98859c885e8e66518c1081c56d203cdd77c51ce8

std/fmt: Make FormatOptions arguments non-comptime

No need and should help avoid exessive function monomorphizaton.

2 files changed, 18 insertions(+), 18 deletions(-)

std/fmt.zig+17-17
......@@ -276,7 +276,7 @@ pub fn format(
276276pub fn formatType(
277277 value: var,
278278 comptime fmt: []const u8,
279 comptime options: FormatOptions,
279 options: FormatOptions,
280280 context: var,
281281 comptime Errors: type,
282282 output: fn (@typeOf(context), []const u8) Errors!void,
......@@ -428,7 +428,7 @@ pub fn formatType(
428428fn formatValue(
429429 value: var,
430430 comptime fmt: []const u8,
431 comptime options: FormatOptions,
431 options: FormatOptions,
432432 context: var,
433433 comptime Errors: type,
434434 output: fn (@typeOf(context), []const u8) Errors!void,
......@@ -450,7 +450,7 @@ fn formatValue(
450450pub fn formatIntValue(
451451 value: var,
452452 comptime fmt: []const u8,
453 comptime options: FormatOptions,
453 options: FormatOptions,
454454 context: var,
455455 comptime Errors: type,
456456 output: fn (@typeOf(context), []const u8) Errors!void,
......@@ -492,7 +492,7 @@ pub fn formatIntValue(
492492fn formatFloatValue(
493493 value: var,
494494 comptime fmt: []const u8,
495 comptime options: FormatOptions,
495 options: FormatOptions,
496496 context: var,
497497 comptime Errors: type,
498498 output: fn (@typeOf(context), []const u8) Errors!void,
......@@ -509,7 +509,7 @@ fn formatFloatValue(
509509pub fn formatText(
510510 bytes: []const u8,
511511 comptime fmt: []const u8,
512 comptime options: FormatOptions,
512 options: FormatOptions,
513513 context: var,
514514 comptime Errors: type,
515515 output: fn (@typeOf(context), []const u8) Errors!void,
......@@ -530,7 +530,7 @@ pub fn formatText(
530530
531531pub fn formatAsciiChar(
532532 c: u8,
533 comptime options: FormatOptions,
533 options: FormatOptions,
534534 context: var,
535535 comptime Errors: type,
536536 output: fn (@typeOf(context), []const u8) Errors!void,
......@@ -540,7 +540,7 @@ pub fn formatAsciiChar(
540540
541541pub fn formatBuf(
542542 buf: []const u8,
543 comptime options: FormatOptions,
543 options: FormatOptions,
544544 context: var,
545545 comptime Errors: type,
546546 output: fn (@typeOf(context), []const u8) Errors!void,
......@@ -560,7 +560,7 @@ pub fn formatBuf(
560560// same type unambiguously.
561561pub fn formatFloatScientific(
562562 value: var,
563 comptime options: FormatOptions,
563 options: FormatOptions,
564564 context: var,
565565 comptime Errors: type,
566566 output: fn (@typeOf(context), []const u8) Errors!void,
......@@ -655,7 +655,7 @@ pub fn formatFloatScientific(
655655// By default floats are printed at full precision (no rounding).
656656pub fn formatFloatDecimal(
657657 value: var,
658 comptime options: FormatOptions,
658 options: FormatOptions,
659659 context: var,
660660 comptime Errors: type,
661661 output: fn (@typeOf(context), []const u8) Errors!void,
......@@ -800,7 +800,7 @@ pub fn formatFloatDecimal(
800800
801801pub fn formatBytes(
802802 value: var,
803 comptime options: FormatOptions,
803 options: FormatOptions,
804804 comptime radix: usize,
805805 context: var,
806806 comptime Errors: type,
......@@ -842,7 +842,7 @@ pub fn formatInt(
842842 value: var,
843843 base: u8,
844844 uppercase: bool,
845 comptime options: FormatOptions,
845 options: FormatOptions,
846846 context: var,
847847 comptime Errors: type,
848848 output: fn (@typeOf(context), []const u8) Errors!void,
......@@ -864,7 +864,7 @@ fn formatIntSigned(
864864 value: var,
865865 base: u8,
866866 uppercase: bool,
867 comptime options: FormatOptions,
867 options: FormatOptions,
868868 context: var,
869869 comptime Errors: type,
870870 output: fn (@typeOf(context), []const u8) Errors!void,
......@@ -895,7 +895,7 @@ fn formatIntUnsigned(
895895 value: var,
896896 base: u8,
897897 uppercase: bool,
898 comptime options: FormatOptions,
898 options: FormatOptions,
899899 context: var,
900900 comptime Errors: type,
901901 output: fn (@typeOf(context), []const u8) Errors!void,
......@@ -936,7 +936,7 @@ fn formatIntUnsigned(
936936 }
937937}
938938
939pub fn formatIntBuf(out_buf: []u8, value: var, base: u8, uppercase: bool, comptime options: FormatOptions) usize {
939pub fn formatIntBuf(out_buf: []u8, value: var, base: u8, uppercase: bool, options: FormatOptions) usize {
940940 var context = FormatIntBuf{
941941 .out_buf = out_buf,
942942 .index = 0,
......@@ -1099,7 +1099,7 @@ test "bufPrintInt" {
10991099 testing.expect(mem.eql(u8, bufPrintIntToSlice(buf, i32(-42), 10, false, FormatOptions{ .width = 3 }), "-42"));
11001100}
11011101
1102fn bufPrintIntToSlice(buf: []u8, value: var, base: u8, uppercase: bool, comptime options: FormatOptions) []u8 {
1102fn bufPrintIntToSlice(buf: []u8, value: var, base: u8, uppercase: bool, options: FormatOptions) []u8 {
11031103 return buf[0..formatIntBuf(buf, value, base, uppercase, options)];
11041104}
11051105
......@@ -1339,7 +1339,7 @@ test "custom" {
13391339 pub fn format(
13401340 self: SelfType,
13411341 comptime fmt: []const u8,
1342 comptime options: FormatOptions,
1342 options: FormatOptions,
13431343 context: var,
13441344 comptime Errors: type,
13451345 output: fn (@typeOf(context), []const u8) Errors!void,
......@@ -1545,7 +1545,7 @@ test "formatType max_depth" {
15451545 pub fn format(
15461546 self: SelfType,
15471547 comptime fmt: []const u8,
1548 comptime options: FormatOptions,
1548 options: FormatOptions,
15491549 context: var,
15501550 comptime Errors: type,
15511551 output: fn (@typeOf(context), []const u8) Errors!void,
std/math/big/int.zig+1-1
......@@ -519,7 +519,7 @@ pub const Int = struct {
519519 pub fn format(
520520 self: Int,
521521 comptime fmt: []const u8,
522 comptime options: std.fmt.FormatOptions,
522 options: std.fmt.FormatOptions,
523523 context: var,
524524 comptime FmtError: type,
525525 output: fn (@typeOf(context), []const u8) FmtError!void,