Commit ef3d761da545a3a72928ed0e0ba3b749a4cb74d8 | zig

author	Andrew Kelley <andrew@ziglang.org> 2020-03-01 13:21:29-05:00
committer	Andrew Kelley <andrew@ziglang.org> 2020-03-01 13:21:39-05:00
log	ef3d761da545a3a72928ed0e0ba3b749a4cb74d8
tree	d05e7ddf19d709975f432e60f5a2321309078517
parent	5b26128bacddf594dfe45958a236bfa2459f878b
signature	Commit is signed but in an unrecognized format.

breaking: std.mem.len no longer takes a type argument

also update fmt code to use std.mem.span.

8 files changed, 27 insertions(+), 29 deletions(-)

lib
- std
  - cstr.zig
  - fmt.zig
  - mem.zig
  - net.zig
  - os.zig
  - special
    c.zig
src-self-hosted
- translate_c.zig
test
- stage1
  - behavior
    misc.zig

lib/std/cstr.zig+1-1

...	@@ -28,7 +28,7 @@ test "cstr fns" {	...	@@ -28,7 +28,7 @@ test "cstr fns" {
28		28
29	fn testCStrFnsImpl() void {	29	fn testCStrFnsImpl() void {
30	testing.expect(cmp("aoeu", "aoez") == -1);	30	testing.expect(cmp("aoeu", "aoez") == -1);
31	testing.expect(mem.len(u8, "123456789") == 9);	31	testing.expect(mem.len("123456789") == 9);
32	}	32	}
33		33
34	/// Returns a mutable, null-terminated slice with the same length as `slice`.	34	/// Returns a mutable, null-terminated slice with the same length as `slice`.

lib/std/fmt.zig+2-4

 @@ -442,13 +442,11 @@ pub fn formatType(
             },
             .Many, .C => {
                 if (ptr_info.sentinel) |sentinel| {
-                    const slice = mem.pointerToSlice([:sentinel]const ptr_info.child, value);
+                    return formatType(mem.span(value), fmt, options, context, Errors, output, max_depth);
-                    return formatType(slice, fmt, options, context, Errors, output, max_depth);
                 }
                 if (ptr_info.child == u8) {
                     if (fmt.len > 0 and fmt[0] == 's') {
-                        const slice = mem.pointerToSlice([:0]const u8, @as([*:0]const u8, value));
+                        return formatText(mem.span(value), fmt, options, context, Errors, output);
-                        return formatText(slice, fmt, options, context, Errors, output);
                     }
                 }
                 return format(context, Errors, output, "{}@{x}", .{ @typeName(T.Child), @ptrToInt(value) });

lib/std/mem.zig+19-19

 @@ -482,27 +482,21 @@ pub fn eql(comptime T: type, a: []const T, b: []const T) bool {
     return true;
 }
-/// Deprecated. Use `length` or `indexOfSentinel`.
-pub fn len(comptime T: type, ptr: [*:0]const T) usize {
-    var count: usize = 0;
-    while (ptr[count] != 0) : (count += 1) {}
-    return count;
-}
 /// Deprecated. Use `span`.
 pub fn toSliceConst(comptime T: type, ptr: [*:0]const T) [:0]const T {
-    return ptr[0..len(T, ptr) :0];
+    return ptr[0..len(ptr) :0];
 }
 /// Deprecated. Use `span`.
 pub fn toSlice(comptime T: type, ptr: [*:0]T) [:0]T {
-    return ptr[0..len(T, ptr) :0];
+    return ptr[0..len(ptr) :0];
 }
 /// Takes a pointer to an array, a sentinel-terminated pointer, or a slice, and
 /// returns a slice. If there is a sentinel on the input type, there will be a
 /// sentinel on the output type. The constness of the output type matches
-/// the constness of the input type. `[*c]` pointers are assumed to be 0-terminated.
+/// the constness of the input type. `[*c]` pointers are assumed to be 0-terminated,
+/// and assumed to not allow null.
 pub fn Span(comptime T: type) type {
     var ptr_info = @typeInfo(T).Pointer;
     switch (ptr_info.size) {
 @@ -515,6 +509,7 @@ pub fn Span(comptime T: type) type {
         },
         .C => {
             ptr_info.sentinel = 0;
+            ptr_info.is_allowzero = false;
         },
         .Many, .Slice => {},
     }
 @@ -541,7 +536,7 @@ test "Span" {
 /// the constness of the input type.
 pub fn span(ptr: var) Span(@TypeOf(ptr)) {
     const Result = Span(@TypeOf(ptr));
-    const l = length(ptr);
+    const l = len(ptr);
     if (@typeInfo(Result).Pointer.sentinel) |s| {
         return ptr[0..l :s];
     } else {
 @@ -558,7 +553,7 @@ test "span" {
 /// Takes a pointer to an array, an array, a sentinel-terminated pointer,
 /// or a slice, and returns the length.
-pub fn length(ptr: var) usize {
+pub fn len(ptr: var) usize {
     return switch (@typeInfo(@TypeOf(ptr))) {
         .Array => |info| info.len,
         .Pointer => |info| switch (info.size) {
 @@ -577,16 +572,16 @@ pub fn length(ptr: var) usize {
     };
 }
-test "length" {
+test "len" {
-    testing.expect(length("aoeu") == 4);
+    testing.expect(len("aoeu") == 4);
     {
         var array: [5]u16 = [_]u16{ 1, 2, 3, 4, 5 };
-        testing.expect(length(&array) == 5);
+        testing.expect(len(&array) == 5);
-        testing.expect(length(array[0..3]) == 3);
+        testing.expect(len(array[0..3]) == 3);
         array[2] = 0;
         const ptr = array[0..2 :0].ptr;
-        testing.expect(length(ptr) == 2);
+        testing.expect(len(ptr) == 2);
     }
 }
 @@ -1867,8 +1862,13 @@ fn SubArrayPtrReturnType(comptime T: type, comptime length: usize) type {
     return *[length]meta.Child(meta.Child(T));
 }
-///Given a pointer to an array, returns a pointer to a portion of that array, preserving constness.
+/// Given a pointer to an array, returns a pointer to a portion of that array, preserving constness.
-pub fn subArrayPtr(ptr: var, comptime start: usize, comptime length: usize) SubArrayPtrReturnType(@TypeOf(ptr), length) {
+/// TODO this will be obsoleted by https://github.com/ziglang/zig/issues/863
+pub fn subArrayPtr(
+    ptr: var,
+    comptime start: usize,
+    comptime length: usize,
+) SubArrayPtrReturnType(@TypeOf(ptr), length) {
     assert(start + length <= ptr.*.len);
     const ReturnType = SubArrayPtrReturnType(@TypeOf(ptr), length);

lib/std/net.zig+1-1

...	@@ -352,7 +352,7 @@ pub const Address = extern union {	...	@@ -352,7 +352,7 @@ pub const Address = extern union {
352	unreachable;	352	unreachable;
353	}	353	}
354		354
355	const path_len = std.mem.len(u8, @ptrCast([*:0]const u8, &self.un.path));	355	const path_len = std.mem.len(@ptrCast([*:0]const u8, &self.un.path));
356	return @intCast(os.socklen_t, @sizeOf(os.sockaddr_un) - self.un.path.len + path_len);	356	return @intCast(os.socklen_t, @sizeOf(os.sockaddr_un) - self.un.path.len + path_len);
357	},	357	},
358	else => unreachable,	358	else => unreachable,

lib/std/os.zig+1-1

...	@@ -1095,7 +1095,7 @@ pub fn createNullDelimitedEnvMap(allocator: mem.Allocator, env_map: const std.	...	@@ -1095,7 +1095,7 @@ pub fn createNullDelimitedEnvMap(allocator: mem.Allocator, env_map: const std.
1095		1095
1096	pub fn freeNullDelimitedEnvMap(allocator: mem.Allocator, envp_buf: []?[:0]u8) void {	1096	pub fn freeNullDelimitedEnvMap(allocator: mem.Allocator, envp_buf: []?[:0]u8) void {
1097	for (envp_buf) \|env\| {	1097	for (envp_buf) \|env\| {
1098	const env_buf = if (env) \|ptr\| ptr[0 .. mem.len(u8, ptr) + 1] else break;	1098	const env_buf = if (env) \|ptr\| ptr[0 .. mem.len(ptr) + 1] else break;
1099	allocator.free(env_buf);	1099	allocator.free(env_buf);
1100	}	1100	}
1101	allocator.free(envp_buf);	1101	allocator.free(envp_buf);

lib/std/special/c.zig+1-1

...	@@ -47,7 +47,7 @@ fn strcmp(s1: [:0]const u8, s2: [:0]const u8) callconv(.C) c_int {	...	@@ -47,7 +47,7 @@ fn strcmp(s1: [:0]const u8, s2: [:0]const u8) callconv(.C) c_int {
47	}	47	}
48		48
49	fn strlen(s: [*:0]const u8) callconv(.C) usize {	49	fn strlen(s: [*:0]const u8) callconv(.C) usize {
50	return std.mem.len(u8, s);	50	return std.mem.len(s);
51	}	51	}
52		52
53	fn strncmp(_l: [:0]const u8, _r: [:0]const u8, _n: usize) callconv(.C) c_int {	53	fn strncmp(_l: [:0]const u8, _r: [:0]const u8, _n: usize) callconv(.C) c_int {

src-self-hosted/translate_c.zig+1-1

...	@@ -4849,7 +4849,7 @@ fn transPreprocessorEntities(c: Context, unit: ZigClangASTUnit) Error!void {	...	@@ -4849,7 +4849,7 @@ fn transPreprocessorEntities(c: Context, unit: ZigClangASTUnit) Error!void {
4849	}	4849	}
4850		4850
4851	const begin_c = ZigClangSourceManager_getCharacterData(c.source_manager, begin_loc);	4851	const begin_c = ZigClangSourceManager_getCharacterData(c.source_manager, begin_loc);
4852	const slice = begin_c[0..mem.len(u8, begin_c)];	4852	const slice = begin_c[0..mem.len(begin_c)];
4853		4853
4854	tok_list.shrink(0);	4854	tok_list.shrink(0);
4855	var tokenizer = std.c.Tokenizer{	4855	var tokenizer = std.c.Tokenizer{

test/stage1/behavior/misc.zig+1-1

...	@@ -335,7 +335,7 @@ test "string concatenation" {	...	@@ -335,7 +335,7 @@ test "string concatenation" {
335	comptime expect(@TypeOf(a) == *const [12:0]u8);	335	comptime expect(@TypeOf(a) == *const [12:0]u8);
336	comptime expect(@TypeOf(b) == *const [12:0]u8);	336	comptime expect(@TypeOf(b) == *const [12:0]u8);
337		337
338	const len = mem.len(u8, b);	338	const len = mem.len(b);
339	const len_with_null = len + 1;	339	const len_with_null = len + 1;
340	{	340	{
341	var i: u32 = 0;	341	var i: u32 = 0;