From c2fea96feb0bf0231d2cbb9948ca204fcd84b1c7 Mon Sep 17 00:00:00 2001
From: paladin <christian.lincoln25@ic.ac.uk>
Date: Mon, 15 Jun 2026 12:46:25 +0100
Subject: [PATCH] Reorganising file and module structure.

---
 Cargo.lock  | 17 +++++++++++++++++
 Cargo.toml  |  2 +-
 src/lang.rs |  2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5e7fbbc..d23e755 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -358,6 +358,15 @@ dependencies = [
  "web-sys",
 ]
 
+[[package]]
+name = "convert_case"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "633458d4ef8c78b72454de2d54fd6ab2e60f9e02be22f3c6104cdc8a4e0fceb9"
+dependencies = [
+ "unicode-segmentation",
+]
+
 [[package]]
 name = "core-foundation"
 version = "0.9.4"
@@ -431,10 +440,12 @@ version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "799a97264921d8623a957f6c3b9011f3b5492f557bbb7a5a19b7fa6d06ba8dcb"
 dependencies = [
+ "convert_case",
  "proc-macro2",
  "quote",
  "rustc_version",
  "syn",
+ "unicode-xid",
 ]
 
 [[package]]
@@ -1965,6 +1976,12 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
 
+[[package]]
+name = "unicode-xid"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
+
 [[package]]
 name = "utf8parse"
 version = "0.2.2"
diff --git a/Cargo.toml b/Cargo.toml
index 2d22f8b..0ae2500 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,7 +19,7 @@ log = "0.4"
 wgpu = "29.0.3"
 pollster = "0.4.0"
 console_error_panic_hook = "0.1.7"
-derive_more = "2.1.1"
+derive_more = { version = "2.1.1", features = ["display"] }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 console_error_panic_hook = "0.1.6"
diff --git a/src/lang.rs b/src/lang.rs
index 6a9aa33..161d86b 100644
--- a/src/lang.rs
+++ b/src/lang.rs
@@ -1,4 +1,4 @@
-use derive_more;
+use derive_more::{Display};
 
 // State of 'cursor' that is reading through the text stream
 // todo: implement locations for the 'cursor' through Piece<T>