diff options
| author |  Jarred Sumner <jarred@jarredsumner.com>
| 2022-12-28 00:51:22 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2022-12-28 00:51:22 -0800 |
| commit | c0dd2841362b67fdb5ede262b19688004a4eb9a4 (patch) | |
| tree | a3cd6b353c25c30d66489de61b394af7d5568fed /src/cli/bun_command.zig | |
| parent | 504972fa5deb92f2d0510d42f11b085351915a32 (diff) | |
| download | bun-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/cli/bun_command.zig')
| -rw-r--r-- | src/cli/bun_command.zig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/cli/bun_command.zig b/src/cli/bun_command.zig index 30a1531b6..8807aae7e 100644 --- a/src/cli/bun_command.zig +++ b/src/cli/bun_command.zig @@ -44,7 +44,7 @@ const ServerBundleGeneratorThread = struct { server_conf: Api.LoadedFramework, route_conf_: ?Api.LoadedRouteConfig, router: ?Router, - ) !void { + ) anyerror!void { var server_bundler = try bundler.Bundler.init( allocator_, logs, @@ -194,7 +194,7 @@ pub const BunCommand = struct { if (log.errors > 0) { try log.printForLogLevel(Output.errorWriter()); } else { - var elapsed = @divTrunc(std.time.nanoTimestamp() - ctx.start_time, @as(i128, std.time.ns_per_ms)); + var elapsed = @divTrunc(@truncate(i64, std.time.nanoTimestamp() - ctx.start_time), @as(i64, std.time.ns_per_ms)); const print_summary = !(ctx.args.no_summary orelse false); if (print_summary) { var bundle = NodeModuleBundle.init(node_modules, allocator); @@ -211,7 +211,7 @@ pub const BunCommand = struct { } }, else => { - const formatted_loc: f32 = @floatCast(f32, @intToFloat(f128, estimated_input_lines_of_code) / 1000); + const formatted_loc: f32 = @floatCast(f32, @intToFloat(f64, estimated_input_lines_of_code) / 1000); if (generated_server) { Output.prettyln(indent ++ "<d>{d:<5.2}k LOC parsed x2", .{formatted_loc}); } else { |