From c634efbe09be34a3850ae7f8fa47678322ea92a9 Mon Sep 17 00:00:00 2001
From: Johannes Becker <j.becker@famedly.com>
Date: Tue, 8 Jun 2021 11:18:56 +0200
Subject: [PATCH] appservice: Fixes after rebase

---
 matrix_sdk_appservice/examples/autojoin.rs | 2 +-
 matrix_sdk_appservice/tests/tests.rs       | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/matrix_sdk_appservice/examples/autojoin.rs b/matrix_sdk_appservice/examples/autojoin.rs
index 90cbe7c7..0fbd99f7 100644
--- a/matrix_sdk_appservice/examples/autojoin.rs
+++ b/matrix_sdk_appservice/examples/autojoin.rs
@@ -1,7 +1,7 @@
 use std::{convert::TryFrom, env};
 
 use matrix_sdk_appservice::{
-    sdk::{
+    matrix_sdk::{
         async_trait,
         events::{
             room::member::{MemberEventContent, MembershipState},
diff --git a/matrix_sdk_appservice/tests/tests.rs b/matrix_sdk_appservice/tests/tests.rs
index 371bc729..f407b1c0 100644
--- a/matrix_sdk_appservice/tests/tests.rs
+++ b/matrix_sdk_appservice/tests/tests.rs
@@ -7,11 +7,10 @@ use matrix_sdk::{
     async_trait,
     events::{room::member::MemberEventContent, SyncStateEvent},
     room::Room,
-    EventHandler,
+    ClientConfig, EventHandler, RequestConfig,
 };
 use matrix_sdk_appservice::*;
 use matrix_sdk_test::{appservice::TransactionBuilder, async_test, EventsJson};
-use sdk::{ClientConfig, RequestConfig};
 use serde_json::json;
 #[cfg(feature = "warp")]
 use warp::{Filter, Reply};
@@ -319,7 +318,7 @@ async fn test_unrelated_path() -> Result<()> {
     let status = {
         let consumer_filter = warp::any()
             .and(appservice.warp_filter())
-            .or(warp::get().and(warp::path("unrelated").map(|| warp::reply())));
+            .or(warp::get().and(warp::path("unrelated").map(warp::reply)));
 
         let response = warp::test::request()
             .method("GET")