From cb2139afcda74ee2787f0392175bb9b062f35d50 Mon Sep 17 00:00:00 2001
From: sunli <scott_s829@163.com>
Date: Thu, 1 Oct 2020 18:48:11 +0800
Subject: [PATCH] Remove useless code.

---
 src/types/merged_object.rs | 27 +--------------------------
 src/types/mod.rs           |  2 +-
 2 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/src/types/merged_object.rs b/src/types/merged_object.rs
index ad42f82b..d38701fb 100644
--- a/src/types/merged_object.rs
+++ b/src/types/merged_object.rs
@@ -3,12 +3,10 @@ use crate::registry::{MetaType, Registry};
 use crate::resolver_utils::resolve_container;
 use crate::{
     CacheControl, ContainerType, Context, ContextSelectionSet, ObjectType, OutputValueType,
-    Positioned, ServerResult, SimpleObject, Subscription, SubscriptionType, Type,
+    Positioned, ServerResult, SimpleObject, Type,
 };
-use futures::Stream;
 use indexmap::IndexMap;
 use std::borrow::Cow;
-use std::pin::Pin;
 
 #[doc(hidden)]
 pub struct MergedObject<A, B>(pub A, pub B);
@@ -94,30 +92,7 @@ where
 {
 }
 
-impl<A, B> SubscriptionType for MergedObject<A, B>
-where
-    A: SubscriptionType + Send + Sync,
-    B: SubscriptionType + Send + Sync,
-{
-    fn create_field_stream<'a>(
-        &'a self,
-        ctx: &'a Context<'a>,
-    ) -> Option<Pin<Box<dyn Stream<Item = ServerResult<serde_json::Value>> + Send + 'a>>> {
-        match self.0.create_field_stream(ctx) {
-            Some(stream) => Some(stream),
-            None => self.1.create_field_stream(ctx),
-        }
-    }
-}
-
 #[doc(hidden)]
 #[derive(SimpleObject, Default)]
 #[graphql(internal)]
 pub struct MergedObjectTail;
-
-#[doc(hidden)]
-#[derive(Default)]
-pub struct MergedObjectSubscriptionTail;
-
-#[Subscription(internal)]
-impl MergedObjectSubscriptionTail {}
diff --git a/src/types/mod.rs b/src/types/mod.rs
index 755c33cb..7bc9c35b 100644
--- a/src/types/mod.rs
+++ b/src/types/mod.rs
@@ -22,7 +22,7 @@ pub use empty_subscription::EmptySubscription;
 pub use id::ID;
 pub use json::{Json, OutputJson};
 pub use maybe_undefined::MaybeUndefined;
-pub use merged_object::{MergedObject, MergedObjectSubscriptionTail, MergedObjectTail};
+pub use merged_object::{MergedObject, MergedObjectTail};
 #[cfg(feature = "string_number")]
 pub use string_number::StringNumber;
 pub use upload::Upload;