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

Nemo157 · web-flow · commit 6ba671600211 · 2020-04-15T10:38:17.000+02:00
Update expected size of `select_on_non_unpin_size`
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"))]

Original file line number	Diff line number	Diff line change
`@@ -284,7 +284,7 @@ fn select_on_non_unpin_size() {`
`284`	`284`	`select_res`
`285`	`285`	`};`
`286`	`286`
`287`		`- assert_eq!(48, std::mem::size_of_val(&fut));`
	`287`	`+ assert_eq!(32, std::mem::size_of_val(&fut));`
`288`	`288`	`}`
`289`	`289`
`290`	`290`	`#[cfg(all(feature = "async-await", feature = "std", feature = "executor"))]`