Merge pull request #2119 from rust-lang/Nemo157/gen-size-change

Update expected size of `select_on_non_unpin_size`
rust-lang · Apr 15, 2020 · 6ba6716 · 6ba6716
2 parents 2f8943d + e679f3b
commit 6ba6716
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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

diff --git 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"))]