More conflicts during rebase

2 files changed, 11 insertions, 11 deletions

diff --git a/tests/core/flags/test_core_flags.odin b/tests/core/flags/test_core_flags.odin
index 0cfcf8e75..1aee7f69c 100644
--- a/tests/core/flags/test_core_flags.odin
+++ b/tests/core/flags/test_core_flags.odin
@@ -7,7 +7,7 @@ import "core:fmt"
 @require import "core:log"
 import "core:math"
 @require import "core:net"
-import "core:os"
+import os "core:os/os2"
 import "core:strings"
 import "core:testing"
 import "core:time/datetime"
@@ -1249,7 +1249,7 @@ test_os_handle :: proc(t: ^testing.T) {
 	test_data := "Hellope!"
 
 	W :: struct {
-		outf: os.Handle `args:"file=cw"`,
+		outf: ^os.File `args:"file=cw"`,
 	}
 	w: W
 
@@ -1263,7 +1263,7 @@ test_os_handle :: proc(t: ^testing.T) {
 	os.write_string(w.outf, test_data)
 
 	R :: struct {
-		inf: os.Handle `args:"file=r"`,
+		inf: ^os.File `args:"file=r"`,
 	}
 	r: R
 
@@ -1274,8 +1274,8 @@ test_os_handle :: proc(t: ^testing.T) {
 		return
 	}
 	defer os.close(r.inf)
-	data, read_ok := os.read_entire_file_from_handle(r.inf, context.temp_allocator)
-	testing.expect_value(t, read_ok, true)
+	data, read_err := os.read_entire_file(r.inf, context.temp_allocator)
+	testing.expect_value(t, read_err, nil)
 	file_contents_equal := 0 == bytes.compare(transmute([]u8)test_data, data)
 	testing.expectf(t, file_contents_equal, "expected file contents to be the same, got %v", data)
 }
diff --git a/tests/core/path/filepath/test_core_filepath.odin b/tests/core/path/filepath/test_core_filepath.odin
index f0137f69b..a0de7e831 100644
--- a/tests/core/path/filepath/test_core_filepath.odin
+++ b/tests/core/path/filepath/test_core_filepath.odin
@@ -33,7 +33,7 @@ test_split_list_windows :: proc(t: ^testing.T) {
 
 	for d, i in data {
 		assert(i == d.i, fmt.tprintf("wrong data index: i %d != d.i %d\n", i, d.i))
-		r := filepath.split_list(d.v)
+		r, _ := filepath.split_list(d.v, context.allocator)
 		defer delete_split(r)
 		testing.expect(t, len(r) == len(d.e), fmt.tprintf("i:%d %s(%s) len(r) %d != len(d.e) %d", i, #procedure, d.v, len(r), len(d.e)))
 		if len(r) == len(d.e) {
@@ -45,13 +45,13 @@ test_split_list_windows :: proc(t: ^testing.T) {
 
 	{
 		v := ""
-		r := filepath.split_list(v)
+		r, _ := filepath.split_list(v, context.allocator)
 		defer delete_split(r)
 		testing.expect(t, r == nil, fmt.tprintf("%s(%s) -> %v != nil", #procedure, v, r))
 	}
 	{
 		v := "a"
-		r := filepath.split_list(v)
+		r, _ := filepath.split_list(v, context.allocator)
 		defer delete_split(r)
 		testing.expect(t, len(r) == 1, fmt.tprintf("%s(%s) len(r) %d != 1", #procedure, v, len(r)))
 		if len(r) == 1 {
@@ -77,7 +77,7 @@ test_split_list_unix :: proc(t: ^testing.T) {
 	}
 
 	for d in data {
-		r := filepath.split_list(d.v)
+		r, _ := filepath.split_list(d.v, context.allocator)
 		defer delete_split(r)
 		testing.expectf(t, len(r) == len(d.e), "%s len(r) %d != len(d.e) %d", d.v, len(r), len(d.e))
 		if len(r) == len(d.e) {
@@ -89,12 +89,12 @@ test_split_list_unix :: proc(t: ^testing.T) {
 
 	{
 		v := ""
-		r := filepath.split_list(v)
+		r, _ := filepath.split_list(v, context.allocator)
 		testing.expectf(t, r == nil, "'%s' -> '%v' != nil", v, r)
 	}
 	{
 		v := "a"
-		r := filepath.split_list(v)
+		r, _ := filepath.split_list(v, context.allocator)
 		defer delete_split(r)
 		testing.expectf(t, len(r) == 1, "'%s' len(r) %d != 1", v, len(r))
 		if len(r) == 1 {