From a345a27b78b64ac6597ce87714c631a343537857 Mon Sep 17 00:00:00 2001 From: Henry Schimke Date: Fri, 30 Dec 2022 09:00:53 -0600 Subject: [PATCH] move applicable copy_from_slice to copy_within --- src/oned/code_128_reader.rs | 4 ++-- src/oned/code_93_reader.rs | 4 ++-- src/oned/itf_reader.rs | 4 ++-- src/oned/rss/expanded/rss_expanded_reader.rs | 4 ++-- src/oned/rss/rss_14_reader.rs | 6 +++--- src/oned/upc_ean_reader.rs | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/oned/code_128_reader.rs b/src/oned/code_128_reader.rs index 003375d..e30ed88 100644 --- a/src/oned/code_128_reader.rs +++ b/src/oned/code_128_reader.rs @@ -405,8 +405,8 @@ impl Code128Reader { return Ok([patternStart, i, bestMatch as usize]); } patternStart += (counters[0] + counters[1]) as usize; - let slc = &counters[2..(counterPosition - 1 + 2)].to_vec(); - counters[0..(counterPosition - 1)].copy_from_slice(slc); + + counters.copy_within(2..(counterPosition - 1 + 2), 0); // System.arraycopy(counters, 2, counters, 0, counterPosition - 1); counters[counterPosition - 1] = 0; counters[counterPosition] = 0; diff --git a/src/oned/code_93_reader.rs b/src/oned/code_93_reader.rs index 3de8c74..e66e11c 100644 --- a/src/oned/code_93_reader.rs +++ b/src/oned/code_93_reader.rs @@ -171,8 +171,8 @@ impl Code93Reader { return Ok([patternStart, i]); } patternStart += (theCounters[0] + theCounters[1]) as usize; - let slc = &theCounters[2..(counterPosition - 1 + 2)].to_vec(); - theCounters[0..(counterPosition - 1)].copy_from_slice(slc); + + theCounters.copy_within(2..(counterPosition - 1 + 2), 0); // System.arraycopy(theCounters, 2, theCounters, 0, counterPosition - 1); theCounters[counterPosition - 1] = 0; theCounters[counterPosition] = 0; diff --git a/src/oned/itf_reader.rs b/src/oned/itf_reader.rs index 4f375d7..ec30bab 100644 --- a/src/oned/itf_reader.rs +++ b/src/oned/itf_reader.rs @@ -384,8 +384,8 @@ impl ITFReader { return Ok([patternStart, x]); } patternStart += (counters[0] + counters[1]) as usize; - let slc = &counters[2..(counterPosition - 1 + 2)].to_vec(); - counters[..(counterPosition - 1)].copy_from_slice(slc); + + counters.copy_within(2..(counterPosition - 1 + 2), 0); // System.arraycopy(counters, 2, counters, 0, counterPosition - 1); counters[counterPosition - 1] = 0; counters[counterPosition] = 0; diff --git a/src/oned/rss/expanded/rss_expanded_reader.rs b/src/oned/rss/expanded/rss_expanded_reader.rs index 2fac737..8f7661f 100644 --- a/src/oned/rss/expanded/rss_expanded_reader.rs +++ b/src/oned/rss/expanded/rss_expanded_reader.rs @@ -803,8 +803,8 @@ impl RSSExpandedReader { // Make 'counters' hold 1-4 let mut counters = self.decodeFinderCounters; - let slc = counters[..counters.len() - 1].to_vec(); - counters[1..].copy_from_slice(&slc); + let counters_len = counters.len(); + counters.copy_within(..counters_len - 1, 1); // System.arraycopy(counters, 0, counters, 1, counters.length - 1); counters[0] = firstCounter as u32; diff --git a/src/oned/rss/rss_14_reader.rs b/src/oned/rss/rss_14_reader.rs index d613b61..6baa7e7 100644 --- a/src/oned/rss/rss_14_reader.rs +++ b/src/oned/rss/rss_14_reader.rs @@ -464,10 +464,10 @@ impl RSS14Reader { } firstElementStart += 1; let firstCounter = startEnd[0] - firstElementStart as usize; - let mut counters = &mut self.decodeFinderCounters; + let counters = &mut self.decodeFinderCounters; let counter_len = counters.len(); - let slc = counters[0..counter_len - 1].to_vec(); - counters[1..counter_len].copy_from_slice(&slc); + + counters.copy_within(..counter_len - 1, 1); // Make 'counters' hold 1-4 // let counters = self.getDecodeFinderCounters(); // System.arraycopy(counters, 0, counters, 1, counters.length - 1); diff --git a/src/oned/upc_ean_reader.rs b/src/oned/upc_ean_reader.rs index 1a5cd42..4ca58dc 100644 --- a/src/oned/upc_ean_reader.rs +++ b/src/oned/upc_ean_reader.rs @@ -442,8 +442,8 @@ pub trait UPCEANReader: OneDReader { return Ok([patternStart, x]); } patternStart += (counters[0] + counters[1]) as usize; - let slc = &counters[2..(counterPosition - 1 + 2)].to_vec(); - counters[..(counterPosition - 1)].copy_from_slice(slc); + + counters.copy_within(2..(counterPosition - 1 + 2), 0); // System.arraycopy(counters, 2, counters, 0, counterPosition - 1); counters[counterPosition - 1] = 0; counters[counterPosition] = 0;