resolve conflicts

src/core/ir/discriminator.rs

@@ -6,10 +6,10 @@ use std::collections::BTreeSet;
 use anyhow::{bail, Result};
 use async_graphql::Value;
 use keyed_discriminator::KeyedDiscriminator;
+use tailcall_valid::{Valid, Validator};
 use type_field_discriminator::TypeFieldDiscriminator;
 
 use crate::core::json::{JsonLike, JsonObjectLike};
-use crate::core::valid::{Valid, Validator};
 
 /// Resolver for `__typename` of Union and Interface types.
 ///

src/core/ir/discriminator/keyed_discriminator.rs

@@ -2,9 +2,9 @@ use std::collections::BTreeSet;
 
 use anyhow::{bail, Result};
 use async_graphql::Value;
+use tailcall_valid::Valid;
 
 use super::TypedValue;
-use crate::core::valid::Valid;
 
 /// Resolver for `__typename` of Union and Interface types.
 ///
@@ -82,10 +82,10 @@ impl KeyedDiscriminator {
 mod tests {
     use async_graphql::Value;
     use serde_json::json;
+    use tailcall_valid::Validator;
     use test_log::test;
 
     use super::KeyedDiscriminator;
-    use crate::core::valid::Validator;
 
     #[test]
     fn test_keyed_discriminator_positive() {

src/core/ir/discriminator/type_field_discriminator.rs

@@ -2,10 +2,10 @@ use std::collections::BTreeSet;
 
 use anyhow::{bail, Result};
 use async_graphql::Value;
+use tailcall_valid::Valid;
 
 use super::TypedValue;
 use crate::core::json::JsonLike;
-use crate::core::valid::Valid;
 
 /// Resolver for `__typename` of Union and Interface types.
 ///
@@ -80,10 +80,10 @@ impl TypeFieldDiscriminator {
 mod tests {
     use async_graphql::Value;
     use serde_json::json;
+    use tailcall_valid::Validator;
     use test_log::test;
 
     use super::TypeFieldDiscriminator;
-    use crate::core::valid::Validator;
 
     #[test]
     fn test_type_field_positive() {

src/core/jit/transform/check_dedupe.rs

@@ -1,6 +1,7 @@
 use std::convert::Infallible;
 
 use tailcall_valid::Valid;
+
 use crate::core::ir::model::IR;
 use crate::core::jit::OperationPlan;
 use crate::core::Transform;

src/core/jit/transform/check_protected.rs

@@ -1,9 +1,10 @@
 use std::convert::Infallible;
 use std::marker::PhantomData;
 
+use tailcall_valid::Valid;
+
 use crate::core::ir::model::IR;
 use crate::core::jit::OperationPlan;
-use crate::core::valid::Valid;
 use crate::core::Transform;
 
 pub struct CheckProtected<A>(PhantomData<A>);