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/env_loader.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/env_loader.zig')
| -rw-r--r-- | src/env_loader.zig | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/env_loader.zig b/src/env_loader.zig index b2ee6815a..08d0a0a9d 100644 --- a/src/env_loader.zig +++ b/src/env_loader.zig @@ -94,7 +94,7 @@ pub const Lexer = struct { last_flush = i; const name = variable.value[start + curly_braces_offset .. i - curly_braces_offset]; - if (@call(.{ .modifier = .always_inline }, getter, .{ ctx, name })) |new_value| { + if (@call(.always_inline, getter, .{ ctx, name })) |new_value| { if (new_value.len > 0) { try writer.writeAll(new_value); } @@ -164,7 +164,7 @@ pub const Lexer = struct { -1 => { lexer.end = lexer.current; - return lexer.source.contents[start..if (any_spaces) @minimum(last_non_space, lexer.source.contents.len) else lexer.source.contents.len]; + return lexer.source.contents[start..if (any_spaces) @min(last_non_space, lexer.source.contents.len) else lexer.source.contents.len]; }, '$' => { lexer.has_nested_value = true; @@ -182,13 +182,13 @@ pub const Lexer = struct { '\'' => { lexer.end = lexer.current; lexer.step(); - return lexer.source.contents[start..@minimum(lexer.end, lexer.source.contents.len)]; + return lexer.source.contents[start..@min(lexer.end, lexer.source.contents.len)]; }, implicitQuoteCharacter => { lexer.end = lexer.current; lexer.step(); - return lexer.source.contents[start..@minimum(if (any_spaces) last_non_space + 1 else lexer.end, lexer.end)]; + return lexer.source.contents[start..@min(if (any_spaces) last_non_space + 1 else lexer.end, lexer.end)]; }, '"' => { // We keep going @@ -201,7 +201,7 @@ pub const Lexer = struct { lexer.step(); lexer.was_quoted = was_quoted; - return lexer.source.contents[start..@minimum( + return lexer.source.contents[start..@min( lexer.end, lexer.source.contents.len, )]; @@ -293,7 +293,7 @@ pub const Lexer = struct { 0, -1 => { this.end = this.current; return if (last_non_space > this.start) - Variable{ .key = this.source.contents[this.start..@minimum(last_non_space + 1, this.source.contents.len)], .value = "" } + Variable{ .key = this.source.contents[this.start..@min(last_non_space + 1, this.source.contents.len)], .value = "" } else null; }, |