FnOnce as Producer::send callback (#273)

* FnOnce as Producer::send callback
* Update fake deps

Author: allevo

protocol/Cargo.toml

@@ -19,6 +19,5 @@ num_enum = "0.7.0"
 derive_more = "0.99"
 
 [dev-dependencies]
-fake = { version = "3.0", features=['derive', 'chrono','uuid']}
-rand = "0.8"
 pretty_assertions = "1.2.0"
+fake = { version = "4.0", features = [ "derive", "chrono", "uuid" ] }

protocol/src/commands/close.rs

@@ -17,9 +17,6 @@ use crate::{
 
 use super::Command;
 
-#[cfg(test)]
-use fake::Fake;
-
 #[cfg_attr(test, derive(fake::Dummy))]
 #[derive(PartialEq, Eq, Debug)]
 pub struct CloseRequest {

protocol/src/commands/consumer_update.rs

@@ -1,8 +1,5 @@
 use std::io::Write;
 
-#[cfg(test)]
-use fake::Fake;
-
 use crate::{
     codec::{Decoder, Encoder},
     error::{DecodeError, EncodeError},

protocol/src/commands/consumer_update_request.rs

@@ -1,8 +1,5 @@
 use std::io::Write;
 
-#[cfg(test)]
-use fake::Fake;
-
 use crate::{
     codec::{Decoder, Encoder},
     error::{DecodeError, EncodeError},

protocol/src/commands/create_stream.rs

@@ -9,9 +9,6 @@ use crate::{
 
 use super::Command;
 
-#[cfg(test)]
-use fake::Fake;
-
 #[cfg_attr(test, derive(fake::Dummy))]
 #[derive(PartialEq, Eq, Debug)]
 pub struct CreateStreamCommand {

protocol/src/commands/create_super_stream.rs

@@ -1,9 +1,6 @@
 use std::collections::HashMap;
 use std::io::Write;
 
-#[cfg(test)]
-use fake::Fake;
-
 use crate::{
     codec::{Decoder, Encoder},
     error::{DecodeError, EncodeError},

protocol/src/commands/credit.rs

@@ -1,8 +1,5 @@
 use std::io::Write;
 
-#[cfg(test)]
-use fake::Fake;
-
 use crate::{
     codec::{Decoder, Encoder},
     error::{DecodeError, EncodeError},

protocol/src/commands/declare_publisher.rs

@@ -8,9 +8,6 @@ use crate::{
 
 use super::Command;
 
-#[cfg(test)]
-use fake::Fake;
-
 #[cfg_attr(test, derive(fake::Dummy))]
 #[derive(PartialEq, Eq, Debug)]
 pub struct DeclarePublisherCommand {

protocol/src/commands/delete.rs

@@ -8,9 +8,6 @@ use crate::{
 
 use super::Command;
 
-#[cfg(test)]
-use fake::Fake;
-
 #[cfg_attr(test, derive(fake::Dummy))]
 #[derive(PartialEq, Eq, Debug)]
 pub struct Delete {

protocol/src/commands/delete_publisher.rs

@@ -8,9 +8,6 @@ use crate::{
 
 use super::Command;
 
-#[cfg(test)]
-use fake::Fake;
-
 #[cfg_attr(test, derive(fake::Dummy))]
 #[derive(PartialEq, Eq, Debug)]
 pub struct DeletePublisherCommand {

protocol/src/commands/delete_super_stream.rs

@@ -1,8 +1,5 @@
 use std::io::Write;
 
-#[cfg(test)]
-use fake::Fake;
-
 use crate::{
     codec::{Decoder, Encoder},
     error::{DecodeError, EncodeError},
@@ -62,7 +59,6 @@ impl Command for DeleteSuperStreamCommand {
 
 #[cfg(test)]
 mod tests {
-    use crate::commands::create_super_stream::CreateSuperStreamCommand;
     use crate::commands::tests::command_encode_decode_test;
 
     use super::DeleteSuperStreamCommand;

protocol/src/commands/deliver.rs

@@ -9,8 +9,6 @@ use crate::{
     protocol::commands::COMMAND_DELIVER,
 };
 use byteorder::{BigEndian, WriteBytesExt};
-#[cfg(test)]
-use fake::Fake;
 
 #[cfg_attr(test, derive(fake::Dummy))]
 #[derive(PartialEq, Eq, Debug, Clone)]
@@ -163,7 +161,7 @@ mod tests {
 
     use super::{DeliverCommand, Message};
     impl Dummy<Faker> for Message {
-        fn dummy_with_rng<R: rand::Rng + ?Sized>(_config: &Faker, _rng: &mut R) -> Self {
+        fn dummy_with_rng<R: fake::rand::Rng + ?Sized>(_config: &Faker, _rng: &mut R) -> Self {
             Message::new(InternalMessage::default())
         }
     }

protocol/src/commands/exchange_command_versions.rs

@@ -10,9 +10,6 @@ use crate::{
 use super::Command;
 use byteorder::{BigEndian, WriteBytesExt};
 
-#[cfg(test)]
-use fake::Fake;
-
 #[cfg_attr(test, derive(fake::Dummy))]
 #[derive(PartialEq, Eq, Debug)]
 pub struct ExchangeCommandVersion(u16, u16, u16);

protocol/src/commands/generic.rs

@@ -6,9 +6,6 @@ use crate::{
     FromResponse, ResponseCode, ResponseKind,
 };
 
-#[cfg(test)]
-use fake::Fake;
-
 #[cfg_attr(test, derive(fake::Dummy))]
 #[derive(PartialEq, Eq, Debug)]
 pub struct GenericResponse {

protocol/src/commands/metadata.rs

@@ -10,8 +10,6 @@ use crate::{
 use super::Command;
 
 use byteorder::{BigEndian, WriteBytesExt};
-#[cfg(test)]
-use fake::Fake;
 
 #[cfg_attr(test, derive(fake::Dummy))]
 #[derive(PartialEq, Eq, Debug)]

protocol/src/commands/metadata_update.rs

@@ -5,8 +5,6 @@ use crate::{
 use super::Command;
 
 use crate::codec::Encoder;
-#[cfg(test)]
-use fake::Fake;
 
 #[cfg_attr(test, derive(fake::Dummy))]
 #[derive(PartialEq, Eq, Debug)]

protocol/src/commands/open.rs

@@ -10,9 +10,6 @@ use crate::{
 
 use super::Command;
 
-#[cfg(test)]
-use fake::Fake;
-
 #[cfg_attr(test, derive(fake::Dummy))]
 #[derive(PartialEq, Eq, Debug)]
 pub struct OpenCommand {

protocol/src/commands/peer_properties.rs

@@ -10,9 +10,6 @@ use crate::{
 
 use super::Command;
 
-#[cfg(test)]
-use fake::Fake;
-
 #[cfg_attr(test, derive(fake::Dummy))]
 #[derive(PartialEq, Eq, Debug)]
 pub struct PeerPropertiesCommand {

protocol/src/commands/publish.rs

@@ -11,9 +11,6 @@ use super::Command;
 
 use crate::types::PublishedMessage;
 
-#[cfg(test)]
-use fake::Fake;
-
 #[cfg_attr(test, derive(fake::Dummy))]
 #[derive(PartialEq, Eq, Debug)]
 pub struct PublishCommand {

protocol/src/commands/publish_confirm.rs

@@ -8,9 +8,6 @@ use crate::{
 
 use super::Command;
 
-#[cfg(test)]
-use fake::Fake;
-
 #[cfg_attr(test, derive(fake::Dummy))]
 #[derive(PartialEq, Eq, Debug)]
 pub struct PublishConfirm {

protocol/src/commands/publish_error.rs

@@ -10,9 +10,6 @@ use std::io::Write;
 
 use super::Command;
 
-#[cfg(test)]
-use fake::Fake;
-
 #[cfg_attr(test, derive(fake::Dummy))]
 #[derive(PartialEq, Eq, Debug)]
 pub struct PublishErrorResponse {

protocol/src/commands/query_offset.rs

@@ -8,9 +8,6 @@ use std::io::Write;
 
 use super::Command;
 
-#[cfg(test)]
-use fake::Fake;
-
 #[cfg_attr(test, derive(fake::Dummy))]
 #[derive(PartialEq, Eq, Debug)]
 pub struct QueryOffsetRequest {

protocol/src/commands/query_publisher_sequence.rs

@@ -8,9 +8,6 @@ use std::io::Write;
 
 use super::Command;
 
-#[cfg(test)]
-use fake::Fake;
-
 #[cfg_attr(test, derive(fake::Dummy))]
 #[derive(PartialEq, Eq, Debug)]
 pub struct QueryPublisherRequest {

protocol/src/commands/sasl_authenticate.rs

@@ -8,9 +8,6 @@ use crate::{
 
 use super::Command;
 
-#[cfg(test)]
-use fake::Fake;
-
 #[cfg_attr(test, derive(fake::Dummy))]
 #[derive(PartialEq, Eq, Debug)]
 pub struct SaslAuthenticateCommand {

protocol/src/commands/sasl_handshake.rs

@@ -10,9 +10,6 @@ use crate::{
 
 use super::Command;
 
-#[cfg(test)]
-use fake::Fake;
-
 #[cfg_attr(test, derive(fake::Dummy))]
 #[derive(PartialEq, Eq, Debug)]
 pub struct SaslHandshakeCommand {

protocol/src/commands/store_offset.rs

@@ -7,9 +7,6 @@ use std::io::Write;
 
 use super::Command;
 
-#[cfg(test)]
-use fake::Fake;
-
 #[cfg_attr(test, derive(fake::Dummy))]
 #[derive(PartialEq, Eq, Debug)]
 pub struct StoreOffset {

protocol/src/commands/subscribe.rs

@@ -1,9 +1,6 @@
 use std::collections::HashMap;
 use std::io::Write;
 
-#[cfg(test)]
-use fake::Fake;
-
 use crate::{
     codec::{Decoder, Encoder},
     error::{DecodeError, EncodeError},

protocol/src/commands/superstream_partitions.rs

@@ -1,8 +1,5 @@
 use std::io::Write;
 
-#[cfg(test)]
-use fake::Fake;
-
 use super::Command;
 use crate::{
     codec::{Decoder, Encoder},

protocol/src/commands/superstream_route.rs

@@ -1,8 +1,5 @@
 use std::io::Write;
 
-#[cfg(test)]
-use fake::Fake;
-
 use crate::{
     codec::{Decoder, Encoder},
     error::{DecodeError, EncodeError},

protocol/src/commands/tune.rs

@@ -9,9 +9,6 @@ use crate::{
 
 use super::Command;
 
-#[cfg(test)]
-use fake::Fake;
-
 #[cfg_attr(test, derive(fake::Dummy))]
 #[derive(PartialEq, Eq, Debug)]
 pub struct TunesCommand {

protocol/src/commands/unsubscribe.rs

@@ -1,8 +1,5 @@
 use std::io::Write;
 
-#[cfg(test)]
-use fake::Fake;
-
 use crate::{
     codec::{Decoder, Encoder},
     error::{DecodeError, EncodeError},

protocol/src/message/amqp/body.rs

@@ -78,7 +78,7 @@ mod tests {
 
     use super::MessageBody;
     impl Dummy<Faker> for MessageBody {
-        fn dummy_with_rng<R: rand::Rng + ?Sized>(config: &Faker, rng: &mut R) -> Self {
+        fn dummy_with_rng<R: fake::rand::Rng + ?Sized>(config: &Faker, rng: &mut R) -> Self {
             MessageBody {
                 data: config.fake_with_rng(rng),
                 sequence: config.fake_with_rng(rng),

protocol/src/message/amqp/header.rs

@@ -11,9 +11,6 @@ use super::{
     types::{list_decoder, Boolean, List},
     AmqpDecodeError, AmqpDecoder, AmqpEncodeError, AmqpEncoder,
 };
-#[cfg(test)]
-use fake::Fake;
-
 /// Header of the message
 #[derive(Clone, Debug, PartialEq, Eq)]
 #[cfg_attr(test, derive(fake::Dummy))]

protocol/src/message/amqp/message.rs

@@ -11,9 +11,6 @@ use super::section::MessageSection;
 use super::types::{ApplicationProperties, DeliveryAnnotations, Footer, MessageAnnotations};
 use super::{AmqpDecodeError, AmqpDecoder};
 
-#[cfg(test)]
-use fake::Fake;
-
 #[derive(Debug, Clone, Default, PartialEq, Eq)]
 #[cfg_attr(test, derive(fake::Dummy))]
 pub struct Message {

protocol/src/message/amqp/mod.rs

@@ -52,7 +52,7 @@ mod tests {
     where
         T: Dummy<Faker> + AmqpDecoder + AmqpEncoder + Debug + PartialEq,
     {
-        let mut rng = rand::thread_rng();
+        let mut rng = fake::rand::rng();
         let len: usize = DEFAULT_LEN_RANGE.fake_with_rng(&mut rng);
 
         for _ in 0..len {

protocol/src/message/amqp/properties.rs

@@ -15,9 +15,6 @@ use super::{
     AmqpEncodeError, AmqpEncoder,
 };
 
-#[cfg(test)]
-use fake::Fake;
-
 /// Properties of the message
 #[derive(Clone, Debug, PartialEq, Eq, Default)]
 #[cfg_attr(test, derive(fake::Dummy))]

protocol/src/message/amqp/types/annotations.rs

@@ -4,8 +4,6 @@ use crate::{
 };
 
 use super::{Long, Map, Symbol, ULong, Value};
-#[cfg(test)]
-use fake::Fake;
 
 /// Key for annotations [`Map`]
 #[derive(Debug, Clone, Hash, PartialEq, Eq)]

protocol/src/message/amqp/types/descriptor.rs

@@ -5,9 +5,6 @@ use crate::message::amqp::codec::{AmqpDecoder, AmqpEncoder};
 use crate::message::amqp::error::{AmqpDecodeError, AmqpEncodeError};
 use crate::utils::TupleMapperSecond;
 
-#[cfg(test)]
-use fake::Fake;
-
 #[derive(Debug, PartialEq, Eq, Clone, Hash)]
 #[cfg_attr(test, derive(fake::Dummy))]
 pub enum Descriptor {

protocol/src/message/amqp/types/mod.rs

@@ -6,9 +6,6 @@ pub use primitives::*;
 
 use super::{codec::constants::TypeCode, AmqpDecoder, AmqpEncodeError, AmqpEncoder};
 
-#[cfg(test)]
-use fake::Fake;
-
 mod annotations;
 mod definitions;
 mod descriptor;