From 5543edb7b9af188c37f8c1dd9e8ba5dae6639396 Mon Sep 17 00:00:00 2001
From: Jonas Platte <jplatte+git@posteo.de>
Date: Sat, 20 Jul 2019 20:56:00 +0200
Subject: [PATCH] Export ruma_events, ruma_identifers

---
 Cargo.toml              |  8 ++++----
 examples/hello_world.rs | 15 +++++++++------
 examples/message_log.rs | 12 +++++++++---
 src/lib.rs              |  3 +++
 4 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 340306a9..c627f372 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -36,14 +36,14 @@ version = "0.2.2"
 git = "https://github.com/ruma/ruma-client-api"
 branch = "update-deps"
 
+[dependencies.ruma-events]
+git = "https://github.com/ruma/ruma-events"
+rev = "1b0be0d0e7fa1040fc51b748256b290e24677b19"
+
 [dependencies.serde]
 version = "1.0.90"
 features = ["derive"]
 
-[dev-dependencies.ruma-events]
-git = "https://github.com/ruma/ruma-events"
-rev = "1b0be0d0e7fa1040fc51b748256b290e24677b19"
-
 [dev-dependencies.tokio]
 git = "https://github.com/tokio-rs/tokio"
 
diff --git a/examples/hello_world.rs b/examples/hello_world.rs
index 33dd36a9..33d091ff 100644
--- a/examples/hello_world.rs
+++ b/examples/hello_world.rs
@@ -2,13 +2,16 @@
 
 use std::{convert::TryFrom, env, process::exit};
 
-use ruma_client::{self, Client};
-use ruma_client_api::r0;
-use ruma_events::{
-    room::message::{MessageEventContent, MessageType, TextMessageEventContent},
-    EventType,
+use ruma_client::{
+    self,
+    events::{
+        room::message::{MessageEventContent, MessageType, TextMessageEventContent},
+        EventType,
+    },
+    identifiers::RoomAliasId,
+    Client,
 };
-use ruma_identifiers::RoomAliasId;
+use ruma_client_api::r0;
 use url::Url;
 
 async fn hello_world(homeserver_url: Url, room: String) -> Result<(), ruma_client::Error> {
diff --git a/examples/message_log.rs b/examples/message_log.rs
index 99a4704d..ee1c2bd7 100644
--- a/examples/message_log.rs
+++ b/examples/message_log.rs
@@ -3,8 +3,14 @@
 use std::{env, process::exit};
 
 use futures::stream::{StreamExt as _, TryStreamExt as _};
-use ruma_events::collections::all::RoomEvent;
-use ruma_events::room::message::{MessageEvent, MessageEventContent, TextMessageEventContent};
+use ruma_client::{
+    self,
+    events::{
+        collections::all::RoomEvent,
+        room::message::{MessageEvent, MessageEventContent, TextMessageEventContent},
+    },
+    HttpClient,
+};
 use url::Url;
 
 async fn log_messages(
@@ -12,7 +18,7 @@ async fn log_messages(
     username: String,
     password: String,
 ) -> Result<(), ruma_client::Error> {
-    let client = ruma_client::Client::new(homeserver_url, None);
+    let client = HttpClient::new(homeserver_url, None);
 
     client.log_in(username, password, None).await?;
 
diff --git a/src/lib.rs b/src/lib.rs
index cea6c75a..c999ddf9 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -124,7 +124,10 @@ use ruma_api::Endpoint;
 use url::Url;
 
 use crate::error::InnerError;
+
 pub use crate::{error::Error, session::Session};
+pub use ruma_events as events;
+pub use ruma_identifiers as identifiers;
 
 /// Matrix client-server API endpoints.
 //pub mod api;