`core:os` -> `core:os/os` for CSV, INI, and XML

Also had to vendor `core:encoding/ini` into `core:os/os2` for the user directories on *nix,
as it used that package to read `~/.config/user-dirs.dirs`, causing an import cycle.

1 files changed, 9 insertions, 9 deletions

diff --git a/core/encoding/xml/xml_reader.odin b/core/encoding/xml/xml_reader.odin
index 8f8fffe14..798eb3f87 100644
--- a/core/encoding/xml/xml_reader.odin
+++ b/core/encoding/xml/xml_reader.odin
@@ -9,13 +9,13 @@ package encoding_xml
 	- Jeroen van Rijn: Initial implementation.
 */
 
-import "core:bytes"
-import "core:encoding/entity"
-import "base:intrinsics"
-import "core:mem"
-import "core:os"
-import "core:strings"
-import "base:runtime"
+import    "base:runtime"
+import    "core:bytes"
+import    "core:encoding/entity"
+import    "base:intrinsics"
+import    "core:mem"
+import os "core:os/os2"
+import    "core:strings"
 
 likely :: intrinsics.expect
 
@@ -378,8 +378,8 @@ load_from_file :: proc(filename: string, options := DEFAULT_OPTIONS, error_handl
 	context.allocator = allocator
 	options := options
 
-	data, data_ok := os.read_entire_file(filename)
-	if !data_ok { return {}, .File_Error }
+	data, data_err := os.read_entire_file(filename, allocator)
+	if data_err != nil { return {}, .File_Error }
 
 	options.flags += { .Input_May_Be_Modified }