bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Put panic code path from copy_from_slice into cold function

Browse source 
The previous `assert_eq` generated quite some code, which is especially
problematic when this call is inlined. This commit also slightly
improves the panic message from:

  assertion failed: `(left == right)`
    left: `3`,
   right: `2`: destination and source slices have different lengths

...to:

  source slice length (2) does not match destination slice length (3)
This commit is contained in:
Lukas Kalbertodt 2020-07-19 14:04:30 +02:00
parent 3df25ae186
commit db99f98c3e
No known key found for this signature in database
GPG key ID: AA5025CF1CC85754
2 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
library/alloc/tests/slice.rs
View file

@ -1522,7 +1522,7 @@ fn test_copy_from_slice() {
}
#[test]
#[should_panic(expected = "destination and source slices have different lengths")]
#[should_panic(expected = "source slice length (4) does not match destination slice length (5)")]
fn test_copy_from_slice_dst_longer() {
let src = [0, 1, 2, 3];
let mut dst = [0; 5];
@ -1530,7 +1530,7 @@ fn test_copy_from_slice_dst_longer() {
}
#[test]
#[should_panic(expected = "destination and source slices have different lengths")]
#[should_panic(expected = "source slice length (4) does not match destination slice length (3)")]
fn test_copy_from_slice_dst_shorter() {
let src = [0, 1, 2, 3];
let mut dst = [0; 3];