From 76d0780f5a0561cc0d0d8351b2bef77c325bc5bf Mon Sep 17 00:00:00 2001
From: Jonas Platte <jplatte+git@posteo.de>
Date: Thu, 19 Oct 2017 23:29:06 +0200
Subject: [PATCH] Remove aliases for Core and Handle from tokio_core

---
 examples/hello_world.rs       | 6 +++---
 examples/hello_world_await.rs | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/examples/hello_world.rs b/examples/hello_world.rs
index 708dade4..dc62b7a2 100644
--- a/examples/hello_world.rs
+++ b/examples/hello_world.rs
@@ -16,7 +16,7 @@ use ruma_client::api::r0;
 use ruma_events::EventType;
 use ruma_events::room::message::{MessageEventContent, MessageType, TextMessageEventContent};
 use ruma_identifiers::RoomAliasId;
-use tokio_core::reactor::{Core as TokioCore, Handle as TokioHandle};
+use tokio_core::reactor::{Core, Handle};
 use url::Url;
 
 // from https://stackoverflow.com/a/43992218/1592377
@@ -39,7 +39,7 @@ macro_rules! clone {
 }
 
 fn hello_world(
-    tokio_handle: &TokioHandle,
+    tokio_handle: &Handle,
     homeserver_url: Url,
 ) -> impl Future<Item = (), Error = ruma_client::Error> + 'static {
     let client = Client::https(tokio_handle, homeserver_url, None).unwrap();
@@ -69,7 +69,7 @@ fn hello_world(
 }
 
 fn main() {
-    let mut core = TokioCore::new().unwrap();
+    let mut core = Core::new().unwrap();
     let handle = core.handle();
     let server = Url::parse("https://matrix.org/").unwrap();
 
diff --git a/examples/hello_world_await.rs b/examples/hello_world_await.rs
index e833ec08..b0167d64 100644
--- a/examples/hello_world_await.rs
+++ b/examples/hello_world_await.rs
@@ -18,11 +18,11 @@ use ruma_client::api::r0;
 use ruma_events::EventType;
 use ruma_events::room::message::{MessageEventContent, MessageType, TextMessageEventContent};
 use ruma_identifiers::RoomAliasId;
-use tokio_core::reactor::{Core as TokioCore, Handle as TokioHandle};
+use tokio_core::reactor::{Core, Handle};
 use url::Url;
 
 fn hello_world(
-    tokio_handle: &TokioHandle,
+    tokio_handle: &Handle,
     homeserver_url: Url,
 ) -> impl Future<Item = (), Error = ruma_client::Error> + 'static {
     let client = Client::https(tokio_handle, homeserver_url, None).unwrap();
@@ -65,7 +65,7 @@ fn hello_world(
 }
 
 fn main() {
-    let mut core = TokioCore::new().unwrap();
+    let mut core = Core::new().unwrap();
     let handle = core.handle();
     let server = Url::parse("https://matrix.org/").unwrap();