Skip to content

Commit 611c88f

Browse files
committed
Update merge queue method .send(() -> .trigger()
1 parent 581520f commit 611c88f

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

src/bors/handlers/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ pub async fn handle_bors_global_event(
318318
crate::bors::WAIT_FOR_PR_STATUS_REFRESH.mark();
319319
}
320320
BorsGlobalEvent::ProcessMergeQueue => {
321-
merge_queue_tx.send(()).await?;
321+
merge_queue_tx.trigger().await?;
322322
}
323323
}
324324
Ok(())

src/bors/handlers/review.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ pub(super) async fn command_approve(
5656
db.approve(&pr.db, approval_info, priority, rollup).await?;
5757
handle_label_trigger(&repo_state, pr.number(), LabelTrigger::Approved).await?;
5858

59-
merge_queue_tx.send(()).await?;
59+
merge_queue_tx.trigger().await?;
6060
notify_of_approval(&repo_state, pr, approver.as_str()).await
6161
}
6262

@@ -176,7 +176,7 @@ pub(super) async fn command_close_tree(
176176
)
177177
.await?;
178178

179-
merge_queue_tx.send(()).await?;
179+
merge_queue_tx.trigger().await?;
180180
notify_of_tree_closed(&repo_state, pr.number(), priority).await
181181
}
182182

@@ -195,7 +195,7 @@ pub(super) async fn command_open_tree(
195195
db.upsert_repository(repo_state.repository(), TreeState::Open)
196196
.await?;
197197

198-
merge_queue_tx.send(()).await?;
198+
merge_queue_tx.trigger().await?;
199199
notify_of_tree_open(&repo_state, pr.number()).await
200200
}
201201

src/bors/handlers/workflow.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ async fn try_complete_build(
224224

225225
// Trigger merge queue when an auto build completes
226226
if payload.branch == AUTO_BRANCH_NAME {
227-
merge_queue_tx.send(()).await?;
227+
merge_queue_tx.trigger().await?;
228228
}
229229

230230
Ok(())

src/bors/merge_queue.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ pub struct MergeQueueSender {
1919
}
2020

2121
impl MergeQueueSender {
22-
pub async fn send(&self, _value: ()) -> Result<(), mpsc::error::SendError<()>> {
22+
pub async fn trigger(&self) -> Result<(), mpsc::error::SendError<()>> {
2323
self.inner
2424
.send(MergeQueueEvent::Trigger)
2525
.await

0 commit comments

Comments
 (0)