the-distro/ofborg
2
0
Fork 1
Code Issues 1 Pull requests 1 Packages Projects Releases Wiki Activity

remove static lifetimes from easylapin

Browse source 
Unlike amqp::Consumer lapin channels don't need to have a 'static
lifetime, the workers just need to live at least as long as the channel.
This commit is contained in:
Daiderd Jordan 2020-05-01 14:27:53 +02:00
parent 3b6947cd20
commit c4ab7290c5
No known key found for this signature in database
GPG key ID: D02435D05B810C96
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ofborg/src/easyamqp.rs
View file

@ -303,7 +303,7 @@ pub trait ChannelExt {
fn bind_queue(&mut self, config: BindQueueConfig) -> Result<(), Self::Error>; fn bind_queue(&mut self, config: BindQueueConfig) -> Result<(), Self::Error>;
} }
pub trait ConsumerExt<C> { pub trait ConsumerExt<'a, C> {
type Error; type Error;
type Handle; type Handle;
fn consume(self, callback: C, config: ConsumeConfig) -> Result<Self::Handle, Self::Error>; fn consume(self, callback: C, config: ConsumeConfig) -> Result<Self::Handle, Self::Error>;
@ -351,7 +351,7 @@ impl ChannelExt for amqp::Channel {
} }
} }
impl<C: amqp::Consumer + 'static> ConsumerExt<C> for amqp::Channel { impl<C: amqp::Consumer + 'static> ConsumerExt<'_, C> for amqp::Channel {
type Error = amqp::AMQPError; type Error = amqp::AMQPError;
type Handle = Self; type Handle = Self;

8
ofborg/src/easylapin.rs
View file

@ -80,9 +80,9 @@ impl ChannelExt for CloseOnDrop<Channel> {
} }
} }
impl<W: SimpleWorker + 'static> ConsumerExt<W> for CloseOnDrop<Channel> { impl<'a, W: SimpleWorker + 'a> ConsumerExt<'a, W> for CloseOnDrop<Channel> {
type Error = lapin::Error; type Error = lapin::Error;
type Handle = Pin<Box<dyn Future<Output = ()> + 'static>>; type Handle = Pin<Box<dyn Future<Output = ()> + 'a>>;
fn consume(self, mut worker: W, config: ConsumeConfig) -> Result<Self::Handle, Self::Error> { fn consume(self, mut worker: W, config: ConsumeConfig) -> Result<Self::Handle, Self::Error> {
task::block_on(self.basic_qos(1, BasicQosOptions::default()))?; task::block_on(self.basic_qos(1, BasicQosOptions::default()))?;
@ -130,9 +130,9 @@ impl<'a> NotificationReceiver for ChannelNotificationReceiver<'a> {
// but one could probably be implemented in terms of the other instead. // but one could probably be implemented in terms of the other instead.
pub struct NotifyChannel(pub CloseOnDrop<Channel>); pub struct NotifyChannel(pub CloseOnDrop<Channel>);
impl<W: SimpleNotifyWorker + 'static> ConsumerExt<W> for NotifyChannel { impl<'a, W: SimpleNotifyWorker + 'a> ConsumerExt<'a, W> for NotifyChannel {
type Error = lapin::Error; type Error = lapin::Error;
type Handle = Pin<Box<dyn Future<Output = ()> + 'static>>; type Handle = Pin<Box<dyn Future<Output = ()> + 'a>>;
fn consume(self, worker: W, config: ConsumeConfig) -> Result<Self::Handle, Self::Error> { fn consume(self, worker: W, config: ConsumeConfig) -> Result<Self::Handle, Self::Error> {
task::block_on(self.0.basic_qos(1, BasicQosOptions::default()))?; task::block_on(self.0.basic_qos(1, BasicQosOptions::default()))?;