authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-01-19 21:06:41-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-01-19 21:06:41-05:00
log20af858601e015ba76f23033d0af1d672db097ac
tree83aac6d8bd58678f2238c8e1303032b7f47e015b
parente3b5e9187811e23fbf1565a9c8a14996f1aad659
signature Commit is signed but in an unrecognized format.

some fixes

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

lib/std/buffer.zig+1-1
...@@ -59,7 +59,7 @@ pub const Buffer = struct {...@@ -59,7 +59,7 @@ pub const Buffer = struct {
59 /// is safe to `deinit`.59 /// is safe to `deinit`.
60 pub fn toOwnedSlice(self: *Buffer) [:0]u8 {60 pub fn toOwnedSlice(self: *Buffer) [:0]u8 {
61 const allocator = self.list.allocator;61 const allocator = self.list.allocator;
62 const result = allocator.shrink(self.list.items, self.len());62 const result = self.list.toOwnedSlice();
63 self.* = initNull(allocator);63 self.* = initNull(allocator);
64 return result[0 .. result.len - 1 :0];64 return result[0 .. result.len - 1 :0];
65 }65 }
src-self-hosted/stage1.zig+4-4
...@@ -542,14 +542,14 @@ export fn stage2_list_features_for_arch(arch_name_ptr: [*]const u8, arch_name_le...@@ -542,14 +542,14 @@ export fn stage2_list_features_for_arch(arch_name_ptr: [*]const u8, arch_name_le
542fn printFeaturesForArch(arch_name: []const u8, show_dependencies: bool) !void {542fn printFeaturesForArch(arch_name: []const u8, show_dependencies: bool) !void {
543 const stdout_stream = &std.io.getStdOut().outStream().stream;543 const stdout_stream = &std.io.getStdOut().outStream().stream;
544544
545 const arch = Target.parseArchTag(arch_name) catch {545 const arch = Target.parseArchSub(arch_name) catch {
546 std.debug.warn("Failed to parse arch '{}'\nInvoke 'zig targets' for a list of valid architectures\n", .{arch_name});546 std.debug.warn("Failed to parse arch '{}'\nInvoke 'zig targets' for a list of valid architectures\n", .{arch_name});
547 return;547 return;
548 };548 };
549549
550 try stdout_stream.print("Available features for {}:\n", .{@tagName(arch)});550 try stdout_stream.print("Available features for {}:\n", .{@tagName(arch)});
551551
552 const features = std.target.getFeaturesForArch(arch);552 const features = arch.allFeaturesList();
553553
554 var longest_len: usize = 0;554 var longest_len: usize = 0;
555 for (features) |feature| {555 for (features) |feature| {
...@@ -568,7 +568,7 @@ fn printFeaturesForArch(arch_name: []const u8, show_dependencies: bool) !void {...@@ -568,7 +568,7 @@ fn printFeaturesForArch(arch_name: []const u8, show_dependencies: bool) !void {
568568
569 try stdout_stream.print(" - {}\n", .{feature.description});569 try stdout_stream.print(" - {}\n", .{feature.description});
570570
571 if (show_dependencies and feature.dependencies.len > 0) {571 if (show_dependencies and feature.dependencies != 0) {
572 for (feature.dependencies) |dependency| {572 for (feature.dependencies) |dependency| {
573 try stdout_stream.print(" {}\n", .{dependency.name});573 try stdout_stream.print(" {}\n", .{dependency.name});
574 }574 }
...@@ -622,7 +622,7 @@ fn printCpusForArch(arch_name: []const u8, show_dependencies: bool) !void {...@@ -622,7 +622,7 @@ fn printCpusForArch(arch_name: []const u8, show_dependencies: bool) !void {
622622
623const Stage2CpuFeatures = struct {623const Stage2CpuFeatures = struct {
624 allocator: *mem.Allocator,624 allocator: *mem.Allocator,
625 cpu_features: Target.CpuFeatures,625 cpu_features: Target.Cross.CpuFeatures,
626626
627 llvm_cpu_name: ?[:0]const u8,627 llvm_cpu_name: ?[:0]const u8,
628 llvm_features_str: ?[:0]const u8,628 llvm_features_str: ?[:0]const u8,