From 1f6d82ec01b09b7a8a6285810dd4c68624621df3 Mon Sep 17 00:00:00 2001 From: Eric Joldasov Date: Mon, 9 Oct 2023 22:50:10 +0600 Subject: [PATCH] std.cstr: remove deprecated namespace Followup to 0a868dacdd31b7d5c529a332da718683477a2505 . Signed-off-by: Eric Joldasov --- lib/std/cstr.zig | 3 --- lib/std/std.zig | 2 -- lib/std/zig/parser_test.zig | 12 ++++++------ 3 files changed, 6 insertions(+), 11 deletions(-) delete mode 100644 lib/std/cstr.zig diff --git a/lib/std/cstr.zig b/lib/std/cstr.zig deleted file mode 100644 index 83c6c12a87..0000000000 --- a/lib/std/cstr.zig +++ /dev/null @@ -1,3 +0,0 @@ -pub const line_sep = @compileError("deprecated; choose correct end-of-line sequence of characters by yourself instead"); -pub const cmp = @compileError("deprecated; use `std.mem.orderZ` instead"); -pub const addNullByte = @compileError("deprecated; use `allocator.dupeZ(u8, stuff)` instead"); diff --git a/lib/std/std.zig b/lib/std/std.zig index 0046d10f3f..16222e52da 100644 --- a/lib/std/std.zig +++ b/lib/std/std.zig @@ -80,8 +80,6 @@ pub const comptime_string_map = @import("comptime_string_map.zig"); /// Cryptography. pub const crypto = @import("crypto.zig"); -pub const cstr = @import("cstr.zig"); - /// Debug printing, allocation and other debug helpers. pub const debug = @import("debug.zig"); diff --git a/lib/std/zig/parser_test.zig b/lib/std/zig/parser_test.zig index cbdb83e304..4117bd6d4b 100644 --- a/lib/std/zig/parser_test.zig +++ b/lib/std/zig/parser_test.zig @@ -2109,14 +2109,14 @@ test "zig fmt: multiline string parameter in fn call with trailing comma" { try testCanonical( \\fn foo() void { \\ try stdout.print( - \\ \\ZIG_CMAKE_BINARY_DIR {} - \\ \\ZIG_C_HEADER_FILES {} - \\ \\ZIG_DIA_GUIDS_LIB {} + \\ \\ZIG_CMAKE_BINARY_DIR {s} + \\ \\ZIG_C_HEADER_FILES {s} + \\ \\ZIG_DIA_GUIDS_LIB {s} \\ \\ \\ , - \\ std.cstr.toSliceConst(c.ZIG_CMAKE_BINARY_DIR), - \\ std.cstr.toSliceConst(c.ZIG_CXX_COMPILER), - \\ std.cstr.toSliceConst(c.ZIG_DIA_GUIDS_LIB), + \\ std.mem.sliceTo(c.ZIG_CMAKE_BINARY_DIR, 0), + \\ std.mem.sliceTo(c.ZIG_CXX_COMPILER, 0), + \\ std.mem.sliceTo(c.ZIG_DIA_GUIDS_LIB, 0), \\ ); \\} \\