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(pub A, pub B);
@@ -94,30 +92,7 @@ where
{
}
-impl SubscriptionType for MergedObject
-where
- A: SubscriptionType + Send + Sync,
- B: SubscriptionType + Send + Sync,
-{
- fn create_field_stream<'a>(
- &'a self,
- ctx: &'a Context<'a>,
- ) -> Option> + 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;