From 3fc9310a0e7834b767bfbe42bf7bec555b47432a Mon Sep 17 00:00:00 2001 From: Nemo157 Date: Tue, 7 Apr 2020 10:38:37 +0200 Subject: [PATCH 1/2] Update expected size of `select_on_non_unpin_size` Probably comes from https://github.com/rust-lang/rust/pull/69837 --- futures/tests/async_await_macros.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/futures/tests/async_await_macros.rs b/futures/tests/async_await_macros.rs index a90d844cd3..fd2a3497ec 100644 --- a/futures/tests/async_await_macros.rs +++ b/futures/tests/async_await_macros.rs @@ -284,7 +284,7 @@ fn select_on_non_unpin_size() { select_res }; - assert_eq!(48, std::mem::size_of_val(&fut)); + assert_eq!(32, std::mem::size_of_val(&fut)); } #[cfg(all(feature = "async-await", feature = "std", feature = "executor"))] From e679f3b54329323811401776fab3782f37356653 Mon Sep 17 00:00:00 2001 From: Nemo157 Date: Wed, 15 Apr 2020 09:44:58 +0200 Subject: [PATCH 2/2] Allow unused_braces in cargo doc test Workaround for https://github.com/rust-lang/rust/issues/70814 --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 93526353b8..96131ab204 100644 --- a/.travis.yml +++ b/.travis.yml @@ -145,7 +145,8 @@ matrix: - name: cargo doc rust: nightly script: - - RUSTDOCFLAGS=-Dwarnings cargo doc --workspace --no-deps --all-features + # TODO: Remove -Aunused_braces once https://github.com/rust-lang/rust/issues/70814 is fixed + - RUSTDOCFLAGS="-Dwarnings -Aunused_braces" cargo doc --workspace --no-deps --all-features script: - cargo test --workspace --all-features