about summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-04-18 23:06:08 +0000
committerbors <bors@rust-lang.org>2020-04-18 23:06:08 +0000
commit8001b96f48d2c9cd646acd2d16f4e06078f258e1 (patch)
treebd9f95bbb95f86af5bbcc37ed489947b5a19da87 /src/liballoc
parent52fa23add6fb0776b32cc591ac928618391bdf41 (diff)
parentf6fb931d4f7ea3fae270e16d29a16bca09b17b7d (diff)
downloadrust-8001b96f48d2c9cd646acd2d16f4e06078f258e1.tar.gz
rust-8001b96f48d2c9cd646acd2d16f4e06078f258e1.zip
Auto merge of #71306 - Dylan-DPC:rollup-kvzc1da, r=Dylan-DPC
Rollup of 5 pull requests

Successful merges:

 - #71271 (Move `MapInPlace` to rustc_data_structures)
 - #71276 (miri-unleashed: test that we detect heap allocations)
 - #71283 (Minor improvements to -Zprofile)
 - #71287 (Explain why we shouldn't add inline attr to into_vec)
 - #71303 (remove build warnings)

Failed merges:

r? @ghost
Diffstat (limited to 'src/liballoc')
-rw-r--r--src/liballoc/slice.rs3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/liballoc/slice.rs b/src/liballoc/slice.rs
index c13e90a3d70..53477288b59 100644
--- a/src/liballoc/slice.rs
+++ b/src/liballoc/slice.rs
@@ -140,6 +140,9 @@ mod hack {
     use crate::string::ToString;
     use crate::vec::Vec;
 
+    // We shouldn't add inline attribute to this since this is used in
+    // `vec!` macro mostly and causes perf regression. See #71204 for
+    // discussion and perf results.
     pub fn into_vec<T>(b: Box<[T]>) -> Vec<T> {
         unsafe {
             let len = b.len();