From 5ee114ed0aeb2ae71609a6e22234106d94c9f58c Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 12 Feb 2023 21:01:28 +0100
Subject: [PATCH] types: slightly simplify DivRev trait

---
 src/types.rs | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/types.rs b/src/types.rs
index 427faa4..71835dd 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -105,11 +105,12 @@ impl<T> IndexMut<ChunkCoords> for ChunkArray<T> {
 	}
 }
 
-pub trait DivRem<Rhs> {
-	type DivOutput;
-	type RemOutput;
-
-	fn div_rem(self, rhs: Rhs) -> (Self::DivOutput, Self::RemOutput);
+pub trait DivRem<Rhs>
+where
+	Self: Div<Rhs>,
+	Self: Rem<Rhs>,
+{
+	fn div_rem(self, rhs: Rhs) -> (<Self as Div<Rhs>>::Output, <Self as Rem<Rhs>>::Output);
 }
 
 impl<Lhs, Rhs> DivRem<Rhs> for Lhs
@@ -119,10 +120,7 @@ where
 	Self: Copy,
 	Rhs: Copy,
 {
-	type DivOutput = <Self as Div<Rhs>>::Output;
-	type RemOutput = <Self as Rem<Rhs>>::Output;
-
-	fn div_rem(self, rhs: Rhs) -> (Self::DivOutput, Self::RemOutput) {
+	fn div_rem(self, rhs: Rhs) -> (<Self as Div<Rhs>>::Output, <Self as Rem<Rhs>>::Output) {
 		(self / rhs, self % rhs)
 	}
 }