forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Auto merge of rust-lang#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 rust-lang#71861 and rust-lang#75636.
- Loading branch information
Showing
2 changed files
with
40 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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); | ||
} |