core:os -> core:os/old && core:os/os2 -> core:os

5 files changed, 10 insertions, 12 deletions

diff --git a/core/text/i18n/i18_js.odin b/core/text/i18n/i18_js.odin
index 743718942..73e8535a5 100644
--- a/core/text/i18n/i18_js.odin
+++ b/core/text/i18n/i18_js.odin
@@ -10,8 +10,6 @@ package i18n
 	List of contributors:
 		Jeroen van Rijn: Initial implementation.
 */
-import os "core:os/os2"
-
 @(private)
 parse_qt :: proc { parse_qt_linguist_from_bytes }
 
diff --git a/core/text/i18n/i18n_os.odin b/core/text/i18n/i18n_os.odin
index db82a9cf6..7a7995612 100644
--- a/core/text/i18n/i18n_os.odin
+++ b/core/text/i18n/i18n_os.odin
@@ -11,7 +11,7 @@ package i18n
 		Jeroen van Rijn: Initial implementation.
 */
 import "base:runtime"
-import os "core:os/os2"
+import "core:os"
 
 @(private)
 read_file :: proc(filename: string, allocator: runtime.Allocator) -> (data: []u8, err: Error) {
diff --git a/core/text/regex/common/os.odin b/core/text/regex/common/os.odin
index 1d38d687c..bde57f77f 100644
--- a/core/text/regex/common/os.odin
+++ b/core/text/regex/common/os.odin
@@ -10,7 +10,7 @@ package regex_common
 		Feoramund: Initial implementation.
 */
 
-@require import os "core:os/os2"
+@require import "core:os"
 
 when ODIN_DEBUG_REGEX {
 	debug_stream := os.stderr.stream
diff --git a/core/text/table/doc.odin b/core/text/table/doc.odin
index 29b60dbe2..d91763661 100644
--- a/core/text/table/doc.odin
+++ b/core/text/table/doc.odin
@@ -189,7 +189,7 @@ Example:
 
 	import "core:fmt"
 	import "core:io"
-	import os "core:os/os2"
+	import "core:os"
 	import "core:text/table"
 
 	scripts :: proc(w: io.Writer) {
@@ -265,10 +265,10 @@ corners and dividers.
 Example:
 	package main
 
-	import    "core:fmt"
-	import    "core:io"
-	import os "core:os/os2"
-	import    "core:text/table"
+	import "core:fmt"
+	import "core:io"
+	import "core:os"
+	import "core:text/table"
 
 	box_drawing :: proc(w: io.Writer) {
 		t: table.Table
diff --git a/core/text/table/utility.odin b/core/text/table/utility.odin
index db5ae4602..675fa6b10 100644
--- a/core/text/table/utility.odin
+++ b/core/text/table/utility.odin
@@ -2,9 +2,9 @@
 #+build !js
 package text_table
 
-import    "core:io"
-import os "core:os/os2"
-import    "core:strings"
+import "core:io"
+import "core:os"
+import "core:strings"
 
 stdio_writer :: proc() -> io.Writer {
 	return os.to_stream(os.stdout)