Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/ofborg
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: aad9533d4bf0
Choose a base ref
...
head repository: NixOS/ofborg
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5b5a13eb69cc
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jan 16, 2021

  1. easylapin: make clippy happy 

    Everybody deserves to be happy, right?
    @cole-h
    cole-h committed Jan 16, 2021
    Copy the full SHA
    5b5a13e View commit details
Showing with 25 additions and 18 deletions.
  1. +25 −18 ofborg/src/easylapin.rs
43 changes: 25 additions & 18 deletions ofborg/src/easylapin.rs
View file
Original file line number Diff line number Diff line change
@@ -27,21 +27,24 @@ pub fn from_config(cfg: &RabbitMQConfig) -> Result<Connection, lapin::Error> {
"ofborg_version".into(),
AMQPValue::LongString(ofborg::VERSION.into()),
);
let mut opts = ConnectionProperties::default();
opts.client_properties = props;
let opts = ConnectionProperties {
client_properties: props,
..Default::default()
};
task::block_on(Connection::connect(&cfg.as_uri(), opts))
}

impl ChannelExt for Channel {
type Error = lapin::Error;

fn declare_exchange(&mut self, config: ExchangeConfig) -> Result<(), Self::Error> {
let mut opts = ExchangeDeclareOptions::default();
opts.passive = config.passive;
opts.durable = config.durable;
opts.auto_delete = config.auto_delete;
opts.internal = config.internal;
opts.nowait = config.no_wait;
let opts = ExchangeDeclareOptions {
passive: config.passive,
durable: config.durable,
auto_delete: config.auto_delete,
internal: config.internal,
nowait: config.no_wait,
};

let kind = match config.exchange_type {
ExchangeType::Topic => ExchangeKind::Topic,
@@ -53,20 +56,22 @@ impl ChannelExt for Channel {
}

fn declare_queue(&mut self, config: QueueConfig) -> Result<(), Self::Error> {
let mut opts = QueueDeclareOptions::default();
opts.passive = config.passive;
opts.durable = config.durable;
opts.exclusive = config.exclusive;
opts.auto_delete = config.auto_delete;
opts.nowait = config.no_wait;
let opts = QueueDeclareOptions {
passive: config.passive,
durable: config.durable,
exclusive: config.exclusive,
auto_delete: config.auto_delete,
nowait: config.no_wait,
};

task::block_on(self.queue_declare(&config.queue, opts, FieldTable::default()))?;
Ok(())
}

fn bind_queue(&mut self, config: BindQueueConfig) -> Result<(), Self::Error> {
let mut opts = QueueBindOptions::default();
opts.nowait = config.no_wait;
let opts = QueueBindOptions {
nowait: config.no_wait,
};

task::block_on(self.queue_bind(
&config.queue,
@@ -202,8 +207,10 @@ async fn action_deliver(
}
Action::NackRequeue => {
debug!(?deliver.delivery_tag, "action nack requeue");
let mut opts = BasicNackOptions::default();
opts.requeue = true;
let opts = BasicNackOptions {
requeue: true,
..Default::default()
};
chan.basic_nack(deliver.delivery_tag, opts).await
}
Action::NackDump => {