about summary refs log tree commit diff
path: root/src/test/ui/array-slice-vec
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-03-31 22:28:18 +0000
committerbors <bors@rust-lang.org>2020-03-31 22:28:18 +0000
commit58dd1ce8383aaebcad9b6027b89a316fd868b35c (patch)
tree21ba3ae00a56b802477ae80fbbeec3187dfe1c5f /src/test/ui/array-slice-vec
parenta5b09d35473615e7142f5570f5c5fad0caf68bd2 (diff)
parent8310320ebd68d5f23ad21bb5a15326abeaf91dff (diff)
downloadrust-58dd1ce8383aaebcad9b6027b89a316fd868b35c.tar.gz
rust-58dd1ce8383aaebcad9b6027b89a316fd868b35c.zip
Auto merge of #70638 - Dylan-DPC:rollup-2tgfxjt, r=Dylan-DPC
Rollup of 6 pull requests

Successful merges:

 - #68770 (BTreeMap/BTreeSet: implement drain_filter )
 - #70081 (add `unused_braces` lint)
 - #70556 (parse_and_disallow_postfix_after_cast: account for `ExprKind::Err`.)
 - #70605 (Add missing -lmsvcrt on mingw after -lpthread)
 - #70630 (Update books.)
 - #70632 (expand vec![] to Vec::new())

Failed merges:

r? @ghost
Diffstat (limited to 'src/test/ui/array-slice-vec')
-rw-r--r--src/test/ui/array-slice-vec/vec-fixed-length.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/ui/array-slice-vec/vec-fixed-length.rs b/src/test/ui/array-slice-vec/vec-fixed-length.rs
index 5db02ee066b..908c39c7951 100644
--- a/src/test/ui/array-slice-vec/vec-fixed-length.rs
+++ b/src/test/ui/array-slice-vec/vec-fixed-length.rs
@@ -9,7 +9,7 @@ fn test_big_vec() {}
 #[cfg(target_pointer_width = "64")]
 fn test_big_vec()
 {
-    assert_eq!(size_of::<[u8; (1 << 32)]>(), (1 << 32));
+    assert_eq!(size_of::<[u8; 1 << 32]>(), (1 << 32));
 }
 
 fn main() {