diff options
| author | LemonBoy <thatlemon@gmail.com> | 2020-11-26 19:14:22 +0100 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2021-01-02 17:12:57 -0700 |
| commit | 1fbe89dc2e204defc18add72efd2bba4dbe728fc (patch) | |
| tree | 2002b7d890016ebff5d7205bcfd4fbb8ccd0749e /src | |
| parent | d2f6fa1608f31cbd7137f81b5dd6df2977766eae (diff) | |
| download | zig-1fbe89dc2e204defc18add72efd2bba4dbe728fc.tar.gz zig-1fbe89dc2e204defc18add72efd2bba4dbe728fc.zip | |
langref: Update langref to use {s}
Diffstat (limited to 'src')
| -rw-r--r-- | src/astgen.zig | 6 | ||||
| -rw-r--r-- | src/link/MachO.zig | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/astgen.zig b/src/astgen.zig index b4e1760368..b3cb648dcb 100644 --- a/src/astgen.zig +++ b/src/astgen.zig @@ -560,14 +560,14 @@ fn varDecl( .local_val => { const local_val = s.cast(Scope.LocalVal).?; if (mem.eql(u8, local_val.name, ident_name)) { - return mod.fail(scope, name_src, "redefinition of '{}'", .{ident_name}); + return mod.fail(scope, name_src, "redefinition of '{s}'", .{ident_name}); } s = local_val.parent; }, .local_ptr => { const local_ptr = s.cast(Scope.LocalPtr).?; if (mem.eql(u8, local_ptr.name, ident_name)) { - return mod.fail(scope, name_src, "redefinition of '{}'", .{ident_name}); + return mod.fail(scope, name_src, "redefinition of '{s}'", .{ident_name}); } s = local_ptr.parent; }, @@ -578,7 +578,7 @@ fn varDecl( // Namespace vars shadowing detection if (mod.lookupDeclName(scope, ident_name)) |_| { - return mod.fail(scope, name_src, "redefinition of '{}'", .{ident_name}); + return mod.fail(scope, name_src, "redefinition of '{s}'", .{ident_name}); } const init_node = node.getInitNode() orelse return mod.fail(scope, name_src, "variables must be initialized", .{}); diff --git a/src/link/MachO.zig b/src/link/MachO.zig index d4a61c8149..3f8544a4e8 100644 --- a/src/link/MachO.zig +++ b/src/link/MachO.zig @@ -620,7 +620,7 @@ fn linkWithLLD(self: *MachO, comp: *Compilation) !void { try argv.append(cur_vers); } - const dylib_install_name = try std.fmt.allocPrint(arena, "@rpath/{}", .{self.base.options.emit.?.sub_path}); + const dylib_install_name = try std.fmt.allocPrint(arena, "@rpath/{s}", .{self.base.options.emit.?.sub_path}); try argv.append("-install_name"); try argv.append(dylib_install_name); } |