Skip to content

Commit 09a1afc

Browse files
committed
cargo fmt
1 parent 7ea5d17 commit 09a1afc

File tree

1 file changed

+36
-20
lines changed

1 file changed

+36
-20
lines changed

src/lib.rs

Lines changed: 36 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
extern crate semver;
21
extern crate conduit;
2+
extern crate semver;
33

44
use std::collections::HashMap;
55
use std::io::prelude::*;
66
use std::io::Cursor;
7-
use std::net::{SocketAddr, Ipv4Addr, SocketAddrV4};
7+
use std::net::{Ipv4Addr, SocketAddr, SocketAddrV4};
88

9+
use conduit::{Extensions, Headers, Host, Method, Scheme, TypeMap};
910
use semver::Version;
10-
use conduit::{Method, Scheme, Host, Extensions, Headers, TypeMap};
1111

1212
pub struct MockRequest {
1313
path: String,
@@ -17,7 +17,7 @@ pub struct MockRequest {
1717
build_headers: HashMap<String, String>,
1818
headers: MockHeaders,
1919
extensions: TypeMap,
20-
reader: Option<Cursor<Vec<u8>>>
20+
reader: Option<Cursor<Vec<u8>>>,
2121
}
2222

2323
impl MockRequest {
@@ -30,9 +30,11 @@ impl MockRequest {
3030
query_string: None,
3131
body: None,
3232
build_headers: headers,
33-
headers: MockHeaders { headers: HashMap::new() },
33+
headers: MockHeaders {
34+
headers: HashMap::new(),
35+
},
3436
method: method,
35-
reader: None
37+
reader: None,
3638
}
3739
}
3840

@@ -58,16 +60,19 @@ impl MockRequest {
5860
}
5961

6062
pub fn header(&mut self, name: &str, value: &str) -> &mut MockRequest {
61-
self.build_headers.insert(name.to_string(), value.to_string());
62-
let headers = MockHeaders { headers: self.build_headers.clone() };
63+
self.build_headers
64+
.insert(name.to_string(), value.to_string());
65+
let headers = MockHeaders {
66+
headers: self.build_headers.clone(),
67+
};
6368
self.headers = headers;
6469

6570
self
6671
}
6772
}
6873

6974
pub struct MockHeaders {
70-
headers: HashMap<String, String>
75+
headers: HashMap<String, String>,
7176
}
7277

7378
impl Headers for MockHeaders {
@@ -80,8 +85,10 @@ impl Headers for MockHeaders {
8085
}
8186

8287
fn all(&self) -> Vec<(&str, Vec<&str>)> {
83-
self.headers.iter().map(|(k,v)| (&k[..], vec![&v[..]]))
84-
.collect()
88+
self.headers
89+
.iter()
90+
.map(|(k, v)| (&k[..], vec![&v[..]]))
91+
.collect()
8592
}
8693
}
8794

@@ -94,10 +101,18 @@ impl conduit::Request for MockRequest {
94101
Version::parse("0.1.0").unwrap()
95102
}
96103

97-
fn method(&self) -> Method { self.method.clone() }
98-
fn scheme(&self) -> Scheme { Scheme::Http }
99-
fn host(&self) -> Host { Host::Name("example.com") }
100-
fn virtual_root(&self) -> Option<&str> { None }
104+
fn method(&self) -> Method {
105+
self.method.clone()
106+
}
107+
fn scheme(&self) -> Scheme {
108+
Scheme::Http
109+
}
110+
fn host(&self) -> Host {
111+
Host::Name("example.com")
112+
}
113+
fn virtual_root(&self) -> Option<&str> {
114+
None
115+
}
101116

102117
fn path(&self) -> &str {
103118
&self.path
@@ -140,9 +155,9 @@ mod tests {
140155
use super::MockRequest;
141156
use semver::Version;
142157

143-
use std::net::{SocketAddr, SocketAddrV4, Ipv4Addr};
158+
use std::net::{Ipv4Addr, SocketAddr, SocketAddrV4};
144159

145-
use conduit::{Request, Method, Host, Scheme};
160+
use conduit::{Host, Method, Request, Scheme};
146161

147162
#[test]
148163
fn simple_request_test() {
@@ -156,9 +171,10 @@ mod tests {
156171
assert_eq!(req.virtual_root(), None);
157172
assert_eq!(req.path(), "/");
158173
assert_eq!(req.query_string(), None);
159-
assert_eq!(req.remote_addr(),
160-
SocketAddr::V4(SocketAddrV4::new(Ipv4Addr::new(127, 0, 0, 1),
161-
80)));
174+
assert_eq!(
175+
req.remote_addr(),
176+
SocketAddr::V4(SocketAddrV4::new(Ipv4Addr::new(127, 0, 0, 1), 80))
177+
);
162178
assert_eq!(req.content_length(), None);
163179
assert_eq!(req.headers().all().len(), 0);
164180
let mut s = String::new();

0 commit comments

Comments
 (0)