aboutsummaryrefslogtreecommitdiff
path: root/src/main.zig
diff options
context:
space:
mode:
authorGravatar Jarred Sumner <jarred@jarredsumner.com> 2022-12-28 00:51:22 -0800
committerGravatar GitHub <noreply@github.com> 2022-12-28 00:51:22 -0800
commitc0dd2841362b67fdb5ede262b19688004a4eb9a4 (patch)
treea3cd6b353c25c30d66489de61b394af7d5568fed /src/main.zig
parent504972fa5deb92f2d0510d42f11b085351915a32 (diff)
downloadbun-c0dd2841362b67fdb5ede262b19688004a4eb9a4.tar.gz
bun-c0dd2841362b67fdb5ede262b19688004a4eb9a4.tar.zst
bun-c0dd2841362b67fdb5ede262b19688004a4eb9a4.zip
Upgrade to latest Zig (#1610)
* @min and @max * builtins and some trivial ones * Most of them * more * more! * More Progress * wip * Update tagged_pointer.zig * Update http_client_async.zig * Most of the iterable dir changes * alright * Remove usages of deprecated formatters * :camera: * fmt * Update shimmer.zig * wip * wip * wip * progress * more * Latest * stuck on error * latest * workaround stage2 * wip * Update string_immutable.zig * wip * Migrate `Dirent` and `require("fs')` to use JSC<>Zig bindings * Fix build errors * Fixup most of the test failures * Fix `make headers` * Fix "outside package path" error * Fixup aligned alloc * Add missing file * linux * More linux fixes * use latest peechy * Fix transpiler test failure * Forgot about these * Fixup test failure * Update node-timers.test.ts * [node:htt] Fix `undefined is not an object` error Fixes https://github.com/oven-sh/bun/issues/1618 * Update http.exports.js * Make this test less flaky * fix hashes * Fix hex formatting and zls issues * Download zig version * Update Dockerfile * Update Dockerfile * Update uws * Update Dockerfile * Set llvm version * Update README.md * Update uws * Update Dockerfile * Update io_linux.zig * Update bun.zig * Log output * workaround strange @cInclude error * Make ffi tests better * Don't use cImport * Update c.zig * Update c-bindings.cpp * call setOutputDir * Update Dockerfile * Use a longer name * latest * Update serve.test.ts Co-authored-by: Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com> Co-authored-by: Veikka Tuominen <git@vexu.eu>
Diffstat (limited to 'src/main.zig')
-rw-r--r--src/main.zig12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/main.zig b/src/main.zig
index 8e2edccec..ba3fd97d9 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -5,19 +5,16 @@ const MainPanicHandler = panicky.NewPanicHandler(std.builtin.default_panic);
pub const io_mode = .blocking;
-pub fn panic(msg: []const u8, error_return_trace: ?*std.builtin.StackTrace) noreturn {
- MainPanicHandler.handle_panic(msg, error_return_trace);
+pub fn panic(msg: []const u8, error_return_trace: ?*std.builtin.StackTrace, addr: ?usize) noreturn {
+ MainPanicHandler.handle_panic(msg, error_return_trace, addr);
}
const CrashReporter = @import("./crash_reporter.zig");
pub fn main() void {
- const bun = @import("bun");
const Output = bun.Output;
const Environment = bun.Environment;
- const cli = @import("cli.zig");
-
if (comptime Environment.isRelease)
CrashReporter.start() catch unreachable;
@@ -37,11 +34,12 @@ pub fn main() void {
Output.Source.set(&output_source);
defer Output.flush();
- cli.Cli.start(bun.default_allocator, stdout, stderr, MainPanicHandler);
+ bun.CLI.Cli.start(bun.default_allocator, stdout, stderr, MainPanicHandler);
}
test "panic" {
panic("woah", null);
}
-pub usingnamespace @import("./bun.zig");
+pub const build_options = @import("build_options");
+pub const bun = @import("./bun.zig");