From eeb7813243826b4eb9a938a476ff546f0bef7c10 Mon Sep 17 00:00:00 2001
From: Bill Thiede <git@xinu.tv>
Date: Sun, 15 Jan 2023 11:59:33 -0800
Subject: [PATCH] rtiow: bump editions to 2021

---
 rtiow/noise_explorer/Cargo.toml      | 2 +-
 rtiow/noise_explorer_warp/Cargo.toml | 2 +-
 rtiow/renderer/Cargo.toml            | 2 +-
 rtiow/renderer/src/triangles.rs      | 6 +++---
 rtiow/tracer/Cargo.toml              | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/rtiow/noise_explorer/Cargo.toml b/rtiow/noise_explorer/Cargo.toml
index 437f4cf..0cb2061 100644
--- a/rtiow/noise_explorer/Cargo.toml
+++ b/rtiow/noise_explorer/Cargo.toml
@@ -2,7 +2,7 @@
 name = "noise_explorer"
 version = "0.1.0"
 authors = ["Bill Thiede <git@xinu.tv>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/rtiow/noise_explorer_warp/Cargo.toml b/rtiow/noise_explorer_warp/Cargo.toml
index 5b29110..c7fdada 100644
--- a/rtiow/noise_explorer_warp/Cargo.toml
+++ b/rtiow/noise_explorer_warp/Cargo.toml
@@ -2,7 +2,7 @@
 name = "noise_explorer_warp"
 version = "0.1.0"
 authors = ["Bill Thiede <git@xinu.tv>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/rtiow/renderer/Cargo.toml b/rtiow/renderer/Cargo.toml
index 2cb1772..58680ae 100644
--- a/rtiow/renderer/Cargo.toml
+++ b/rtiow/renderer/Cargo.toml
@@ -2,7 +2,7 @@
 name = "renderer"
 version = "0.1.0"
 authors = ["Bill Thiede <git@xinu.tv>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [[bench]]
diff --git a/rtiow/renderer/src/triangles.rs b/rtiow/renderer/src/triangles.rs
index acc78af..2133e96 100644
--- a/rtiow/renderer/src/triangles.rs
+++ b/rtiow/renderer/src/triangles.rs
@@ -20,7 +20,7 @@ where
     M: Material,
 {
     triangles: Vec<Triangle>,
-    bbox: Option<AABB>,
+    bbox: AABB,
     material: M,
 }
 
@@ -53,7 +53,7 @@ where
                 )
             },
         );
-        let bbox = Some(AABB::new(min, max));
+        let bbox = AABB::new(min, max);
         Triangles {
             triangles,
             bbox,
@@ -71,6 +71,6 @@ where
     }
 
     fn bounding_box(&self, _t_min: f32, _t_max: f32) -> Option<AABB> {
-        self.bbox
+        Some(self.bbox)
     }
 }
diff --git a/rtiow/tracer/Cargo.toml b/rtiow/tracer/Cargo.toml
index be5ead1..5c088a7 100644
--- a/rtiow/tracer/Cargo.toml
+++ b/rtiow/tracer/Cargo.toml
@@ -2,7 +2,7 @@
 name = "tracer"
 version = "0.1.0"
 authors = ["Bill Thiede <git@xinu.tv>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html