about summary refs log tree commit diff
path: root/src/test/codegen
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-08-19 02:56:59 +0000
committerbors <bors@rust-lang.org>2020-08-19 02:56:59 +0000
commitc03c213daf5fe3b52c768b4f145e45d8994d87ea (patch)
treeb488c721612200aa759bec506625cb2d2460ced7 /src/test/codegen
parent1656582822a80139d725e56f00c564f4f58f2883 (diff)
parent7551f3fbbd51391492520a3dc1dcc2f600644eea (diff)
downloadrust-c03c213daf5fe3b52c768b4f145e45d8994d87ea.tar.gz
rust-c03c213daf5fe3b52c768b4f145e45d8994d87ea.zip
Auto merge of #75677 - cuviper:shrink-towel, r=Mark-Simulacrum
Don't panic in Vec::shrink_to_fit

We can help the compiler see that `Vec::shrink_to_fit` will never reach the panic case in `RawVec::shrink_to_fit`, just by guarding the call only for cases where the capacity is strictly greater. A capacity less than the length is only possible through an unsafe call to `set_len`, which would break the `Vec` invariants, so `shrink_to_fit` can just ignore that.

This removes the panicking code from the examples in both #71861 and #75636.
Diffstat (limited to 'src/test/codegen')
-rw-r--r--src/test/codegen/vec-shrink-panic.rs36
1 files changed, 36 insertions, 0 deletions
diff --git a/src/test/codegen/vec-shrink-panic.rs b/src/test/codegen/vec-shrink-panic.rs
new file mode 100644
index 00000000000..690c7e6d6ce
--- /dev/null
+++ b/src/test/codegen/vec-shrink-panic.rs
@@ -0,0 +1,36 @@
+// compile-flags: -O
+// ignore-debug: the debug assertions get in the way
+#![crate_type = "lib"]
+#![feature(shrink_to)]
+
+// Make sure that `Vec::shrink_to_fit` never emits panics via `RawVec::shrink_to_fit`,
+// "Tried to shrink to a larger capacity", because the length is *always* <= capacity.
+
+// CHECK-LABEL: @shrink_to_fit
+#[no_mangle]
+pub fn shrink_to_fit(vec: &mut Vec<u32>) {
+    // CHECK-NOT: panic
+    vec.shrink_to_fit();
+}
+
+// CHECK-LABEL: @issue71861
+#[no_mangle]
+pub fn issue71861(n: usize) -> Box<[u32]> {
+    // CHECK-NOT: panic
+    vec![0; n].into_boxed_slice()
+}
+
+// CHECK-LABEL: @issue75636
+#[no_mangle]
+pub fn issue75636<'a>(iter: &[&'a str]) -> Box<[&'a str]> {
+    // CHECK-NOT: panic
+    iter.iter().copied().collect()
+}
+
+// Sanity-check that we do see a possible panic for an arbitrary `Vec::shrink_to`.
+// CHECK-LABEL: @shrink_to
+#[no_mangle]
+pub fn shrink_to(vec: &mut Vec<u32>) {
+    // CHECK: panic
+    vec.shrink_to(42);
+}