update

Author: 0x676e67

src/redirect.rs

@@ -54,7 +54,7 @@ pub struct Action {
 #[derive(Clone, Debug)]
 pub struct History {
     status: StatusCode,
-    location: Uri,
+    uri: Uri,
     previous: Uri,
     headers: HeaderMap,
 }
@@ -239,28 +239,39 @@ impl<'a> Attempt<'a> {
 // ===== impl History =====
 
 impl History {
-    /// Returns the redirection response.
+    /// Get the status code of the redirect response.
     #[inline(always)]
     pub fn status(&self) -> StatusCode {
         self.status
     }
 
-    /// Returns the headers of the redirection response.
+    /// Get the URI of the redirect response.
     #[inline(always)]
-    pub fn headers(&self) -> &HeaderMap {
-        &self.headers
+    pub fn uri(&self) -> &Uri {
+        &self.uri
     }
 
-    /// Returns the destination URI of the redirection.
+    /// Get the previous URI before the redirect response.
     #[inline(always)]
-    pub fn location(&self) -> &Uri {
-        &self.location
+    pub fn previous(&self) -> &Uri {
+        &self.previous
     }
 
-    /// Returns the URI of the original request.
+    /// Get the headers of the redirect response.
     #[inline(always)]
-    pub fn previous(&self) -> &Uri {
-        &self.previous
+    pub fn headers(&self) -> &HeaderMap {
+        &self.headers
+    }
+}
+
+impl From<&policy::Attempt<'_>> for History {
+    fn from(attempt: &policy::Attempt<'_>) -> Self {
+        Self {
+            status: attempt.status(),
+            uri: attempt.location().clone(),
+            previous: attempt.previous().clone(),
+            headers: attempt.headers().clone(),
+        }
     }
 }
 
@@ -393,12 +404,7 @@ impl policy::Policy<Body, BoxError> for FollowRedirectPolicy {
                 if self.history {
                     self.history_entries
                         .get_or_insert_with(Vec::new)
-                        .push(History {
-                            status: attempt.status(),
-                            location: attempt.location().clone(),
-                            previous: attempt.previous().clone(),
-                            headers: attempt.headers().clone(),
-                        });
+                        .push(History::from(attempt));
                 }
 
                 Ok(policy::Action::Follow)

tests/redirect.rs

@@ -503,13 +503,13 @@ async fn test_redirect_history() {
     let next1 = history.next().unwrap();
     assert_eq!(next1.status(), 302);
     assert_eq!(next1.previous().path(), "/first");
-    assert_eq!(next1.location().path(), "/second");
+    assert_eq!(next1.uri().path(), "/second");
     assert_eq!(next1.headers()["location"], "/second");
 
     let next2 = history.next().unwrap();
     assert_eq!(next2.status(), 302);
     assert_eq!(next2.previous().path(), "/second");
-    assert_eq!(next2.location().path(), "/dst");
+    assert_eq!(next2.uri().path(), "/dst");
     assert_eq!(next2.headers()["location"], "/dst");
 
     assert!(history.next().is_none());