From 22ebf186c6e4948917bf2b3b488813920e74195d Mon Sep 17 00:00:00 2001
From: Carl Lerche <me@carllerche.com>
Date: Wed, 2 Aug 2017 12:57:49 -0700
Subject: [PATCH] Move state into proto::streams

---
 src/proto/mod.rs                 | 1 -
 src/proto/streams/mod.rs         | 1 +
 src/proto/streams/recv.rs        | 2 +-
 src/proto/streams/send.rs        | 2 +-
 src/proto/{ => streams}/state.rs | 0
 src/proto/streams/store.rs       | 1 +
 6 files changed, 4 insertions(+), 3 deletions(-)
 rename src/proto/{ => streams}/state.rs (100%)

diff --git a/src/proto/mod.rs b/src/proto/mod.rs
index 4b703f7..30f2c6c 100644
--- a/src/proto/mod.rs
+++ b/src/proto/mod.rs
@@ -3,7 +3,6 @@ mod framed_read;
 mod framed_write;
 mod ping_pong;
 mod settings;
-mod state;
 mod streams;
 
 pub use self::connection::Connection;
diff --git a/src/proto/streams/mod.rs b/src/proto/streams/mod.rs
index c6ddbfa..02757a2 100644
--- a/src/proto/streams/mod.rs
+++ b/src/proto/streams/mod.rs
@@ -1,5 +1,6 @@
 mod recv;
 mod send;
+mod state;
 mod store;
 
 use self::recv::Recv;
diff --git a/src/proto/streams/recv.rs b/src/proto/streams/recv.rs
index f9f97a0..115bffc 100644
--- a/src/proto/streams/recv.rs
+++ b/src/proto/streams/recv.rs
@@ -1,6 +1,6 @@
 use {frame, Peer, ConnectionError};
 use proto::*;
-use super::{Config, Store};
+use super::{state, Config, Store};
 
 use error::Reason::*;
 
diff --git a/src/proto/streams/send.rs b/src/proto/streams/send.rs
index f7a752f..a0ca3a8 100644
--- a/src/proto/streams/send.rs
+++ b/src/proto/streams/send.rs
@@ -1,6 +1,6 @@
 use {frame, Peer, ConnectionError};
 use proto::*;
-use super::{Config, Store};
+use super::{state, Config, Store};
 
 use error::User::*;
 
diff --git a/src/proto/state.rs b/src/proto/streams/state.rs
similarity index 100%
rename from src/proto/state.rs
rename to src/proto/streams/state.rs
diff --git a/src/proto/streams/store.rs b/src/proto/streams/store.rs
index 494fd8f..cb164e0 100644
--- a/src/proto/streams/store.rs
+++ b/src/proto/streams/store.rs
@@ -1,6 +1,7 @@
 extern crate slab;
 
 use proto::*;
+use super::state;
 
 use std::collections::{HashMap, hash_map};