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/mdx/mdx_parser.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/mdx/mdx_parser.zig')
| -rw-r--r-- | src/mdx/mdx_parser.zig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mdx/mdx_parser.zig b/src/mdx/mdx_parser.zig index dcaf11143..b44ab239a 100644 --- a/src/mdx/mdx_parser.zig +++ b/src/mdx/mdx_parser.zig @@ -684,7 +684,7 @@ pub const MDParser = struct { } // Check for ordered list item marks - max_end = @minimum(off + 9, this.size); + max_end = @min(off + 9, this.size); container.start = 0; while (off < max_end and std.ascii.isDigit(this.charAt(off))) { container.start = container.start * 10 + (this.charAt(off) - '0'); @@ -1785,7 +1785,7 @@ pub const MDX = struct { pub fn parse(this: *MDX) !js_ast.Result { try this._parse(); - return try runVisitPassAndFinish(JSParser, &this.parser, this.stmts.toOwnedSlice(this.allocator)); + return try runVisitPassAndFinish(JSParser, &this.parser, try this.stmts.toOwnedSlice(this.allocator)); } fn run(this: *MDX) anyerror!logger.Loc { @@ -1797,7 +1797,7 @@ pub const MDX = struct { var root_children = std.ArrayListUnmanaged(Expr){}; var first_loc = try run(this, &root_children); - first_loc.start = @maximum(first_loc.start, 0); + first_loc.start = @max(first_loc.start, 0); const args_loc = first_loc; first_loc.start += 1; const body_loc = first_loc; |