From dc79b4011d6a3a468b125bff819fc1aab3ec2c27 Mon Sep 17 00:00:00 2001
From: Quaternions <krakow20@gmail.com>
Date: Fri, 6 Sep 2024 13:25:26 -0700
Subject: [PATCH] no-traits rewrite

---
 Cargo.lock     | 36 ++++++++++++------------------------
 Cargo.toml     |  4 +---
 src/integer.rs |  1 -
 3 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1d27281..d178db9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "bitflags"
@@ -20,31 +20,21 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3e31ea183f6ee62ac8b8a8cf7feddd766317adfb13ff469de57ce033efd6a790"
 
-[[package]]
-name = "deferred_division"
-version = "0.1.0"
-dependencies = [
- "fixed_wide_traits",
-]
-
 [[package]]
 name = "fixed_wide"
 version = "0.1.0"
 dependencies = [
+ "arrayvec",
  "bnum",
- "fixed_wide_traits",
- "typenum",
+ "paste",
 ]
 
-[[package]]
-name = "fixed_wide_traits"
-version = "0.1.0"
-
 [[package]]
 name = "fixed_wide_vectors"
 version = "0.1.0"
 dependencies = [
- "fixed_wide_traits",
+ "fixed_wide",
+ "paste",
 ]
 
 [[package]]
@@ -64,6 +54,12 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "paste"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.86"
@@ -88,9 +84,7 @@ version = "0.4.1"
 dependencies = [
  "arrayvec",
  "bitflags",
- "deferred_division",
  "fixed_wide",
- "fixed_wide_traits",
  "fixed_wide_vectors",
  "glam",
  "id",
@@ -107,12 +101,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "typenum"
-version = "1.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
-
 [[package]]
 name = "unicode-ident"
 version = "1.0.12"
diff --git a/Cargo.toml b/Cargo.toml
index 93068ae..56956ab 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,9 +12,7 @@ authors = ["Rhys Lloyd <krakow20@gmail.com>"]
 [dependencies]
 arrayvec = "0.7.4"
 bitflags = "2.6.0"
-deferred_division = { path = "../fixed_wide_vectors/deferred_division" }
-fixed_wide = { path = "../fixed_wide_vectors/fixed_wide" }#, features = ["fixed_wide_traits", "cordic"]
-fixed_wide_traits = { path = "../fixed_wide_vectors/fixed_wide_traits" }
+fixed_wide = { path = "../fixed_wide_vectors/fixed_wide" }
 fixed_wide_vectors = { path = "../fixed_wide_vectors/fixed_wide_vectors" }
 glam = "0.28.0"
 id = { version = "0.1.0", registry = "strafesnet" }
diff --git a/src/integer.rs b/src/integer.rs
index ed7acf4..2fe6674 100644
--- a/src/integer.rs
+++ b/src/integer.rs
@@ -431,7 +431,6 @@ pub type Planar64=fixed_wide::types::I32F32;
 pub type Planar64Vec3=fixed_wide_vectors::Vector3<Planar64>;
 pub type Planar64Mat3=fixed_wide_vectors::Matrix3<Planar64Vec3>;
 pub type Planar64Affine3=fixed_wide_vectors::Matrix4<Planar64Vec3>;
-pub use fixed_wide_traits::wide::{WideMul,WideDot,WideCross};
 
 #[test]
 fn test_sqrt(){