Rename Request::uri to Request::url

Author: yoshuawuyts

src/fs/serve_dir.rs

@@ -22,7 +22,7 @@ impl ServeDir {
 
 impl<State> Endpoint<State> for ServeDir {
     fn call<'a>(&'a self, req: Request<State>) -> BoxFuture<'a, Result> {
-        let path = req.uri().path();
+        let path = req.url().path();
         let path = path.trim_start_matches(&self.prefix);
         let path = path.trim_start_matches('/');
         let mut file_path = self.dir.clone();

src/log/middleware.rs

@@ -30,7 +30,7 @@ impl LogMiddleware {
         ctx: Request<State>,
         next: Next<'a, State>,
     ) -> crate::Result {
-        let path = ctx.uri().path().to_owned();
+        let path = ctx.url().path().to_owned();
         let method = ctx.method().to_string();
         log::info!("<-- Request received", {
             method: method,

src/request.rs

@@ -29,6 +29,7 @@ pub struct Request<State> {
 }
 
 impl<State> Request<State> {
+    /// Create a new `Request`.
     pub(crate) fn new(
         state: Arc<State>,
         req: http_types::Request,
@@ -77,15 +78,15 @@ impl<State> Request<State> {
     ///
     /// let mut app = tide::new();
     /// app.at("/").get(|req: Request<()>| async move {
-    ///     assert_eq!(req.uri(), &"/".parse::<tide::http::Url>().unwrap());
+    ///     assert_eq!(req.url(), &"/".parse::<tide::http::Url>().unwrap());
     ///     Ok("")
     /// });
     /// app.listen("127.0.0.1:8080").await?;
     /// #
     /// # Ok(()) })}
     /// ```
     #[must_use]
-    pub fn uri(&self) -> &Url {
+    pub fn url(&self) -> &Url {
         self.req.url()
     }
 
@@ -269,7 +270,7 @@ impl<State> Request<State> {
         // Default to an empty query string if no query parameter has been specified.
         // This allows successful deserialisation of structs where all fields are optional
         // when none of those fields has actually been passed by the caller.
-        let query = self.uri().query().unwrap_or("");
+        let query = self.url().query().unwrap_or("");
         serde_qs::from_str(query).map_err(|e| {
             // Return the displayable version of the deserialisation error to the caller
             // for easier debugging.

tests/nested.rs

@@ -34,7 +34,7 @@ async fn nested() {
 
 #[async_std::test]
 async fn nested_middleware() {
-    let echo_path = |req: tide::Request<()>| async move { Ok(req.uri().path().to_string()) };
+    let echo_path = |req: tide::Request<()>| async move { Ok(req.url().path().to_string()) };
 
     #[derive(Debug, Clone, Default)]
     pub struct TestMiddleware;

tests/route_middleware.rs

@@ -30,7 +30,7 @@ impl<State: Send + Sync + 'static> Middleware<State> for TestMiddleware {
 }
 
 async fn echo_path<State>(req: tide::Request<State>) -> tide::Result<String> {
-    Ok(req.uri().path().to_string())
+    Ok(req.url().path().to_string())
 }
 
 #[async_std::test]