remove/tweak some no-panic code

rust-lang/rust#99223 fixes the bounds check in
split_mut and splitn_mut, so no need to carry those custom
implementations anymore.

Also tweak some of the bounds checking code in the target.xml handler,
since it re-introduced a bounds check in newer rustc versions...

Author: daniel5151

src/protocol/commands.rs

@@ -12,7 +12,6 @@ pub(self) mod prelude {
     pub use crate::protocol::commands::ParseCommand;
     pub use crate::protocol::common::hex::{decode_hex, decode_hex_buf};
     pub use crate::protocol::packet::PacketBuf;
-    pub use crate::util::no_panic_iter::SliceExt;
 }
 
 pub trait ParseCommand<'a>: Sized {

src/protocol/commands/_m.rs

@@ -32,7 +32,7 @@ impl<'a> ParseCommand<'a> for m<'a> {
         let (buf, body_range) = buf.into_raw_buf();
         let body = buf.get_mut(body_range.start..body_range.end)?;
 
-        let mut body = body.split_mut_no_panic(|b| *b == b',');
+        let mut body = body.split_mut(|b| *b == b',');
 
         let addr = decode_hex_buf(body.next()?).ok()?;
         let addr_len = addr.len();

src/protocol/commands/_m_upcase.rs

@@ -12,7 +12,7 @@ impl<'a> ParseCommand<'a> for M<'a> {
     fn from_packet(buf: PacketBuf<'a>) -> Option<Self> {
         let body = buf.into_body();
 
-        let mut body = body.split_mut_no_panic(|&b| b == b',' || b == b':');
+        let mut body = body.split_mut(|&b| b == b',' || b == b':');
         let addr = decode_hex_buf(body.next()?).ok()?;
         let len = decode_hex(body.next()?).ok()?;
         let val = decode_hex_buf(body.next()?).ok()?;

src/protocol/commands/_vFile_open.rs

@@ -19,7 +19,7 @@ impl<'a> ParseCommand<'a> for vFileOpen<'a> {
 
         match body {
             [b':', body @ ..] => {
-                let mut body = body.splitn_mut_no_panic(3, |b| *b == b',');
+                let mut body = body.splitn_mut(3, |b| *b == b',');
                 let filename = decode_hex_buf(body.next()?).ok()?;
                 let flags = HostIoOpenFlags::from_bits(decode_hex(body.next()?).ok()?)?;
                 let mode = HostIoOpenMode::from_bits(decode_hex(body.next()?).ok()?)?;

src/protocol/commands/_vFile_pread.rs

@@ -21,7 +21,7 @@ impl<'a> ParseCommand<'a> for vFilePread<'a> {
 
         match body {
             [b':', body @ ..] => {
-                let mut body = body.splitn_mut_no_panic(3, |b| *b == b',');
+                let mut body = body.splitn_mut(3, |b| *b == b',');
                 let fd = decode_hex(body.next()?).ok()?;
                 let count = decode_hex(body.next()?).ok()?;
                 let offset = decode_hex(body.next()?).ok()?;

src/protocol/commands/_vFile_pwrite.rs

@@ -19,7 +19,7 @@ impl<'a> ParseCommand<'a> for vFilePwrite<'a> {
 
         match body {
             [b':', body @ ..] => {
-                let mut body = body.splitn_mut_no_panic(3, |b| *b == b',');
+                let mut body = body.splitn_mut(3, |b| *b == b',');
                 let fd = decode_hex(body.next()?).ok()?;
                 let offset = decode_hex_buf(body.next()?).ok()?;
                 let data = decode_bin_buf(body.next()?).ok()?;

src/protocol/commands/_vRun.rs

@@ -13,7 +13,7 @@ impl<'a> ParseCommand<'a> for vRun<'a> {
     fn from_packet(buf: PacketBuf<'a>) -> Option<Self> {
         let body = buf.into_body();
 
-        let mut body = body.splitn_mut_no_panic(3, |b| *b == b';');
+        let mut body = body.splitn_mut(3, |b| *b == b';');
 
         let _first_semi = body.next()?;
         let filename = match decode_hex_buf(body.next()?).ok()? {

src/protocol/commands/_x_upcase.rs

@@ -14,7 +14,7 @@ impl<'a> ParseCommand<'a> for X<'a> {
     fn from_packet(buf: PacketBuf<'a>) -> Option<Self> {
         let body = buf.into_body();
 
-        let mut body = body.split_mut_no_panic(|&b| b == b',' || b == b':');
+        let mut body = body.split_mut(|&b| b == b',' || b == b':');
         let addr = decode_hex_buf(body.next()?).ok()?;
         let len = decode_hex(body.next()?).ok()?;
         let val = decode_bin_buf(body.next()?).ok()?;

src/protocol/commands/breakpoint.rs

@@ -1,5 +1,4 @@
 use crate::protocol::common::hex::{decode_hex, decode_hex_buf};
-use crate::util::no_panic_iter::SliceExt;
 
 // Breakpoint packets are split up like this:
 //
@@ -24,7 +23,7 @@ pub struct BasicBreakpoint<'a> {
 
 impl<'a> BasicBreakpoint<'a> {
     pub fn from_slice(body: &'a mut [u8]) -> Option<BasicBreakpoint<'a>> {
-        let mut body = body.splitn_mut_no_panic(4, |b| matches!(*b, b',' | b';'));
+        let mut body = body.splitn_mut(4, |b| matches!(*b, b',' | b';'));
         let type_ = decode_hex(body.next()?).ok()?;
         let addr = decode_hex_buf(body.next()?).ok()?;
         let kind = decode_hex_buf(body.next()?).ok()?;
@@ -42,7 +41,7 @@ pub struct BytecodeBreakpoint<'a> {
 
 impl<'a> BytecodeBreakpoint<'a> {
     pub fn from_slice(body: &'a mut [u8]) -> Option<BytecodeBreakpoint<'a>> {
-        let mut body = body.splitn_mut_no_panic(2, |b| *b == b';');
+        let mut body = body.splitn_mut(2, |b| *b == b';');
 
         let base = BasicBreakpoint::from_slice(body.next()?)?;
 

src/stub/core_impl/target_xml.rs

@@ -30,12 +30,12 @@ impl<T: Target, C: Connection> GdbStubImpl<T, C> {
                     let xml_len = xml.len();
 
                     let start = xml_len.min(cmd.offset as usize);
-                    let end = xml_len.min(cmd.offset as usize + cmd.length);
+                    let end = xml_len.min((cmd.offset as usize).saturating_add(cmd.length));
 
-                    // LLVM isn't smart enough to realize that `end` will always be greater than
-                    // `start`, and fails to elide the `slice_index_order_fail` check unless we
-                    // include this seemingly useless call to `max`.
-                    let data = &xml[start..end.max(start)];
+                    // LLVM isn't smart enough to realize that `start <= end`, and fails to elide a
+                    // `slice_end_index_len_fail` check unless we include this seemingly useless
+                    // call to `min`.
+                    let data = &xml[start.min(end)..end];
 
                     let n = data.len().min(cmd.buf.len());
                     cmd.buf[..n].copy_from_slice(&data[..n]);