From 40745c5671daf8ac7eb342ff0e1e7c801a7171c4 Mon Sep 17 00:00:00 2001
From: Sean McArthur <sean.monstar@gmail.com>
Date: Thu, 14 Jul 2016 09:59:47 -0700
Subject: [PATCH] refactor(lib): moved LanguageTag export to header

BREAKING CHANGE: LanguageTag used to be at the crate root, but it is now
  in the `hyper::header` module.
---
 src/header/common/accept_language.rs | 3 +--
 src/header/common/mod.rs             | 1 -
 src/header/shared/mod.rs             | 1 +
 src/lib.rs                           | 4 ++--
 src/server/mod.rs                    | 4 +++-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/header/common/accept_language.rs b/src/header/common/accept_language.rs
index 4b7f1ac001..aa31cf9454 100644
--- a/src/header/common/accept_language.rs
+++ b/src/header/common/accept_language.rs
@@ -21,8 +21,7 @@ header! {
     ///
     /// # Examples
     /// ```
-    /// use hyper::LanguageTag;
-    /// use hyper::header::{Headers, AcceptLanguage, qitem};
+    /// use hyper::header::{Headers, AcceptLanguage, LanguageTag, qitem};
     ///
     /// let mut headers = Headers::new();
     /// let mut langtag: LanguageTag = Default::default();
diff --git a/src/header/common/mod.rs b/src/header/common/mod.rs
index 542c08fcb0..d621e6072d 100644
--- a/src/header/common/mod.rs
+++ b/src/header/common/mod.rs
@@ -120,7 +120,6 @@ macro_rules! __hyper__tm {
             use std::str;
             use $crate::header::*;
             use $crate::mime::*;
-            use $crate::language_tags::*;
             use $crate::method::Method;
             use super::$id as HeaderField;
             $($tf)*
diff --git a/src/header/shared/mod.rs b/src/header/shared/mod.rs
index 272b2ede93..082be831bd 100644
--- a/src/header/shared/mod.rs
+++ b/src/header/shared/mod.rs
@@ -4,6 +4,7 @@ pub use cookie::CookieJar;
 pub use self::encoding::Encoding;
 pub use self::entity::EntityTag;
 pub use self::httpdate::HttpDate;
+pub use language_tags::LanguageTag;
 pub use self::quality_item::{Quality, QualityItem, qitem, q};
 
 mod charset;
diff --git a/src/lib.rs b/src/lib.rs
index 84dfe3527a..ac3c315165 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -49,14 +49,14 @@ extern crate test;
 pub use url::Url;
 pub use client::Client;
 pub use error::{Result, Error};
-pub use http::{Next, Encoder, Decoder, Control, ControlError};
 pub use header::Headers;
+pub use http::{Next, Encoder, Decoder, Control, ControlError};
 pub use method::Method::{self, Get, Head, Post, Delete};
+pub use net::{HttpStream, Transport};
 pub use status::StatusCode::{self, Ok, BadRequest, NotFound};
 pub use server::Server;
 pub use uri::RequestUri;
 pub use version::HttpVersion;
-pub use language_tags::LanguageTag;
 
 macro_rules! rotor_try {
     ($e:expr) => ({
diff --git a/src/server/mod.rs b/src/server/mod.rs
index 49af79e730..710af91e94 100644
--- a/src/server/mod.rs
+++ b/src/server/mod.rs
@@ -15,7 +15,9 @@ pub use self::request::Request;
 pub use self::response::Response;
 
 use http::{self, Next};
-use net::{Accept, HttpListener, HttpsListener, SslServer, Transport};
+
+pub use net::{Accept, HttpListener, HttpsListener};
+use net::{SslServer, Transport};
 
 
 mod request;