From ae8926557439e1fc95863ee2fcb21052a32b3a46 Mon Sep 17 00:00:00 2001 From: real Date: Wed, 19 Jun 2019 16:54:29 +0300 Subject: [PATCH 1/4] Workaround for issue #278: works around Rust internal compiler error. --- tide-cookies/src/middleware.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tide-cookies/src/middleware.rs b/tide-cookies/src/middleware.rs index 41c3e10db..5778d7cd8 100644 --- a/tide-cookies/src/middleware.rs +++ b/tide-cookies/src/middleware.rs @@ -44,7 +44,7 @@ impl Middleware for CookiesMiddleware { let cookie_jar = cookie_data.content.clone(); - cx.extensions_mut().insert(cookie_data); + let _ = cx.extensions_mut().insert(cookie_data); let mut res = next.run(cx).await; let headers = res.headers_mut(); for cookie in cookie_jar.read().unwrap().delta() { From f0d667dde5bbe48e0f1930d1499382c284b2fcc5 Mon Sep 17 00:00:00 2001 From: real Date: Fri, 21 Jun 2019 14:28:55 +0300 Subject: [PATCH 2/4] Added a comment explaining the workaround for solving issue 278. --- tide-cookies/src/middleware.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tide-cookies/src/middleware.rs b/tide-cookies/src/middleware.rs index 5778d7cd8..f2e52afc2 100644 --- a/tide-cookies/src/middleware.rs +++ b/tide-cookies/src/middleware.rs @@ -44,6 +44,9 @@ impl Middleware for CookiesMiddleware { let cookie_jar = cookie_data.content.clone(); + + // The `let _ = ...` is a workaround for issue: https://github.com/rustasync/tide/issues/278 + // Solution is according to suggestion in https://github.com/rust-lang/rust/issues/61579#issuecomment-500436524 let _ = cx.extensions_mut().insert(cookie_data); let mut res = next.run(cx).await; let headers = res.headers_mut(); From 1505f91871febfa7ffd469462e107968862d7fab Mon Sep 17 00:00:00 2001 From: real Date: Fri, 21 Jun 2019 14:29:19 +0300 Subject: [PATCH 3/4] Bumped rust version in .travis.yml to nightly-2019-06-02. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5a15187c4..cb734fa3c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: rust -rust: nightly-2019-05-09 +rust: nightly-2019-06-02 cache: cargo before_script: From 4bc805bc559f17200e2e23e02c9f6b62895468ee Mon Sep 17 00:00:00 2001 From: real Date: Fri, 21 Jun 2019 18:44:46 +0300 Subject: [PATCH 4/4] cargo fmt --- tide-cookies/src/middleware.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/tide-cookies/src/middleware.rs b/tide-cookies/src/middleware.rs index f2e52afc2..4d6b85aee 100644 --- a/tide-cookies/src/middleware.rs +++ b/tide-cookies/src/middleware.rs @@ -44,7 +44,6 @@ impl Middleware for CookiesMiddleware { let cookie_jar = cookie_data.content.clone(); - // The `let _ = ...` is a workaround for issue: https://github.com/rustasync/tide/issues/278 // Solution is according to suggestion in https://github.com/rust-lang/rust/issues/61579#issuecomment-500436524 let _ = cx.extensions_mut().insert(cookie_data);