Skip to content

Commit 0800716

Browse files
Remove unneeded re-exports
Remove unneded reexports from crate root Update documentation
1 parent d8cb1e8 commit 0800716

File tree

11 files changed

+19
-27
lines changed

11 files changed

+19
-27
lines changed

src/body.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use std::fmt::{self, Debug};
55
use std::pin::Pin;
66
use std::task::{Context, Poll};
77

8-
use crate::{mime, Mime};
8+
use crate::mime::{self, Mime};
99
use crate::{Status, StatusCode};
1010

1111
pin_project_lite::pin_project! {

src/content/accept.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
use crate::content::{ContentType, MediaTypeProposal};
44
use crate::headers::{HeaderName, HeaderValue, Headers, ToHeaderValues, ACCEPT};
55
use crate::utils::sort_by_weight;
6-
use crate::{Error, Mime, StatusCode};
6+
use crate::{Error, StatusCode};
7+
use crate::mime::Mime;
78

89
use std::fmt::{self, Debug, Write};
910
use std::option;

src/content/content_type.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::{convert::TryInto, str::FromStr};
22

33
use crate::headers::{HeaderName, HeaderValue, Headers, CONTENT_TYPE};
4-
use crate::Mime;
4+
use crate::mime::Mime;
55

66
/// Indicate the media type of a resource's content.
77
///
@@ -18,7 +18,8 @@ use crate::Mime;
1818
/// # fn main() -> http_types::Result<()> {
1919
/// #
2020
/// use http_types::content::ContentType;
21-
/// use http_types::{Response, Mime};
21+
/// use http_types::Response;
22+
/// use http_types::mime::Mime;
2223
/// use std::str::FromStr;
2324
///
2425
/// let content_type = ContentType::new("text/*");

src/content/media_type_proposal.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::ensure;
22
use crate::headers::HeaderValue;
3-
use crate::Mime;
3+
use crate::mime::Mime;
44

55
use std::ops::{Deref, DerefMut};
66
use std::{

src/headers/header_value.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ use std::str::FromStr;
44

55
use crate::headers::HeaderValues;
66
use crate::Error;
7-
use crate::{Cookie, Mime};
7+
use crate::cookies::Cookie;
8+
use crate::mime::Mime;
89

910
/// A header value.
1011
#[derive(Clone, Eq, PartialEq, Hash)]

src/lib.rs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -151,21 +151,9 @@ pub use status::Status;
151151
pub use status_code::StatusCode;
152152
pub use version::Version;
153153

154-
#[doc(inline)]
155-
pub use trailers::Trailers;
156-
157-
#[doc(inline)]
158-
pub use mime::Mime;
159-
160-
#[doc(inline)]
161-
pub use headers::Headers;
162-
163154
#[doc(inline)]
164155
pub use crate::url::Url;
165156

166-
#[doc(inline)]
167-
pub use crate::cookies::Cookie;
168-
169157
pub mod security;
170158
pub mod trailers;
171159

src/mime/constants.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use super::ParamKind;
2-
use crate::Mime;
2+
use crate::mime::Mime;
33

44
macro_rules! utf8_mime_const {
55
($name:ident, $desc:expr, $base:expr, $sub:expr) => {

src/mime/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ use infer::Infer;
1919
/// An IANA media type.
2020
///
2121
/// ```
22-
/// use http_types::Mime;
22+
/// use http_types::mime::Mime;
2323
/// use std::str::FromStr;
2424
///
2525
/// let mime = Mime::from_str("text/html;charset=utf-8").unwrap();

src/security/csp.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::Headers;
1+
use crate::headers::Headers;
22
use serde::{Deserialize, Serialize};
33
use std::collections::HashMap;
44
use std::fmt;

src/trace/trace_context.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ mod test {
262262

263263
#[test]
264264
fn default() -> crate::Result<()> {
265-
let mut headers = crate::Headers::new();
265+
let mut headers = crate::headers::Headers::new();
266266
headers.insert(TRACEPARENT, "00-01-deadbeef-00");
267267
let context = TraceContext::from_headers(&mut headers)?.unwrap();
268268
assert_eq!(context.version(), 0);
@@ -285,7 +285,7 @@ mod test {
285285

286286
#[test]
287287
fn not_sampled() -> crate::Result<()> {
288-
let mut headers = crate::Headers::new();
288+
let mut headers = crate::headers::Headers::new();
289289
headers.insert(TRACEPARENT, "00-01-02-00");
290290
let context = TraceContext::from_headers(&mut headers)?.unwrap();
291291
assert_eq!(context.sampled(), false);
@@ -294,7 +294,7 @@ mod test {
294294

295295
#[test]
296296
fn sampled() -> crate::Result<()> {
297-
let mut headers = crate::Headers::new();
297+
let mut headers = crate::headers::Headers::new();
298298
headers.insert(TRACEPARENT, "00-01-02-01");
299299
let context = TraceContext::from_headers(&mut headers)?.unwrap();
300300
assert_eq!(context.sampled(), true);

0 commit comments

Comments
 (0)