fixes for this branch

I had to bring back some of the old API so that I could compile the new
compiler with an old compiler.

1 files changed, 3 insertions, 15 deletions

diff --git a/lib/std/debug.zig b/lib/std/debug.zig
index 8e5498b3f5..d6312598d1 100644
--- a/lib/std/debug.zig
+++ b/lib/std/debug.zig
@@ -437,7 +437,7 @@ pub fn panicExtra(
             break :blk &buf;
         },
     };
-    std.builtin.panic(msg, trace, ret_addr);
+    std.builtin.panic(.{ .explicit_call = msg }, trace, ret_addr);
 }
 
 /// Non-zero whenever the program triggered a panic.
@@ -487,18 +487,6 @@ pub fn defaultPanic(
         .freestanding => {
             @trap();
         },
-        .wasi => {
-            // TODO: before merging my branch, unify this logic with the main panic logic
-            var buffer: [1000]u8 = undefined;
-            var i: usize = 0;
-            i += fmtPanicCause(buffer[i..], cause);
-            buffer[i] = '\n';
-            i += 1;
-            const msg = buffer[0..i];
-            lockStdErr();
-            io.getStdErr().writeAll(msg) catch {};
-            @trap();
-        },
         .uefi => {
             const uefi = std.os.uefi;
 
@@ -571,7 +559,7 @@ pub fn defaultPanic(
                     i += fmtInt10(buffer[i..], std.Thread.getCurrentId());
                     i += fmtBuf(buffer[i..], " panic: ");
                 }
-                i += fmtPanicCause(&buffer, cause);
+                i += fmtPanicCause(buffer[i..], cause);
                 buffer[i] = '\n';
                 i += 1;
                 const msg = buffer[0..i];
@@ -672,7 +660,7 @@ fn fmtInt10(out_buf: []u8, integer_value: usize) usize {
 
     while (true) {
         i -= 1;
-        tmp_buf[i] = '0' + (a % 10);
+        tmp_buf[i] = '0' + @as(u8, @intCast(a % 10));
         a /= 10;
         if (a == 0) break;
     }