upgrade cookie to 0.18

actix-web/CHANGES.md

@@ -3,6 +3,7 @@
 ## Unreleased
 
 - Minimum supported Rust version (MSRV) is now 1.82.
+- Upgrade cookie dependency 0.16 to 0.18
 
 ## 4.12.1
 

actix-web/Cargo.toml

@@ -141,7 +141,7 @@ actix-web-codegen = { version = "4.3", optional = true, default-features = false
 bytes = "1"
 bytestring = "1"
 cfg-if = "1"
-cookie = { version = "0.16", features = ["percent-encode"], optional = true }
+cookie = { version = "0.18", features = ["percent-encode"], optional = true }
 derive_more = { version = "2", features = ["as_ref", "deref", "deref_mut", "display", "error", "from"] }
 encoding_rs = "0.8"
 foldhash = "0.1"

actix-web/src/response/builder.rs

@@ -228,12 +228,12 @@ impl HttpResponseBuilder {
     ///
     /// let res = HttpResponse::Ok()
     ///     .cookie(
-    ///         Cookie::build("name", "value")
+    ///         Cookie::build(("name", "value"))
     ///             .domain("www.rust-lang.org")
     ///             .path("/")
     ///             .secure(true)
     ///             .http_only(true)
-    ///             .finish(),
+    ///             .build(),
     ///     )
     ///     .finish();
     /// ```
@@ -243,10 +243,10 @@ impl HttpResponseBuilder {
     /// use actix_web::{HttpResponse, cookie::Cookie};
     ///
     /// // the name, domain and path match the cookie created in the previous example
-    /// let mut cookie = Cookie::build("name", "value-does-not-matter")
+    /// let mut cookie = Cookie::build(("name", "value-does-not-matter"))
     ///     .domain("www.rust-lang.org")
     ///     .path("/")
-    ///     .finish();
+    ///     .build();
     /// cookie.make_removal();
     ///
     /// let res = HttpResponse::Ok()

actix-web/tests/test_server.rs

@@ -745,9 +745,9 @@ async fn test_server_cookies() {
         App::new().default_service(web::to(|| async {
             HttpResponse::Ok()
                 .cookie(
-                    Cookie::build("first", "first_value")
+                    Cookie::build(("first", "first_value"))
                         .http_only(true)
-                        .finish(),
+                        .build(),
                 )
                 .cookie(Cookie::new("second", "first_value"))
                 .cookie(Cookie::new("second", "second_value"))
@@ -760,9 +760,9 @@ async fn test_server_cookies() {
     assert!(res.status().is_success());
 
     {
-        let first_cookie = Cookie::build("first", "first_value")
+        let first_cookie = Cookie::build(("first", "first_value"))
             .http_only(true)
-            .finish();
+            .build();
         let second_cookie = Cookie::new("second", "first_value");
 
         let cookies = res.cookies().expect("To have cookies");

awc/CHANGES.md

@@ -3,6 +3,7 @@
 ## Unreleased
 
 - Minimum supported Rust version (MSRV) is now 1.82.
+- Upgrade cookie dependency 0.16 to 0.18
 
 ## 3.8.1
 

awc/Cargo.toml

@@ -123,7 +123,7 @@ serde_json = "1.0"
 serde_urlencoded = "0.7"
 tokio = { version = "1.38.2", features = ["sync"] }
 
-cookie = { version = "0.16", features = ["percent-encode"], optional = true }
+cookie = { version = "0.18", features = ["percent-encode"], optional = true }
 
 tls-openssl = { package = "openssl", version = "0.10.55", optional = true }
 tls-rustls-0_20 = { package = "rustls", version = "0.20", optional = true, features = ["dangerous_configuration"] }

awc/src/test.rs

@@ -108,7 +108,7 @@ mod tests {
         let res = TestResponse::default()
             .version(Version::HTTP_2)
             .insert_header((header::DATE, HttpDate::from(SystemTime::now())))
-            .cookie(cookie::Cookie::build("name", "value").finish())
+            .cookie(cookie::Cookie::build(("name", "value")).build())
             .finish();
         assert!(res.headers().contains_key(header::SET_COOKIE));
         assert!(res.headers().contains_key(header::DATE));

awc/src/ws.rs

@@ -543,7 +543,7 @@ mod tests {
             .protocols(["v1", "v2"])
             .set_header_if_none(header::CONTENT_TYPE, "json")
             .set_header_if_none(header::CONTENT_TYPE, "text")
-            .cookie(Cookie::build("cookie1", "value1").finish());
+            .cookie(Cookie::build(("cookie1", "value1")).build());
         assert_eq!(
             req.origin.as_ref().unwrap().to_str().unwrap(),
             "test-origin"

awc/tests/test_client.rs

@@ -667,13 +667,13 @@ async fn body_streaming_implicit() {
 async fn client_cookie_handling() {
     use std::io::{Error as IoError, ErrorKind};
 
-    let cookie1 = Cookie::build("cookie1", "value1").finish();
-    let cookie2 = Cookie::build("cookie2", "value2")
+    let cookie1 = Cookie::build(("cookie1", "value1")).build();
+    let cookie2 = Cookie::build(("cookie2", "value2"))
         .domain("www.example.org")
         .path("/")
         .secure(true)
         .http_only(true)
-        .finish();
+        .build();
     // Q: are all these clones really necessary? A: Yes, possibly
     let cookie1b = cookie1.clone();
     let cookie2b = cookie2.clone();