From 122dea96a0d8d78c15bc1078520732926d7bd871 Mon Sep 17 00:00:00 2001 From: John Downey Date: Sun, 4 Jul 2021 21:32:03 -0500 Subject: [PATCH] Cleanup uses of num crate --- src/matrix.rs | 4 +--- src/sphere.rs | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/matrix.rs b/src/matrix.rs index f6165ea..6beab90 100644 --- a/src/matrix.rs +++ b/src/matrix.rs @@ -1,9 +1,7 @@ use crate::{point, vector, Point, Vector, EPSILON}; use approx::AbsDiffEq; -use core::f64; use generic_array::{ArrayLength, GenericArray}; -use num::Integer; -use num::Zero; +use num::{Integer, Zero}; use std::{ iter::{self, FromIterator}, marker::PhantomData, diff --git a/src/sphere.rs b/src/sphere.rs index 2e7a390..e7bf454 100644 --- a/src/sphere.rs +++ b/src/sphere.rs @@ -1,6 +1,5 @@ use crate::{intersection, material, point, Intersections, Material, Matrix4, Ray, Vector}; use derive_builder::Builder; -use num::Float; use point::Point; pub fn sphere() -> Sphere { @@ -27,7 +26,7 @@ impl Sphere { if discriminant.is_sign_negative() { Intersections::empty() } else { - let discriminant_root = Float::sqrt(discriminant); + let discriminant_root = discriminant.sqrt(); let t1 = (-b - discriminant_root) / (2.0 * a); let t2 = (-b + discriminant_root) / (2.0 * a);