From 08047cd6d710603a5391c9e88a7369f5dcfa196f Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Sat, 22 Feb 2020 18:02:55 +0100
Subject: [PATCH] correct test expectations

---
 lib/std/debug.zig     |  4 ++--
 test/stack_traces.zig | 37 +++++++++++++++++++------------------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/lib/std/debug.zig b/lib/std/debug.zig
index cce3cd7917..a9f9819a25 100644
--- a/lib/std/debug.zig
+++ b/lib/std/debug.zig
@@ -493,7 +493,7 @@ fn populateModule(di: *ModuleDebugInfo, mod: *Module) !void {
         sect_offset += @sizeOf(pdb.DebugSubsectionHeader);
 
         switch (subsect_hdr.Kind) {
-            pdb.DebugSubsectionKind.FileChecksums => {
+            .FileChecksums => {
                 mod.checksum_offset = sect_offset;
                 break;
             },
@@ -1465,7 +1465,7 @@ pub const ModuleDebugInfo = switch (builtin.os) {
                     sect_offset += @sizeOf(pdb.DebugSubsectionHeader);
 
                     switch (subsect_hdr.Kind) {
-                        pdb.DebugSubsectionKind.Lines => {
+                        .Lines => {
                             var line_index = sect_offset;
 
                             const line_hdr = @ptrCast(*pdb.LineFragmentHeader, &subsect_info[line_index]);
diff --git a/test/stack_traces.zig b/test/stack_traces.zig
index 81e074f01e..fd4ff69964 100644
--- a/test/stack_traces.zig
+++ b/test/stack_traces.zig
@@ -3,6 +3,7 @@ const std = @import("std");
 const os = std.os;
 const tests = @import("tests.zig");
 
+// zig fmt: off
 pub fn addCases(cases: *tests.StackTracesContext) void {
     const source_return =
         \\const std = @import("std");
@@ -41,7 +42,7 @@ pub fn addCases(cases: *tests.StackTracesContext) void {
         \\    try foo();
         \\}
     ;
-    // zig fmt: off
+
     switch (builtin.os) {
         .freebsd => {
             cases.addCase(
@@ -264,14 +265,14 @@ pub fn addCases(cases: *tests.StackTracesContext) void {
                 [_][]const u8{
                 // debug
                     \\error: TheSkyIsFalling
-                    \\source.zig:4:5: [address] in _main.0 (test.o)
+                    \\source.zig:4:5: [address] in main (test)
                     \\    return error.TheSkyIsFalling;
                     \\    ^
                     \\
                 ,
                 // release-safe
                     \\error: TheSkyIsFalling
-                    \\source.zig:4:5: [address] in _main (test.o)
+                    \\source.zig:4:5: [address] in std.start.main (test)
                     \\    return error.TheSkyIsFalling;
                     \\    ^
                     \\
@@ -291,20 +292,20 @@ pub fn addCases(cases: *tests.StackTracesContext) void {
                 [_][]const u8{
                 // debug
                     \\error: TheSkyIsFalling
-                    \\source.zig:4:5: [address] in _foo (test.o)
+                    \\source.zig:4:5: [address] in foo (test)
                     \\    return error.TheSkyIsFalling;
                     \\    ^
-                    \\source.zig:8:5: [address] in _main.0 (test.o)
+                    \\source.zig:8:5: [address] in main (test)
                     \\    try foo();
                     \\    ^
                     \\
                 ,
                 // release-safe
                     \\error: TheSkyIsFalling
-                    \\source.zig:4:5: [address] in _main (test.o)
+                    \\source.zig:4:5: [address] in std.start.main (test)
                     \\    return error.TheSkyIsFalling;
                     \\    ^
-                    \\source.zig:8:5: [address] in _main (test.o)
+                    \\source.zig:8:5: [address] in std.start.main (test)
                     \\    try foo();
                     \\    ^
                     \\
@@ -324,32 +325,32 @@ pub fn addCases(cases: *tests.StackTracesContext) void {
                 [_][]const u8{
                 // debug
                     \\error: TheSkyIsFalling
-                    \\source.zig:12:5: [address] in _make_error (test.o)
+                    \\source.zig:12:5: [address] in make_error (test)
                     \\    return error.TheSkyIsFalling;
                     \\    ^
-                    \\source.zig:8:5: [address] in _bar (test.o)
+                    \\source.zig:8:5: [address] in bar (test)
                     \\    return make_error();
                     \\    ^
-                    \\source.zig:4:5: [address] in _foo (test.o)
+                    \\source.zig:4:5: [address] in foo (test)
                     \\    try bar();
                     \\    ^
-                    \\source.zig:16:5: [address] in _main.0 (test.o)
+                    \\source.zig:16:5: [address] in main (test)
                     \\    try foo();
                     \\    ^
                     \\
                 ,
                 // release-safe
                     \\error: TheSkyIsFalling
-                    \\source.zig:12:5: [address] in _main (test.o)
+                    \\source.zig:12:5: [address] in std.start.main (test)
                     \\    return error.TheSkyIsFalling;
                     \\    ^
-                    \\source.zig:8:5: [address] in _main (test.o)
+                    \\source.zig:8:5: [address] in std.start.main (test)
                     \\    return make_error();
                     \\    ^
-                    \\source.zig:4:5: [address] in _main (test.o)
+                    \\source.zig:4:5: [address] in std.start.main (test)
                     \\    try bar();
                     \\    ^
-                    \\source.zig:16:5: [address] in _main (test.o)
+                    \\source.zig:16:5: [address] in std.start.main (test)
                     \\    try foo();
                     \\    ^
                     \\
@@ -393,7 +394,7 @@ pub fn addCases(cases: *tests.StackTracesContext) void {
                 source_try_return,
                 [_][]const u8{
                 // debug
-                \\error: TheSkyIsFalling
+                    \\error: TheSkyIsFalling
                     \\source.zig:4:5: [address] in foo (test.obj)
                     \\    return error.TheSkyIsFalling;
                     \\    ^
@@ -419,7 +420,7 @@ pub fn addCases(cases: *tests.StackTracesContext) void {
                 source_try_try_return_return,
                 [_][]const u8{
                 // debug
-                \\error: TheSkyIsFalling
+                    \\error: TheSkyIsFalling
                     \\source.zig:12:5: [address] in make_error (test.obj)
                     \\    return error.TheSkyIsFalling;
                     \\    ^
@@ -449,5 +450,5 @@ pub fn addCases(cases: *tests.StackTracesContext) void {
         },
         else => {},
     }
-    // zig fmt: off
 }
+// zig fmt: off