move applicable copy_from_slice to copy_within

This commit is contained in:
Henry Schimke
2022-12-30 09:00:53 -06:00
parent 4f7478245a
commit a345a27b78
6 changed files with 13 additions and 13 deletions

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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);

View File

@@ -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;