From ce338046c8b40e3284707d2ab725e9f076592959 Mon Sep 17 00:00:00 2001 From: Lukas Kalbertodt Date: Sun, 19 Jul 2020 13:45:51 +0200 Subject: Fix panic message when `RangeFrom` index is out of bounds Before, the `Range` method was called with `end = slice.len()`. Unfortunately, because `Range::index` first checks the order of the indices (start has to be smaller than end), an out of bounds index leads to `core::slice::slice_index_order_fail` being called. This prints the message 'slice index starts at 27 but ends at 10', which is worse than 'index 27 out of range for slice of length 10'. This is not only useful to normal users reading panic messages, but also for people inspecting assembly and being confused by `slice_index_order_fail` calls. --- src/libcore/tests/slice.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/libcore/tests') diff --git a/src/libcore/tests/slice.rs b/src/libcore/tests/slice.rs index fba73be92be..8e240832c13 100644 --- a/src/libcore/tests/slice.rs +++ b/src/libcore/tests/slice.rs @@ -1088,7 +1088,7 @@ mod slice_index { good: data[6..] == []; bad: data[7..]; - message: "but ends at"; // perhaps not ideal + message: "out of range"; } in mod rangeto_len { -- cgit 1.4.1-3-g733a5