From 540b21ff512a9eef281cebc120b0789490647a26 Mon Sep 17 00:00:00 2001
From: Jose Mendoza <56417208+StunxFS@users.noreply.github.com>
Date: Tue, 26 Dec 2023 21:53:31 +0000
Subject: [PATCH] more change

---
 cmd/src/rivet.ri                   | 6 ++----
 cmd/src/tools/cmd_fmt.ri           | 3 +--
 cmd/src/tools/cmd_new.ri           | 3 ++-
 cmd/src/tools/utils.ri             | 3 +--
 lib/rivet/src/ast/CHeader.ri       | 5 +----
 lib/rivet/src/ast/Env.ri           | 3 +--
 lib/rivet/src/ast/Expr.ri          | 3 +--
 lib/rivet/src/ast/Sym.ri           | 3 +--
 lib/rivet/src/ast/Type.ri          | 4 +---
 lib/rivet/src/builder/mod.ri       | 7 +++----
 lib/rivet/src/codegen/mir/Block.ri | 3 +--
 lib/rivet/src/codegen/mir/Expr.ri  | 3 +--
 lib/rivet/src/codegen/mir/Type.ri  | 4 +---
 lib/rivet/src/codegen/mir/mod.ri   | 4 +---
 lib/rivet/src/fmt/mod.ri           | 3 +--
 lib/rivet/src/prefs/mod.ri         | 6 +-----
 lib/rivet/src/report/mod.ri        | 4 +---
 lib/rivet/src/tokenizer/mod.ri     | 3 +--
 lib/rivet/src/utils/file.ri        | 4 +---
 lib/rivet/src/utils/mod.ri         | 5 +----
 20 files changed, 24 insertions(+), 55 deletions(-)

diff --git a/cmd/src/rivet.ri b/cmd/src/rivet.ri
index a26433221..8b76785b4 100644
--- a/cmd/src/rivet.ri
+++ b/cmd/src/rivet.ri
@@ -2,12 +2,10 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import std/console;
-import std/process;
+import std/{ console, process };
 
 import rivet;
-import rivet/prefs;
-import rivet/utils;
+import rivet/{ prefs, utils };
 
 import ./tools;
 
diff --git a/cmd/src/tools/cmd_fmt.ri b/cmd/src/tools/cmd_fmt.ri
index eecc313a1..72918b2d4 100644
--- a/cmd/src/tools/cmd_fmt.ri
+++ b/cmd/src/tools/cmd_fmt.ri
@@ -2,8 +2,7 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import std/flag;
-import std/console;
+import std/{ flag, console };
 import std/fs.Directory;
 
 import rivet/{ ast, fmt, prefs, utils, parser };
diff --git a/cmd/src/tools/cmd_new.ri b/cmd/src/tools/cmd_new.ri
index 98344fcbd..19454f133 100644
--- a/cmd/src/tools/cmd_new.ri
+++ b/cmd/src/tools/cmd_new.ri
@@ -2,7 +2,8 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import std/{ flag, semver, strings, console, process, fs.{ Path, Directory, self } 
+import std/{ 
+    flag, semver, strings, console, process, fs.{ Path, Directory, self } 
 };
 
 import rivet/{ build, utils };
diff --git a/cmd/src/tools/utils.ri b/cmd/src/tools/utils.ri
index f888159db..a543bfe02 100644
--- a/cmd/src/tools/utils.ri
+++ b/cmd/src/tools/utils.ri
@@ -2,8 +2,7 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import std/console;
-import std/console/styles;
+import std/{ console, console/styles };
 
 #[inline]
 pub func readln(prompt: string) -> ?string {
diff --git a/lib/rivet/src/ast/CHeader.ri b/lib/rivet/src/ast/CHeader.ri
index a3cf4dcdc..a744438b5 100644
--- a/lib/rivet/src/ast/CHeader.ri
+++ b/lib/rivet/src/ast/CHeader.ri
@@ -2,10 +2,7 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import std/traits;
-import std/process;
-import std/strings;
-import std/fs.Path;
+import std/{ traits, process, strings, fs.Path };
 
 import ../token;
 
diff --git a/lib/rivet/src/ast/Env.ri b/lib/rivet/src/ast/Env.ri
index 1123c6e8e..c7a60c99c 100644
--- a/lib/rivet/src/ast/Env.ri
+++ b/lib/rivet/src/ast/Env.ri
@@ -2,8 +2,7 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import std/sys;
-import std/fs.Path;
+import std/{ sys, fs.Path };
 
 import ../prefs;
 import ../report;
diff --git a/lib/rivet/src/ast/Expr.ri b/lib/rivet/src/ast/Expr.ri
index cf9fbf186..0f287bc5f 100644
--- a/lib/rivet/src/ast/Expr.ri
+++ b/lib/rivet/src/ast/Expr.ri
@@ -2,8 +2,7 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import std/traits;
-import std/strings;
+import std/{ traits, strings };
 
 import ../token;
 
diff --git a/lib/rivet/src/ast/Sym.ri b/lib/rivet/src/ast/Sym.ri
index 7e9f5a9e4..709984a30 100644
--- a/lib/rivet/src/ast/Sym.ri
+++ b/lib/rivet/src/ast/Sym.ri
@@ -2,8 +2,7 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import std/traits;
-import std/strings;
+import std/{ traits, strings };
 
 import ../token;
 
diff --git a/lib/rivet/src/ast/Type.ri b/lib/rivet/src/ast/Type.ri
index 9705d60d4..d9e6c5e1d 100644
--- a/lib/rivet/src/ast/Type.ri
+++ b/lib/rivet/src/ast/Type.ri
@@ -2,9 +2,7 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import std/traits;
-import std/process;
-import std/strings.Builder;
+import std/{ traits, process, strings.Builder };
 
 import ../token;
 import ../utils;
diff --git a/lib/rivet/src/builder/mod.ri b/lib/rivet/src/builder/mod.ri
index 1f179cc39..1ad421c6a 100644
--- a/lib/rivet/src/builder/mod.ri
+++ b/lib/rivet/src/builder/mod.ri
@@ -2,10 +2,9 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import std/traits;
-import std/console;
-import std/process;
-import std/fs.{ Path, Directory };
+import std/{ 
+    traits, console, process, fs.{ Path, Directory } 
+};
 
 import ../ast;
 import ../utils;
diff --git a/lib/rivet/src/codegen/mir/Block.ri b/lib/rivet/src/codegen/mir/Block.ri
index 174772d67..0ccb7cc15 100644
--- a/lib/rivet/src/codegen/mir/Block.ri
+++ b/lib/rivet/src/codegen/mir/Block.ri
@@ -2,8 +2,7 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import std/traits;
-import std/strings;
+import std/{ traits, strings };
 
 #[boxed]
 pub struct Block < traits.Stringable {
diff --git a/lib/rivet/src/codegen/mir/Expr.ri b/lib/rivet/src/codegen/mir/Expr.ri
index 7d1e39000..ad755148f 100644
--- a/lib/rivet/src/codegen/mir/Expr.ri
+++ b/lib/rivet/src/codegen/mir/Expr.ri
@@ -2,8 +2,7 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import std/traits;
-import std/strings;
+import std/{ traits, strings };
 
 #[boxed; default_value(.Empty)]
 pub enum Expr < traits.Stringable {
diff --git a/lib/rivet/src/codegen/mir/Type.ri b/lib/rivet/src/codegen/mir/Type.ri
index 1274ad1c8..b0f34652a 100644
--- a/lib/rivet/src/codegen/mir/Type.ri
+++ b/lib/rivet/src/codegen/mir/Type.ri
@@ -2,9 +2,7 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import std/traits;
-import std/strings;
-import std/process;
+import std/{ process, traits, strings };
 
 #[boxed; default_value(.Void)]
 pub enum Type < traits.Stringable {
diff --git a/lib/rivet/src/codegen/mir/mod.ri b/lib/rivet/src/codegen/mir/mod.ri
index 638adc111..260377495 100644
--- a/lib/rivet/src/codegen/mir/mod.ri
+++ b/lib/rivet/src/codegen/mir/mod.ri
@@ -2,9 +2,7 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import std/fs;
-import std/traits;
-import std/strings;
+import std/{ fs, traits, strings };
 
 import ../../utils;
 
diff --git a/lib/rivet/src/fmt/mod.ri b/lib/rivet/src/fmt/mod.ri
index 3a46f06d5..b6601be26 100644
--- a/lib/rivet/src/fmt/mod.ri
+++ b/lib/rivet/src/fmt/mod.ri
@@ -2,8 +2,7 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import std/traits;
-import std/strings;
+import std/{ traits, strings };
 
 import ../ast;
 import ../prefs;
diff --git a/lib/rivet/src/prefs/mod.ri b/lib/rivet/src/prefs/mod.ri
index 5b4c7eeb6..e91123e34 100644
--- a/lib/rivet/src/prefs/mod.ri
+++ b/lib/rivet/src/prefs/mod.ri
@@ -2,11 +2,7 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import std/env;
-import std/sys;
-import std/flag;
-import std/process;
-import std/fs.Path;
+import std/{ env, sys, flag, process, fs.Path };
 
 import ../utils;
 
diff --git a/lib/rivet/src/report/mod.ri b/lib/rivet/src/report/mod.ri
index a4914f473..17f2e8b96 100644
--- a/lib/rivet/src/report/mod.ri
+++ b/lib/rivet/src/report/mod.ri
@@ -2,9 +2,7 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import std/traits;
-import std/strings;
-import std/console;
+import std/{ traits, strings, console };
 
 import ../prefs;
 import ../token;
diff --git a/lib/rivet/src/tokenizer/mod.ri b/lib/rivet/src/tokenizer/mod.ri
index 869395f50..ea3c5871d 100644
--- a/lib/rivet/src/tokenizer/mod.ri
+++ b/lib/rivet/src/tokenizer/mod.ri
@@ -2,8 +2,7 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import std/strings;
-import std/process;
+import std/{ process, strings };
 
 import ../ast;
 import ../token;
diff --git a/lib/rivet/src/utils/file.ri b/lib/rivet/src/utils/file.ri
index 1302df30d..cd582188c 100644
--- a/lib/rivet/src/utils/file.ri
+++ b/lib/rivet/src/utils/file.ri
@@ -2,9 +2,7 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import std/env;
-import std/process;
-import std/fs.{ self, Path };
+import std/{ env, process, fs.{ self, Path } };
 
 var normalized_wd := process.wd_at_startup.replace("\\", "/").concat("/");
 var error_paths_abs := (env.get("RIVET_ERROR_PATHS") ?? "relative") == "absolute";
diff --git a/lib/rivet/src/utils/mod.ri b/lib/rivet/src/utils/mod.ri
index a69c059f9..c1021fb50 100644
--- a/lib/rivet/src/utils/mod.ri
+++ b/lib/rivet/src/utils/mod.ri
@@ -2,10 +2,7 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import std/traits;
-import std/console;
-import std/process;
-import std/console/styles;
+import std/{ traits, console, process, console/styles };
 
 pub const LF: uint8 := 10;
 pub const CR: uint8 := 13;