Bump Rocket to current HEAD

This commit is contained in:
Rudi Floren committed 2021-03-03 22:42:10 +01:00
1 parent 1a940b6e05
commit f4039902d8
4 files changed
+401 -354

No files matched your search

+2 -1
View File
@@ -698,7 +698,8 @@ pub async fn sync_events_route(
if duration.as_secs() > 30 {
duration = Duration::from_secs(30);
}
let mut delay = tokio::time::delay_for(duration);
let delay = tokio::time::sleep(duration);
tokio::pin!(delay);
tokio::select! {
_ = &mut delay => {}
_ = watcher => {}
+1 -2
View File
@@ -7,7 +7,6 @@ use ruma::{
events::{room::message, EventType},
UserId,
};
use tokio::select;
pub enum AdminCommand {
RegisterAppservice(serde_yaml::Value),
@@ -71,7 +70,7 @@ impl Admin {
};
loop {
select! {
tokio::select! {
Some(event) = receiver.next() => {
match event {
AdminCommand::RegisterAppservice(yaml) => {