diff --git a/core/os/path.odin b/core/os/path.odin index e0353e43d..3c22852bf 100644 --- a/core/os/path.odin +++ b/core/os/path.odin @@ -145,7 +145,7 @@ This will remove duplicate separators and unneeded references to the current or parent directory. */ @(require_results) -clean_path :: proc(path: string, allocator: runtime.Allocator) -> (cleaned: string, err: Error) { +clean_path :: proc(path: string, allocator: runtime.Allocator) -> (cleaned: string, err: runtime.Allocator_Error) { if path == "" || path == "." { return strings.clone(".", allocator) } @@ -491,7 +491,7 @@ Join all `elems` with the system's path separator and normalize the result. For example, `join_path({"/home", "foo", "bar.txt"})` will result in `"/home/foo/bar.txt"`. */ @(require_results) -join_path :: proc(elems: []string, allocator: runtime.Allocator) -> (joined: string, err: Error) { +join_path :: proc(elems: []string, allocator: runtime.Allocator) -> (joined: string, err: runtime.Allocator_Error) { for e, i in elems { if e != "" { temp_allocator := TEMP_ALLOCATOR_GUARD({ allocator }) diff --git a/tests/core/os/file.odin b/tests/core/os/file.odin index aed57c26c..99ae5b928 100644 --- a/tests/core/os/file.odin +++ b/tests/core/os/file.odin @@ -5,10 +5,9 @@ import "core:testing" @(test) test_clone :: proc(t: ^testing.T) { - joined, err := os.join_path({#directory, "file.odin"}, context.temp_allocator) - testing.expect_value(t, err, nil) - f: ^os.File - f, err = os.open(joined) + joined, j_err := os.join_path({#directory, "file.odin"}, context.temp_allocator) + testing.expect_value(t, j_err, nil) + f, err := os.open(joined) testing.expect_value(t, err, nil) testing.expect(t, f != nil)