tokio-rs/axum
1
0
Fork 0
mirror of https://github.com/tokio-rs/axum.git synced 2026-09-03 00:00:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use new Cargo features to avoid implicit features for optional dependencies (#1239)

Browse Source 
* Fix changelog entry for MSRV change in axum-extra 0.3.5

* Bump MSRV to 1.60 for axum, axum-extra, axum-macros

* Use new Cargo features to avoid implicit features for optional dependencies
This commit is contained in:
Jonas Platte
2022-08-09 18:43:02 +02:00
committed by GitHub
parent d9ef24c5ff
commit 7cbb7cf135
13 changed files with 56 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
axum-extra/src/extract/cookie/mod.rs
+5 -5
View File
@@ -23,10 +23,10 @@ pub use self::private::PrivateCookieJar;
#[cfg(feature = "cookie-signed")]
pub use self::signed::SignedCookieJar;
pub use cookie_lib::{Cookie, Expiration, SameSite};
pub use cookie::{Cookie, Expiration, SameSite};
#[cfg(any(feature = "cookie-signed", feature = "cookie-private"))]
pub use cookie_lib::Key;
pub use cookie::Key;
/// Extractor that grabs cookies from the request and manages the jar.
///
@@ -84,7 +84,7 @@ pub use cookie_lib::Key;
/// ```
#[derive(Debug)]
pub struct CookieJar {
jar: cookie_lib::CookieJar,
jar: cookie::CookieJar,
}
#[async_trait]
@@ -95,7 +95,7 @@ where
type Rejection = Infallible;
async fn from_request(req: &mut RequestParts<B>) -> Result<Self, Self::Rejection> {
let mut jar = cookie_lib::CookieJar::new();
let mut jar = cookie::CookieJar::new();
for cookie in cookies_from_request(req) {
jar.add_original(cookie);
}
@@ -193,7 +193,7 @@ impl IntoResponse for CookieJar {
}
}
fn set_cookies(jar: cookie_lib::CookieJar, headers: &mut HeaderMap) {
fn set_cookies(jar: cookie::CookieJar, headers: &mut HeaderMap) {
for cookie in jar.delta() {
if let Ok(header_value) = cookie.encoded().to_string().parse() {
headers.append(SET_COOKIE, header_value);