Add eyrie.EmptinessAndRelativity

Portfoligno · Feb 9, 2019 · ced79ce · ced79ce
1 parent 5155b01
commit ced79ce
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 17 deletions.
diff --git a/core/src/main/scala/eyrie/package.scala b/core/src/main/scala/eyrie/package.scala
@@ -3,16 +3,8 @@ import shapeless.Witness
 package object eyrie {
   trait Emptiness[+X]
   trait Relativity[+X]
+  trait EmptinessAndRelativity[+X]
 
   type True = Witness.`true`.T
   type False = Witness.`false`.T
-
-
-  private[eyrie]
-  type ∏[A, B] = (A, B)
-
-  private[eyrie]
-  type -∏-[A[_], B[_]] = {
-    type λ[X] = A[X] ∏ B[X]
-  }
 }
diff --git a/file/src/main/scala/eyrie/file/instances/FilePathConvertible.scala b/file/src/main/scala/eyrie/file/instances/FilePathConvertible.scala
@@ -66,17 +66,17 @@ trait ConvertibleLowPriorityInstances extends ConvertibleLowPriorityInstances1 {
     _absoluteFileConvertibleInstance.of[C, Relativity, False, FilePath.NonEmpty]
 
   implicit def eyrieFileIdentityFilePathBaseConvertibleInstance[C]: Convertible.Aux[
-    (Emptiness -∏- Relativity)#λ, True ∏ True, IdentityFilePath[C], FilePath[C]] =
-    _identityFilePathConvertibleInstance.of[C, (Emptiness -∏- Relativity)#λ, True ∏ True, FilePath]
+    EmptinessAndRelativity, (True, True), IdentityFilePath[C], FilePath[C]] =
+    _identityFilePathConvertibleInstance.of[C, EmptinessAndRelativity, (True, True), FilePath]
   implicit def eyrieFileRootDirectoryBaseConvertibleInstance[C]: Convertible.Aux[
-    (Emptiness -∏- Relativity)#λ, True ∏ False, RootDirectory[C], FilePath[C]] =
-    _rootDirectoryConvertibleInstance.of[C, (Emptiness -∏- Relativity)#λ, True ∏ False, FilePath]
+    EmptinessAndRelativity, (True, False), RootDirectory[C], FilePath[C]] =
+    _rootDirectoryConvertibleInstance.of[C, EmptinessAndRelativity, (True, False), FilePath]
   implicit def eyrieFileRelativeFileBaseConvertibleInstance[C]: Convertible.Aux[
-    (Emptiness -∏- Relativity)#λ, False ∏ True, RelativeFile[C], FilePath[C]] =
-    _relativeFileConvertibleInstance.of[C, (Emptiness -∏- Relativity)#λ, False ∏ True, FilePath]
+    EmptinessAndRelativity, (False, True), RelativeFile[C], FilePath[C]] =
+    _relativeFileConvertibleInstance.of[C, EmptinessAndRelativity, (False, True), FilePath]
   implicit def eyrieFileAbsoluteFileBaseConvertibleInstance[C]: Convertible.Aux[
-    (Emptiness -∏- Relativity)#λ, False ∏ False, AbsoluteFile[C], FilePath[C]] =
-    _absoluteFileConvertibleInstance.of[C, (Emptiness -∏- Relativity)#λ, False ∏ False, FilePath]
+    EmptinessAndRelativity, (False, False), AbsoluteFile[C], FilePath[C]] =
+    _absoluteFileConvertibleInstance.of[C, EmptinessAndRelativity, (False, False), FilePath]
 }
 
 private[file]