feat(uri): redesign RequestUri type into Uri
Closes #1000 BREAKING CHANGE: The name of `RequestUri` has changed to `Uri`. It is no longer an `enum`, but an opaque struct with getter methods.
This commit is contained in:
committed by
Sean McArthur
parent
1868f8548d
commit
9036443e6b
@@ -574,6 +574,7 @@ mod tests {
|
||||
use mock::AsyncIo;
|
||||
|
||||
use super::{Conn, Writing};
|
||||
use ::uri::Uri;
|
||||
|
||||
#[test]
|
||||
fn test_conn_init_read() {
|
||||
@@ -585,10 +586,7 @@ mod tests {
|
||||
match conn.poll().unwrap() {
|
||||
Async::Ready(Some(Frame::Message { message, body: false })) => {
|
||||
assert_eq!(message, MessageHead {
|
||||
subject: ::http::RequestLine(::Get, ::RequestUri::AbsolutePath {
|
||||
path: "/".to_string(),
|
||||
query: None,
|
||||
}),
|
||||
subject: ::http::RequestLine(::Get, Uri::new("/").unwrap()),
|
||||
.. MessageHead::default()
|
||||
})
|
||||
},
|
||||
|
||||
@@ -6,7 +6,7 @@ use header::{Connection, ConnectionOption};
|
||||
use header::Headers;
|
||||
use method::Method;
|
||||
use status::StatusCode;
|
||||
use uri::RequestUri;
|
||||
use uri::Uri;
|
||||
use version::HttpVersion;
|
||||
use version::HttpVersion::{Http10, Http11};
|
||||
|
||||
@@ -51,7 +51,7 @@ pub struct MessageHead<S> {
|
||||
pub type RequestHead = MessageHead<RequestLine>;
|
||||
|
||||
#[derive(Debug, Default, PartialEq)]
|
||||
pub struct RequestLine(pub Method, pub RequestUri);
|
||||
pub struct RequestLine(pub Method, pub Uri);
|
||||
|
||||
impl fmt::Display for RequestLine {
|
||||
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
||||
|
||||
Reference in New Issue
Block a user