mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-01-02 03:25:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

std.fmt: refactor to remove cacheString

Browse Source 
when this kind of trick is needed, do it inline
This commit is contained in:
Andrew Kelley 2025-07-08 11:07:23 -07:00
parent fc335a3a48
commit 1dcb20d27e
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/std/fmt.zig
View File

@ -167,7 +167,8 @@ pub fn format(w: *Writer, comptime fmt: []const u8, args: anytype) Writer.Error!
comptime assert(fmt[i] == '}'); comptime assert(fmt[i] == '}');
i += 1; i += 1;
const placeholder = comptime Placeholder.parse(&(fmt[fmt_begin..fmt_end].*)); const placeholder_array = fmt[fmt_begin..fmt_end].*;
const placeholder = comptime Placeholder.parse(&placeholder_array);
const arg_pos = comptime switch (placeholder.arg) { const arg_pos = comptime switch (placeholder.arg) {
.none => null, .none => null,
.number => |pos| pos, .number => |pos| pos,
@ -231,10 +232,6 @@ pub fn deprecatedFormat(writer: anytype, comptime fmt: []const u8, args: anytype
}; };
} }
fn cacheString(str: anytype) []const u8 {
return &str;
}
pub const Placeholder = struct { pub const Placeholder = struct {
specifier_arg: []const u8, specifier_arg: []const u8,
fill: u8, fill: u8,
@ -243,7 +240,7 @@ pub const Placeholder = struct {
width: Specifier, width: Specifier,
precision: Specifier, precision: Specifier,
pub fn parse(bytes: []const u8) Placeholder { pub fn parse(comptime bytes: []const u8) Placeholder {
var parser: Parser = .{ .bytes = bytes, .i = 0 }; var parser: Parser = .{ .bytes = bytes, .i = 0 };
const arg = parser.specifier() catch |err| @compileError(@errorName(err)); const arg = parser.specifier() catch |err| @compileError(@errorName(err));
const specifier_arg = parser.until(':'); const specifier_arg = parser.until(':');
@ -298,8 +295,10 @@ pub const Placeholder = struct {
if (parser.char()) |b| @compileError("extraneous trailing character '" ++ &[1]u8{b} ++ "'"); if (parser.char()) |b| @compileError("extraneous trailing character '" ++ &[1]u8{b} ++ "'");
const specifier_array = specifier_arg[0..specifier_arg.len].*;
return .{ return .{
.specifier_arg = cacheString(specifier_arg[0..specifier_arg.len].*), .specifier_arg = &specifier_array,
.fill = fill orelse default_fill_char, .fill = fill orelse default_fill_char,
.alignment = alignment orelse default_alignment, .alignment = alignment orelse default_alignment,
.arg = arg, .arg = arg,