Rename Receiver to Consumer and cleanup DisruptorWrapper.

src/consumer.rs

@@ -5,12 +5,12 @@ use crate::DisruptorWrapper;
 use crate::producer::ProducerBarrier;
 use crate::wait_strategies::WaitStrategy;
 
-pub(crate) struct Receiver {
+pub(crate) struct Consumer {
 	join_handle: Option<JoinHandle<()>>
 }
 
-impl Receiver {
-	pub(crate) fn new<E, F, W, P>(wrapper: DisruptorWrapper<E, P>, mut process: F, wait_strategy: W) -> Receiver where
+impl Consumer {
+	pub(crate) fn new<E, F, W, P>(wrapper: DisruptorWrapper<E, P>, mut process: F, wait_strategy: W) -> Consumer where
 		F: Send + FnMut(&E, i64, bool) + 'static,
 		E: 'static,
 		W: WaitStrategy + 'static,
@@ -43,7 +43,7 @@ impl Receiver {
 			}
 		});
 
-		Receiver { join_handle: Some(join_handle) }
+		Consumer { join_handle: Some(join_handle) }
 	}
 
 	pub(crate) fn join(&mut self) {

src/lib.rs

@@ -50,7 +50,7 @@ mod consumer;
 use std::cell::UnsafeCell;
 use std::sync::atomic::{AtomicBool, AtomicI64, Ordering};
 use crossbeam_utils::CachePadded;
-use crate::consumer::Receiver;
+use crate::consumer::Consumer;
 use crate::producer::{ProducerBarrier, Producer, SingleProducerBarrier};
 use crate::wait_strategies::WaitStrategy;
 
@@ -162,8 +162,8 @@ impl<E, P, W> Builder<E, P, W> where
 			)
 		);
 
-		let wrapper  = DisruptorWrapper { disruptor };
-		let receiver = Receiver::new(wrapper, self.processor, self.wait_strategy);
+		let wrapper  = DisruptorWrapper(disruptor);
+		let receiver = Consumer::new(wrapper, self.processor, self.wait_strategy);
 		Producer::new(disruptor, receiver, self.ring_buffer_size - 1)
 	}
 }
@@ -172,16 +172,14 @@ struct Slot<E> {
 	event: UnsafeCell<E>
 }
 
-struct DisruptorWrapper<T, P: ProducerBarrier> {
-	disruptor: *mut Disruptor<T, P>
-}
+// Needed for providing a `Disruptor` reference to the Consumer thread.
+struct DisruptorWrapper<T, P: ProducerBarrier> (*mut Disruptor<T, P>);
 
 unsafe impl<E, P: ProducerBarrier> Send for DisruptorWrapper<E, P> {}
 
-impl<T, P: ProducerBarrier> DisruptorWrapper<T, P> {
-	#[inline]
-	fn unwrap(&self) -> &Disruptor<T, P> {
-		unsafe { &*self.disruptor }
+impl<E, P: ProducerBarrier> DisruptorWrapper<E, P> {
+	fn unwrap(&self) -> &Disruptor<E, P> {
+		unsafe { &*self.0 }
 	}
 }
 

src/producer.rs

@@ -2,7 +2,7 @@
 
 use crossbeam_utils::CachePadded;
 use std::sync::atomic::{AtomicI64, Ordering};
-use crate::consumer::Receiver;
+use crate::consumer::Consumer;
 use crate::Disruptor;
 
 pub(crate) trait ProducerBarrier {
@@ -36,7 +36,7 @@ impl ProducerBarrier for SingleProducerBarrier {
 /// Producer for publishing to the Disruptor from a single thread.
 pub struct Producer<E> {
 	disruptor: *mut Disruptor<E, SingleProducerBarrier>,
-	receiver: Receiver,
+	receiver: Consumer,
 	available_publisher_sequence: i64,
 }
 
@@ -52,7 +52,7 @@ pub struct RingBufferFull;
 impl<E> Producer<E> {
 	pub(crate) fn new(
 		disruptor: *mut Disruptor<E, SingleProducerBarrier>,
-		receiver: Receiver,
+		receiver: Consumer,
 		available_publisher_sequence: i64
 	) -> Self {
 		Producer {