diff options
106 files changed, 117 insertions, 128 deletions
diff --git a/core/flags/internal_rtti.odin b/core/flags/internal_rtti.odin index d5e8726e2..1d86f4bce 100644 --- a/core/flags/internal_rtti.odin +++ b/core/flags/internal_rtti.odin @@ -258,7 +258,7 @@ parse_and_set_pointer_by_named_type :: proc(ptr: rawptr, str: string, data_type: // NOTE(Feoramund): os.Error is system-dependent, and there's // currently no good way to translate them all into strings. // - // The upcoming `os2` package will hopefully solve this. + // The upcoming `core:os` package will hopefully solve this. // // We can at least provide the number for now, so the user can look // it up. diff --git a/core/os/allocators.odin b/core/os/allocators.odin index 36a7d72be..e49d416e1 100644 --- a/core/os/allocators.odin +++ b/core/os/allocators.odin @@ -1,5 +1,5 @@ #+private -package os2 +package os import "base:runtime" diff --git a/core/os/dir.odin b/core/os/dir.odin index 9ad5f451e..a2fba81e4 100644 --- a/core/os/dir.odin +++ b/core/os/dir.odin @@ -1,4 +1,4 @@ -package os2 +package os import "base:runtime" import "core:slice" diff --git a/core/os/dir_js.odin b/core/os/dir_js.odin index d8f7c6202..8c45cf63b 100644 --- a/core/os/dir_js.odin +++ b/core/os/dir_js.odin @@ -1,6 +1,6 @@ #+build js wasm32, js wasm64p32 #+private -package os2 +package os import "base:intrinsics" diff --git a/core/os/dir_linux.odin b/core/os/dir_linux.odin index 34346c02f..1ca2ef9b4 100644 --- a/core/os/dir_linux.odin +++ b/core/os/dir_linux.odin @@ -1,5 +1,5 @@ #+private -package os2 +package os import "core:sys/linux" diff --git a/core/os/dir_posix.odin b/core/os/dir_posix.odin index d9fa16f8d..c67a37430 100644 --- a/core/os/dir_posix.odin +++ b/core/os/dir_posix.odin @@ -1,6 +1,6 @@ #+private #+build darwin, netbsd, freebsd, openbsd -package os2 +package os import "core:sys/posix" diff --git a/core/os/dir_posix_darwin.odin b/core/os/dir_posix_darwin.odin index 3cae50d25..e67c917b4 100644 --- a/core/os/dir_posix_darwin.odin +++ b/core/os/dir_posix_darwin.odin @@ -1,5 +1,5 @@ #+private -package os2 +package os import "core:sys/darwin" diff --git a/core/os/dir_walker.odin b/core/os/dir_walker.odin index 4dce884a8..b510b7a2a 100644 --- a/core/os/dir_walker.odin +++ b/core/os/dir_walker.odin @@ -1,4 +1,4 @@ -package os2 +package os import "core:container/queue" diff --git a/core/os/dir_wasi.odin b/core/os/dir_wasi.odin index 9804f07fd..05d74be31 100644 --- a/core/os/dir_wasi.odin +++ b/core/os/dir_wasi.odin @@ -1,5 +1,5 @@ #+private -package os2 +package os import "core:slice" import "base:intrinsics" diff --git a/core/os/dir_windows.odin b/core/os/dir_windows.odin index a4dadca75..1168fe18b 100644 --- a/core/os/dir_windows.odin +++ b/core/os/dir_windows.odin @@ -1,5 +1,5 @@ #+private -package os2 +package os import "base:runtime" import "core:time" diff --git a/core/os/doc.odin b/core/os/doc.odin index 2ebdd0912..effb5582c 100644 --- a/core/os/doc.odin +++ b/core/os/doc.odin @@ -1,6 +1,6 @@ -// Package os provides a platform-independent interface to operating system functionality. +// package os_old provides a platform-independent interface to operating system functionality. // The design is UNIX-like but with Odin-like error handling. Failing calls return values with a specific error type rather than error number. // -// The package os interface is intended to be uniform across all operating systems. +// The package os_old interface is intended to be uniform across all operating systems. // Features not generally available appear in the system-specific packages under core:sys/*. -package os2 +package os diff --git a/core/os/env.odin b/core/os/env.odin index 310d45af1..0b8138e6b 100644 --- a/core/os/env.odin +++ b/core/os/env.odin @@ -1,4 +1,4 @@ -package os2 +package os import "base:runtime" import "core:strings" diff --git a/core/os/env_js.odin b/core/os/env_js.odin index c1d94ba4a..644af61bd 100644 --- a/core/os/env_js.odin +++ b/core/os/env_js.odin @@ -1,6 +1,6 @@ #+build js wasm32, js wasm64p32 #+private -package os2 +package os import "base:runtime" diff --git a/core/os/env_linux.odin b/core/os/env_linux.odin index 7855fbfed..e55c59293 100644 --- a/core/os/env_linux.odin +++ b/core/os/env_linux.odin @@ -1,5 +1,5 @@ #+private -package os2 +package os import "base:runtime" import "base:intrinsics" diff --git a/core/os/env_posix.odin b/core/os/env_posix.odin index 72a1daf18..5d46cf7fc 100644 --- a/core/os/env_posix.odin +++ b/core/os/env_posix.odin @@ -1,6 +1,6 @@ #+private #+build darwin, netbsd, freebsd, openbsd -package os2 +package os import "base:runtime" diff --git a/core/os/env_wasi.odin b/core/os/env_wasi.odin index cb40667cf..03a56421d 100644 --- a/core/os/env_wasi.odin +++ b/core/os/env_wasi.odin @@ -1,5 +1,5 @@ #+private -package os2 +package os import "base:runtime" diff --git a/core/os/env_windows.odin b/core/os/env_windows.odin index d389f8860..dfbc5c454 100644 --- a/core/os/env_windows.odin +++ b/core/os/env_windows.odin @@ -1,5 +1,5 @@ #+private -package os2 +package os import win32 "core:sys/windows" import "base:runtime" diff --git a/core/os/errors.odin b/core/os/errors.odin index 508d824b3..a60233f09 100644 --- a/core/os/errors.odin +++ b/core/os/errors.odin @@ -1,4 +1,4 @@ -package os2 +package os import "core:io" import "base:runtime" diff --git a/core/os/errors_js.odin b/core/os/errors_js.odin index c92d36736..34779807d 100644 --- a/core/os/errors_js.odin +++ b/core/os/errors_js.odin @@ -1,6 +1,6 @@ #+build js wasm32, js wasm64p32 #+private -package os2 +package os _Platform_Error :: enum i32 {} diff --git a/core/os/errors_linux.odin b/core/os/errors_linux.odin index a7556c306..891b4177c 100644 --- a/core/os/errors_linux.odin +++ b/core/os/errors_linux.odin @@ -1,5 +1,5 @@ #+private -package os2 +package os import "core:sys/linux" diff --git a/core/os/errors_posix.odin b/core/os/errors_posix.odin index 8a9ca07df..5233fec1a 100644 --- a/core/os/errors_posix.odin +++ b/core/os/errors_posix.odin @@ -1,6 +1,6 @@ #+private #+build darwin, netbsd, freebsd, openbsd -package os2 +package os import "core:sys/posix" diff --git a/core/os/errors_wasi.odin b/core/os/errors_wasi.odin index b88e5b81e..a0377ce96 100644 --- a/core/os/errors_wasi.odin +++ b/core/os/errors_wasi.odin @@ -1,5 +1,5 @@ #+private -package os2 +package os import "base:runtime" diff --git a/core/os/errors_windows.odin b/core/os/errors_windows.odin index 404560f98..639780337 100644 --- a/core/os/errors_windows.odin +++ b/core/os/errors_windows.odin @@ -1,5 +1,5 @@ #+private -package os2 +package os import "base:runtime" import "core:slice" diff --git a/core/os/file.odin b/core/os/file.odin index bf7ebaeb5..61582c528 100644 --- a/core/os/file.odin +++ b/core/os/file.odin @@ -1,4 +1,4 @@ -package os2 +package os import "core:io" import "core:time" diff --git a/core/os/file_js.odin b/core/os/file_js.odin index 91ee7f02e..5d921c9b0 100644 --- a/core/os/file_js.odin +++ b/core/os/file_js.odin @@ -1,6 +1,6 @@ #+build js wasm32, js wasm64p32 #+private -package os2 +package os import "base:runtime" diff --git a/core/os/file_linux.odin b/core/os/file_linux.odin index f5f2ebdd7..d4223ba5d 100644 --- a/core/os/file_linux.odin +++ b/core/os/file_linux.odin @@ -1,5 +1,5 @@ #+private -package os2 +package os import "base:runtime" import "core:io" diff --git a/core/os/file_posix.odin b/core/os/file_posix.odin index ef53bf116..006f25e11 100644 --- a/core/os/file_posix.odin +++ b/core/os/file_posix.odin @@ -1,6 +1,6 @@ #+private #+build darwin, netbsd, freebsd, openbsd -package os2 +package os import "base:runtime" diff --git a/core/os/file_posix_darwin.odin b/core/os/file_posix_darwin.odin index 521fb345b..5522124ae 100644 --- a/core/os/file_posix_darwin.odin +++ b/core/os/file_posix_darwin.odin @@ -1,5 +1,5 @@ #+private -package os2 +package os import "base:runtime" diff --git a/core/os/file_posix_freebsd.odin b/core/os/file_posix_freebsd.odin index 05d031930..4ed9ecc1e 100644 --- a/core/os/file_posix_freebsd.odin +++ b/core/os/file_posix_freebsd.odin @@ -1,5 +1,5 @@ #+private -package os2 +package os import "base:runtime" diff --git a/core/os/file_posix_netbsd.odin b/core/os/file_posix_netbsd.odin index f96c227ba..791836c00 100644 --- a/core/os/file_posix_netbsd.odin +++ b/core/os/file_posix_netbsd.odin @@ -1,5 +1,5 @@ #+private -package os2 +package os import "base:runtime" diff --git a/core/os/file_posix_other.odin b/core/os/file_posix_other.odin index 8871a0062..6430c9fb6 100644 --- a/core/os/file_posix_other.odin +++ b/core/os/file_posix_other.odin @@ -1,6 +1,6 @@ #+private #+build openbsd -package os2 +package os import "base:runtime" diff --git a/core/os/file_stream.odin b/core/os/file_stream.odin index af6e50921..cee1bef47 100644 --- a/core/os/file_stream.odin +++ b/core/os/file_stream.odin @@ -1,4 +1,4 @@ -package os2 +package os import "base:intrinsics" import "base:runtime" diff --git a/core/os/file_util.odin b/core/os/file_util.odin index f81dc2190..505432338 100644 --- a/core/os/file_util.odin +++ b/core/os/file_util.odin @@ -1,4 +1,4 @@ -package os2 +package os import "base:runtime" import "core:strconv" diff --git a/core/os/file_wasi.odin b/core/os/file_wasi.odin index 78aa90699..116c237d6 100644 --- a/core/os/file_wasi.odin +++ b/core/os/file_wasi.odin @@ -1,6 +1,6 @@ #+feature global-context #+private -package os2 +package os import "base:runtime" diff --git a/core/os/file_windows.odin b/core/os/file_windows.odin index 0e3448dd7..3a9e90fed 100644 --- a/core/os/file_windows.odin +++ b/core/os/file_windows.odin @@ -1,5 +1,5 @@ #+private -package os2 +package os import "base:runtime" diff --git a/core/os/heap.odin b/core/os/heap.odin index b1db54dc7..356e60b4d 100644 --- a/core/os/heap.odin +++ b/core/os/heap.odin @@ -1,4 +1,4 @@ -package os2 +package os import "base:runtime" diff --git a/core/os/heap_js.odin b/core/os/heap_js.odin index 15990b517..5f8d9bd35 100644 --- a/core/os/heap_js.odin +++ b/core/os/heap_js.odin @@ -1,6 +1,6 @@ #+build js wasm32, js wasm64p32 #+private -package os2 +package os import "base:runtime" diff --git a/core/os/heap_linux.odin b/core/os/heap_linux.odin index 1d1f12726..69c2b6edf 100644 --- a/core/os/heap_linux.odin +++ b/core/os/heap_linux.odin @@ -1,5 +1,5 @@ #+private -package os2 +package os import "base:runtime" diff --git a/core/os/heap_posix.odin b/core/os/heap_posix.odin index 1b52aed75..5bff96de6 100644 --- a/core/os/heap_posix.odin +++ b/core/os/heap_posix.odin @@ -1,6 +1,6 @@ #+private #+build darwin, netbsd, freebsd, openbsd -package os2 +package os import "base:runtime" diff --git a/core/os/heap_wasi.odin b/core/os/heap_wasi.odin index 7da3c4845..066a43f85 100644 --- a/core/os/heap_wasi.odin +++ b/core/os/heap_wasi.odin @@ -1,5 +1,5 @@ #+private -package os2 +package os import "base:runtime" diff --git a/core/os/heap_windows.odin b/core/os/heap_windows.odin index 7fd4529a0..e0e62a91f 100644 --- a/core/os/heap_windows.odin +++ b/core/os/heap_windows.odin @@ -1,5 +1,5 @@ #+private -package os2 +package os import "core:mem" import win32 "core:sys/windows" diff --git a/core/os/internal_util.odin b/core/os/internal_util.odin index 9616af8b0..a279e9bee 100644 --- a/core/os/internal_util.odin +++ b/core/os/internal_util.odin @@ -1,5 +1,5 @@ #+private -package os2 +package os import "base:intrinsics" import "base:runtime" diff --git a/core/os/old/dir_unix.odin b/core/os/old/dir_unix.odin index c3dd844ef..6d2a44626 100644 --- a/core/os/old/dir_unix.odin +++ b/core/os/old/dir_unix.odin @@ -1,5 +1,5 @@ #+build darwin, linux, netbsd, freebsd, openbsd, haiku -package os +package os_old_old import "core:strings" diff --git a/core/os/old/dir_windows.odin b/core/os/old/dir_windows.odin index 40f4b9e9b..b81787872 100644 --- a/core/os/old/dir_windows.odin +++ b/core/os/old/dir_windows.odin @@ -1,4 +1,4 @@ -package os +package os_old import win32 "core:sys/windows" import "core:strings" diff --git a/core/os/old/env_windows.odin b/core/os/old/env_windows.odin index ef658b0a1..f9480340c 100644 --- a/core/os/old/env_windows.odin +++ b/core/os/old/env_windows.odin @@ -1,4 +1,4 @@ -package os +package os_old import win32 "core:sys/windows" import "base:runtime" diff --git a/core/os/old/errors.odin b/core/os/old/errors.odin index fcf70ec74..a6632fe1e 100644 --- a/core/os/old/errors.odin +++ b/core/os/old/errors.odin @@ -1,4 +1,4 @@ -package os +package os_old import "base:intrinsics" import "base:runtime" diff --git a/core/os/old/os.odin b/core/os/old/os.odin index da7b0c151..01e93126d 100644 --- a/core/os/old/os.odin +++ b/core/os/old/os.odin @@ -1,5 +1,5 @@ // Cross-platform `OS` interactions like file `I/O`. -package os +package os_old import "base:intrinsics" import "base:runtime" diff --git a/core/os/old/os_darwin.odin b/core/os/old/os_darwin.odin index 92a636255..6a6efe4e2 100644 --- a/core/os/old/os_darwin.odin +++ b/core/os/old/os_darwin.odin @@ -1,4 +1,4 @@ -package os +package os_old foreign import dl "system:dl" foreign import libc "system:System" diff --git a/core/os/old/os_essence.odin b/core/os/old/os_essence.odin index 75c4c1156..8156bb496 100644 --- a/core/os/old/os_essence.odin +++ b/core/os/old/os_essence.odin @@ -1,4 +1,4 @@ -package os +package os_old import "core:sys/es" diff --git a/core/os/old/os_freebsd.odin b/core/os/old/os_freebsd.odin index 82b5a2f0f..a1ecf2aff 100644 --- a/core/os/old/os_freebsd.odin +++ b/core/os/old/os_freebsd.odin @@ -1,4 +1,4 @@ -package os +package os_old foreign import dl "system:dl" foreign import libc "system:c" diff --git a/core/os/old/os_freestanding.odin b/core/os/old/os_freestanding.odin index c22a6d7d5..def000aae 100644 --- a/core/os/old/os_freestanding.odin +++ b/core/os/old/os_freestanding.odin @@ -1,4 +1,4 @@ #+build freestanding -package os +package os_old -#panic("package os does not support a freestanding target") +#panic("package os_old does not support a freestanding target") diff --git a/core/os/old/os_haiku.odin b/core/os/old/os_haiku.odin index ad984e33c..a85f2d5c1 100644 --- a/core/os/old/os_haiku.odin +++ b/core/os/old/os_haiku.odin @@ -1,4 +1,4 @@ -package os +package os_old foreign import lib "system:c" diff --git a/core/os/old/os_js.odin b/core/os/old/os_js.odin index 1870218d3..cefabbf4d 100644 --- a/core/os/old/os_js.odin +++ b/core/os/old/os_js.odin @@ -1,5 +1,5 @@ #+build js -package os +package os_old foreign import "odin_env" diff --git a/core/os/old/os_linux.odin b/core/os/old/os_linux.odin index 4c32676c6..504f6f5b3 100644 --- a/core/os/old/os_linux.odin +++ b/core/os/old/os_linux.odin @@ -1,4 +1,4 @@ -package os +package os_old foreign import dl "system:dl" foreign import libc "system:c" @@ -7,19 +7,8 @@ import "base:runtime" import "core:strings" import "core:c" import "core:strconv" - -// NOTE(flysand): For compatibility we'll make core:os package -// depend on the old (scheduled for removal) linux package. -// Seeing that there are plans for os2, I'm imagining that *that* -// package should inherit the new sys functionality. -// The reasons for these are as follows: -// 1. It's very hard to update this package without breaking *a lot* of code. -// 2. os2 is not stable anyways, so we can break compatibility all we want -// It might be weird to bring up compatibility when Odin in it's nature isn't -// all that about compatibility. But we don't want to push experimental changes -// and have people's code break while it's still work in progress. -import unix "core:sys/unix" -import linux "core:sys/linux" +import "core:sys/unix" +import "core:sys/linux" Handle :: distinct i32 Pid :: distinct i32 diff --git a/core/os/old/os_netbsd.odin b/core/os/old/os_netbsd.odin index 640ea46cd..601e42199 100644 --- a/core/os/old/os_netbsd.odin +++ b/core/os/old/os_netbsd.odin @@ -1,4 +1,4 @@ -package os +package os_old foreign import dl "system:dl" foreign import libc "system:c" diff --git a/core/os/old/os_openbsd.odin b/core/os/old/os_openbsd.odin index bf89a21f4..95d431134 100644 --- a/core/os/old/os_openbsd.odin +++ b/core/os/old/os_openbsd.odin @@ -1,4 +1,4 @@ -package os +package os_old foreign import libc "system:c" diff --git a/core/os/old/os_wasi.odin b/core/os/old/os_wasi.odin index fe0a1fb3e..287034957 100644 --- a/core/os/old/os_wasi.odin +++ b/core/os/old/os_wasi.odin @@ -1,4 +1,4 @@ -package os +package os_old import "core:sys/wasm/wasi" import "base:runtime" diff --git a/core/os/old/os_windows.odin b/core/os/old/os_windows.odin index cb7e42f67..8081d9726 100644 --- a/core/os/old/os_windows.odin +++ b/core/os/old/os_windows.odin @@ -1,5 +1,5 @@ #+build windows -package os +package os_old import win32 "core:sys/windows" import "base:runtime" diff --git a/core/os/old/stat.odin b/core/os/old/stat.odin index 21a4961d1..fad8ff755 100644 --- a/core/os/old/stat.odin +++ b/core/os/old/stat.odin @@ -1,4 +1,4 @@ -package os +package os_old import "core:time" diff --git a/core/os/old/stat_unix.odin b/core/os/old/stat_unix.odin index 648987a07..0f7be62e2 100644 --- a/core/os/old/stat_unix.odin +++ b/core/os/old/stat_unix.odin @@ -1,5 +1,5 @@ #+build linux, darwin, freebsd, openbsd, netbsd, haiku -package os +package os_old import "core:time" diff --git a/core/os/old/stat_windows.odin b/core/os/old/stat_windows.odin index 662c9f9e6..34e5e1695 100644 --- a/core/os/old/stat_windows.odin +++ b/core/os/old/stat_windows.odin @@ -1,4 +1,4 @@ -package os +package os_old import "core:time" import "base:runtime" diff --git a/core/os/old/stream.odin b/core/os/old/stream.odin index f4e9bcdde..d94505505 100644 --- a/core/os/old/stream.odin +++ b/core/os/old/stream.odin @@ -1,4 +1,4 @@ -package os +package os_old import "core:io" diff --git a/core/os/path.odin b/core/os/path.odin index ac18b7562..e0353e43d 100644 --- a/core/os/path.odin +++ b/core/os/path.odin @@ -1,4 +1,4 @@ -package os2 +package os import "base:runtime" import "core:slice" diff --git a/core/os/path_darwin.odin b/core/os/path_darwin.odin index 65aaf1e95..dbfdb584b 100644 --- a/core/os/path_darwin.odin +++ b/core/os/path_darwin.odin @@ -1,4 +1,4 @@ -package os2 +package os import "base:runtime" diff --git a/core/os/path_freebsd.odin b/core/os/path_freebsd.odin index e7e4f63c9..5ec43466e 100644 --- a/core/os/path_freebsd.odin +++ b/core/os/path_freebsd.odin @@ -1,4 +1,4 @@ -package os2 +package os import "base:runtime" diff --git a/core/os/path_js.odin b/core/os/path_js.odin index 0c0d1424b..6ac845560 100644 --- a/core/os/path_js.odin +++ b/core/os/path_js.odin @@ -1,6 +1,6 @@ #+build js wasm32, js wasm64p32 #+private -package os2 +package os import "base:runtime" diff --git a/core/os/path_linux.odin b/core/os/path_linux.odin index 1c9927843..ca68fffb1 100644 --- a/core/os/path_linux.odin +++ b/core/os/path_linux.odin @@ -1,5 +1,5 @@ #+private -package os2 +package os import "base:runtime" diff --git a/core/os/path_netbsd.odin b/core/os/path_netbsd.odin index 815102dea..a9ceb13df 100644 --- a/core/os/path_netbsd.odin +++ b/core/os/path_netbsd.odin @@ -1,4 +1,4 @@ -package os2 +package os import "base:runtime" diff --git a/core/os/path_openbsd.odin b/core/os/path_openbsd.odin index cbc0346d4..55b6b7d1f 100644 --- a/core/os/path_openbsd.odin +++ b/core/os/path_openbsd.odin @@ -1,4 +1,4 @@ -package os2 +package os import "base:runtime" diff --git a/core/os/path_posix.odin b/core/os/path_posix.odin index 173cb6b6d..a877af3e6 100644 --- a/core/os/path_posix.odin +++ b/core/os/path_posix.odin @@ -1,6 +1,6 @@ #+private #+build darwin, netbsd, freebsd, openbsd -package os2 +package os import "base:runtime" diff --git a/core/os/path_posixfs.odin b/core/os/path_posixfs.odin index 0736e73d1..aea89c60a 100644 --- a/core/os/path_posixfs.odin +++ b/core/os/path_posixfs.odin @@ -1,6 +1,6 @@ #+private #+build linux, darwin, netbsd, freebsd, openbsd, wasi -package os2 +package os // This implementation is for all systems that have POSIX-compliant filesystem paths. diff --git a/core/os/path_wasi.odin b/core/os/path_wasi.odin index f26e16158..aa7740497 100644 --- a/core/os/path_wasi.odin +++ b/core/os/path_wasi.odin @@ -1,5 +1,5 @@ #+private -package os2 +package os import "base:runtime" diff --git a/core/os/path_windows.odin b/core/os/path_windows.odin index 275fe3e18..6ccab1dab 100644 --- a/core/os/path_windows.odin +++ b/core/os/path_windows.odin @@ -1,5 +1,5 @@ #+private -package os2 +package os import "base:runtime" import "core:strings" diff --git a/core/os/pipe.odin b/core/os/pipe.odin index 5d3e8368e..5254f9469 100644 --- a/core/os/pipe.odin +++ b/core/os/pipe.odin @@ -1,4 +1,4 @@ -package os2 +package os /* Create an anonymous pipe. @@ -15,7 +15,7 @@ process, that end of the pipe needs to be closed by the parent, before any data is attempted to be read. Although pipes look like files and is compatible with most file APIs in package -os2, the way it's meant to be read is different. Due to asynchronous nature of +os, the way it's meant to be read is different. Due to asynchronous nature of the communication channel, the data may not be present at the time of a read request. The other scenario is when a pipe has no data because the other end of the pipe was closed by the child process. diff --git a/core/os/pipe_js.odin b/core/os/pipe_js.odin index 253228f86..aea5e9a83 100644 --- a/core/os/pipe_js.odin +++ b/core/os/pipe_js.odin @@ -1,6 +1,6 @@ #+build js wasm32, js wasm64p32 #+private -package os2 +package os _pipe :: proc() -> (r, w: ^File, err: Error) { err = .Unsupported diff --git a/core/os/pipe_linux.odin b/core/os/pipe_linux.odin index bb4456e1c..561f82f80 100644 --- a/core/os/pipe_linux.odin +++ b/core/os/pipe_linux.odin @@ -1,5 +1,5 @@ #+private -package os2 +package os import "core:sys/linux" diff --git a/core/os/pipe_posix.odin b/core/os/pipe_posix.odin index 7c07bc068..e811e306f 100644 --- a/core/os/pipe_posix.odin +++ b/core/os/pipe_posix.odin @@ -1,6 +1,6 @@ #+private #+build darwin, netbsd, freebsd, openbsd -package os2 +package os import "core:sys/posix" import "core:strings" diff --git a/core/os/pipe_wasi.odin b/core/os/pipe_wasi.odin index 19c11b51d..e27c9419e 100644 --- a/core/os/pipe_wasi.odin +++ b/core/os/pipe_wasi.odin @@ -1,5 +1,5 @@ #+private -package os2 +package os _pipe :: proc() -> (r, w: ^File, err: Error) { err = .Unsupported diff --git a/core/os/pipe_windows.odin b/core/os/pipe_windows.odin index d6dc47c9c..4e627e26a 100644 --- a/core/os/pipe_windows.odin +++ b/core/os/pipe_windows.odin @@ -1,5 +1,5 @@ #+private -package os2 +package os import win32 "core:sys/windows" diff --git a/core/os/process.odin b/core/os/process.odin index e4fecf2a5..9cdaf0457 100644 --- a/core/os/process.odin +++ b/core/os/process.odin @@ -1,4 +1,4 @@ -package os2 +package os import "base:runtime" diff --git a/core/os/process_freebsd.odin b/core/os/process_freebsd.odin index 8a31eb62c..ccc2549db 100644 --- a/core/os/process_freebsd.odin +++ b/core/os/process_freebsd.odin @@ -1,6 +1,6 @@ #+private #+build freebsd -package os2 +package os import "core:c" diff --git a/core/os/process_js.odin b/core/os/process_js.odin index a59a79d45..6283d270c 100644 --- a/core/os/process_js.odin +++ b/core/os/process_js.odin @@ -1,6 +1,6 @@ #+build js wasm32, js wasm64p32 #+private -package os2 +package os import "base:runtime" import "core:time" diff --git a/core/os/process_linux.odin b/core/os/process_linux.odin index 4afd9f3fc..cfdb6774a 100644 --- a/core/os/process_linux.odin +++ b/core/os/process_linux.odin @@ -1,6 +1,6 @@ #+build linux #+private file -package os2 +package os import "base:runtime" import "base:intrinsics" diff --git a/core/os/process_netbsd.odin b/core/os/process_netbsd.odin index b46a58e58..45ca03178 100644 --- a/core/os/process_netbsd.odin +++ b/core/os/process_netbsd.odin @@ -1,6 +1,6 @@ #+private #+build netbsd -package os2 +package os import "core:c" foreign import libc "system:c" diff --git a/core/os/process_openbsd.odin b/core/os/process_openbsd.odin index 9c6605952..5195261ff 100644 --- a/core/os/process_openbsd.odin +++ b/core/os/process_openbsd.odin @@ -1,6 +1,6 @@ #+private #+build openbsd -package os2 +package os import "core:c" diff --git a/core/os/process_posix.odin b/core/os/process_posix.odin index a48e44900..d3ec543f4 100644 --- a/core/os/process_posix.odin +++ b/core/os/process_posix.odin @@ -1,6 +1,6 @@ #+private #+build darwin, netbsd, freebsd, openbsd -package os2 +package os import "base:runtime" diff --git a/core/os/process_posix_darwin.odin b/core/os/process_posix_darwin.odin index 934d23711..a75b4ef96 100644 --- a/core/os/process_posix_darwin.odin +++ b/core/os/process_posix_darwin.odin @@ -1,5 +1,5 @@ #+private -package os2 +package os import "base:runtime" import "base:intrinsics" diff --git a/core/os/process_posix_other.odin b/core/os/process_posix_other.odin index 65da3e9e2..85ed6cdd8 100644 --- a/core/os/process_posix_other.odin +++ b/core/os/process_posix_other.odin @@ -1,6 +1,6 @@ #+private #+build netbsd, openbsd, freebsd -package os2 +package os import "base:runtime" diff --git a/core/os/process_wasi.odin b/core/os/process_wasi.odin index efb2c0228..e18fc0524 100644 --- a/core/os/process_wasi.odin +++ b/core/os/process_wasi.odin @@ -1,5 +1,5 @@ #+private -package os2 +package os import "base:runtime" diff --git a/core/os/process_windows.odin b/core/os/process_windows.odin index b2c87c4f4..e6db5b4e9 100644 --- a/core/os/process_windows.odin +++ b/core/os/process_windows.odin @@ -1,5 +1,5 @@ #+private file -package os2 +package os import "base:intrinsics" import "base:runtime" diff --git a/core/os/stat.odin b/core/os/stat.odin index 0a9ac4e57..fa92e8a8e 100644 --- a/core/os/stat.odin +++ b/core/os/stat.odin @@ -1,4 +1,4 @@ -package os2 +package os import "base:runtime" import "core:strings" diff --git a/core/os/stat_js.odin b/core/os/stat_js.odin index e37864936..bad75486b 100644 --- a/core/os/stat_js.odin +++ b/core/os/stat_js.odin @@ -1,6 +1,6 @@ #+build js wasm32, js wasm64p32 #+private -package os2 +package os import "base:runtime" diff --git a/core/os/stat_linux.odin b/core/os/stat_linux.odin index dc5bccb54..082279e8d 100644 --- a/core/os/stat_linux.odin +++ b/core/os/stat_linux.odin @@ -1,5 +1,5 @@ #+private -package os2 +package os import "core:time" import "base:runtime" diff --git a/core/os/stat_posix.odin b/core/os/stat_posix.odin index e401ffe40..924860744 100644 --- a/core/os/stat_posix.odin +++ b/core/os/stat_posix.odin @@ -1,6 +1,6 @@ #+private #+build darwin, netbsd, freebsd, openbsd -package os2 +package os import "base:runtime" diff --git a/core/os/stat_wasi.odin b/core/os/stat_wasi.odin index f15479e22..5f5e6fe45 100644 --- a/core/os/stat_wasi.odin +++ b/core/os/stat_wasi.odin @@ -1,5 +1,5 @@ #+private -package os2 +package os import "base:runtime" diff --git a/core/os/stat_windows.odin b/core/os/stat_windows.odin index 651029ac3..51bd57d5b 100644 --- a/core/os/stat_windows.odin +++ b/core/os/stat_windows.odin @@ -1,5 +1,5 @@ #+private -package os2 +package os import "base:runtime" import "core:time" diff --git a/core/os/temp_file.odin b/core/os/temp_file.odin index 2c0236428..be10eb22e 100644 --- a/core/os/temp_file.odin +++ b/core/os/temp_file.odin @@ -1,4 +1,4 @@ -package os2 +package os import "base:runtime" diff --git a/core/os/temp_file_js.odin b/core/os/temp_file_js.odin index e1f2b3d95..32ce1c484 100644 --- a/core/os/temp_file_js.odin +++ b/core/os/temp_file_js.odin @@ -1,6 +1,6 @@ #+build js wasm32, js wasm64p32 #+private -package os2 +package os import "base:runtime" diff --git a/core/os/temp_file_linux.odin b/core/os/temp_file_linux.odin index 310720cbe..30f2169ad 100644 --- a/core/os/temp_file_linux.odin +++ b/core/os/temp_file_linux.odin @@ -1,5 +1,5 @@ #+private -package os2 +package os import "base:runtime" diff --git a/core/os/temp_file_posix.odin b/core/os/temp_file_posix.odin index b44ea13a7..a72dc2fab 100644 --- a/core/os/temp_file_posix.odin +++ b/core/os/temp_file_posix.odin @@ -1,6 +1,6 @@ #+private #+build darwin, netbsd, freebsd, openbsd -package os2 +package os import "base:runtime" diff --git a/core/os/temp_file_wasi.odin b/core/os/temp_file_wasi.odin index d5628d300..d3fa941f7 100644 --- a/core/os/temp_file_wasi.odin +++ b/core/os/temp_file_wasi.odin @@ -1,5 +1,5 @@ #+private -package os2 +package os import "base:runtime" diff --git a/core/os/temp_file_windows.odin b/core/os/temp_file_windows.odin index 91ea284a1..4c927134d 100644 --- a/core/os/temp_file_windows.odin +++ b/core/os/temp_file_windows.odin @@ -1,5 +1,5 @@ #+private -package os2 +package os import "base:runtime" import win32 "core:sys/windows" diff --git a/core/os/user.odin b/core/os/user.odin index e2a4ec4d0..8e952477d 100644 --- a/core/os/user.odin +++ b/core/os/user.odin @@ -1,4 +1,4 @@ -package os2 +package os import "base:runtime" diff --git a/core/os/user_posix.odin b/core/os/user_posix.odin index fa173f129..355a2e3cd 100644 --- a/core/os/user_posix.odin +++ b/core/os/user_posix.odin @@ -1,5 +1,5 @@ #+build !windows -package os2 +package os import "base:intrinsics" import "base:runtime" diff --git a/core/os/user_windows.odin b/core/os/user_windows.odin index 75d0ba6ac..6f7b74d6d 100644 --- a/core/os/user_windows.odin +++ b/core/os/user_windows.odin @@ -1,4 +1,4 @@ -package os2 +package os import "base:runtime" @(require) import win32 "core:sys/windows" diff --git a/tests/core/io/test_core_io.odin b/tests/core/io/test_core_io.odin index 301e7bb94..728771b1b 100644 --- a/tests/core/io/test_core_io.odin +++ b/tests/core/io/test_core_io.odin @@ -539,7 +539,7 @@ test_string_builder_stream :: proc(t: ^testing.T) { } @test -test_os2_file_stream :: proc(t: ^testing.T) { +test_os_file_stream :: proc(t: ^testing.T) { defer if !testing.failed(t) { testing.expect_value(t, os.remove(TEMPORARY_FILENAME), nil) } @@ -549,7 +549,7 @@ test_os2_file_stream :: proc(t: ^testing.T) { buf[i] = 'A' + i } - TEMPORARY_FILENAME :: "test_core_io_os2_file_stream" + TEMPORARY_FILENAME :: "test_core_io_os_file_stream" fd, open_err := os.open(TEMPORARY_FILENAME, {.Read, .Write, .Create, .Trunc}) if !testing.expectf(t, open_err == nil, "error on opening %q: %v", TEMPORARY_FILENAME, open_err) { @@ -570,7 +570,7 @@ test_os2_file_stream :: proc(t: ^testing.T) { return } - // os2 file stream proc close and destroy are the same. + // os file stream proc close and destroy are the same. results, _ := _test_stream(t, stream, buf[:], do_destroy = false) log.debugf("%#v", results) @@ -638,7 +638,7 @@ test_bufio_buffered_reader :: proc(t: ^testing.T) { @test test_bufio_buffered_read_writer :: proc(t: ^testing.T) { - // Using an os2.File as the backing stream for both reader & writer. + // Using an os.File as the backing stream for both reader & writer. defer if !testing.failed(t) { testing.expect_value(t, os.remove(TEMPORARY_FILENAME), nil) @@ -649,7 +649,7 @@ test_bufio_buffered_read_writer :: proc(t: ^testing.T) { buf[i] = 'A' + i } - TEMPORARY_FILENAME :: "test_core_io_bufio_read_writer_os2_file_stream" + TEMPORARY_FILENAME :: "test_core_io_bufio_read_writer_os_file_stream" fd, open_err := os.open(TEMPORARY_FILENAME, {.Read, .Write, .Create, .Trunc}) if !testing.expectf(t, open_err == nil, "error on opening %q: %v", TEMPORARY_FILENAME, open_err) { @@ -671,7 +671,7 @@ test_bufio_buffered_read_writer :: proc(t: ^testing.T) { return } - // bufio.Read_Writer isn't capable of seeking, so we have to reset the os2 + // bufio.Read_Writer isn't capable of seeking, so we have to reset the os // stream back to the start here. pos, seek_err := io.seek(stream, 0, .Start) if !testing.expectf(t, pos == 0 && seek_err == nil, |