diff options
| author | Jeroen van Rijn <Kelimion@users.noreply.github.com> | 2026-02-08 12:48:41 +0100 |
|---|---|---|
| committer | Jeroen van Rijn <Kelimion@users.noreply.github.com> | 2026-02-08 12:48:41 +0100 |
| commit | 8f4bcf4d31fe83f2fe9a93a0b0a8e28d11c0c882 (patch) | |
| tree | 371e91d2ef0620ca059c39d14f1b7172b14839b7 | |
| parent | c2647673ec503938a302bd083f42602a5a000177 (diff) | |
More conflicts during rebase
| -rw-r--r-- | core/crypto/hash/hash_os.odin | 2 | ||||
| -rw-r--r-- | core/fmt/fmt_os.odin | 10 | ||||
| -rw-r--r-- | core/net/dns.odin | 2 | ||||
| -rw-r--r-- | core/testing/runner.odin | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/core/crypto/hash/hash_os.odin b/core/crypto/hash/hash_os.odin index 32347c452..28db9c61f 100644 --- a/core/crypto/hash/hash_os.odin +++ b/core/crypto/hash/hash_os.odin @@ -16,7 +16,7 @@ hash_file_by_handle :: proc( io.Error, ) { if !load_at_once { - return hash_stream(algorithm, handle.stream, allocator) + return hash_stream(algorithm, os.to_stream(handle), allocator) } buf, err := os.read_entire_file(handle, allocator) diff --git a/core/fmt/fmt_os.odin b/core/fmt/fmt_os.odin index 1f292c9e4..7ce945a0f 100644 --- a/core/fmt/fmt_os.odin +++ b/core/fmt/fmt_os.odin @@ -16,7 +16,7 @@ fprint :: proc(f: ^os.File, args: ..any, sep := " ", flush := true) -> int { b: bufio.Writer defer bufio.writer_flush(&b) - bufio.writer_init_with_buf(&b, f.stream, buf[:]) + bufio.writer_init_with_buf(&b, os.to_stream(f), buf[:]) w := bufio.writer_to_writer(&b) return wprint(w, ..args, sep=sep, flush=flush) } @@ -27,7 +27,7 @@ fprintln :: proc(f: ^os.File, args: ..any, sep := " ", flush := true) -> int { b: bufio.Writer defer bufio.writer_flush(&b) - bufio.writer_init_with_buf(&b, f.stream, buf[:]) + bufio.writer_init_with_buf(&b, os.to_stream(f), buf[:]) w := bufio.writer_to_writer(&b) return wprintln(w, ..args, sep=sep, flush=flush) @@ -38,7 +38,7 @@ fprintf :: proc(f: ^os.File, fmt: string, args: ..any, flush := true, newline := b: bufio.Writer defer bufio.writer_flush(&b) - bufio.writer_init_with_buf(&b, f.stream, buf[:]) + bufio.writer_init_with_buf(&b, os.to_stream(f), buf[:]) w := bufio.writer_to_writer(&b) return wprintf(w, fmt, ..args, flush=flush, newline=newline) @@ -52,7 +52,7 @@ fprint_type :: proc(f: ^os.File, info: ^runtime.Type_Info, flush := true) -> (n: b: bufio.Writer defer bufio.writer_flush(&b) - bufio.writer_init_with_buf(&b, f.stream, buf[:]) + bufio.writer_init_with_buf(&b, os.to_stream(f), buf[:]) w := bufio.writer_to_writer(&b) return wprint_type(w, info, flush=flush) @@ -62,7 +62,7 @@ fprint_typeid :: proc(f: ^os.File, id: typeid, flush := true) -> (n: int, err: i b: bufio.Writer defer bufio.writer_flush(&b) - bufio.writer_init_with_buf(&b, f.stream, buf[:]) + bufio.writer_init_with_buf(&b, os.to_stream(f), buf[:]) w := bufio.writer_to_writer(&b) return wprint_typeid(w, id, flush=flush) diff --git a/core/net/dns.odin b/core/net/dns.odin index 983f82681..2d7a04896 100644 --- a/core/net/dns.odin +++ b/core/net/dns.odin @@ -23,7 +23,7 @@ package net @(require) import "base:runtime" - +import os "core:os/os2" import "core:bufio" import "core:io" import "core:math/rand" diff --git a/core/testing/runner.odin b/core/testing/runner.odin index a184578a6..8873bc973 100644 --- a/core/testing/runner.odin +++ b/core/testing/runner.odin @@ -219,8 +219,8 @@ runner :: proc(internal_tests: []Internal_Test) -> bool { } } - stdout := os.stdout.stream - stderr := os.stderr.stream + stdout := os.to_stream(os.stdout) + stderr := os.to_stream(os.stderr) // The animations are only ever shown through STDOUT; // STDERR is used exclusively for logging regardless of error level. |