Skip to content

Remove unnecessary clones #243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
FranciscoTGouveia wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove unnecessary clones #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/tables/glyf.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -683,7 +683,7 @@ impl<'a> Table<'a> {
} else if number_of_contours < 0 {
// Composite glyph.
let components = CompositeGlyphIter::new(s.tail()?);
Some(components.clone().count() as u16)
Some(components.count() as u16)
} else {
// An empty glyph.
None
Expand Down
22 changes: 11 additions & 11 deletions src/tables/gvar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ fn parse_variation_tuples<'a>(
let point_numbers = if header.has_private_point_numbers {
PackedPointsIter::new(&mut serialized_s)?
} else {
shared_point_numbers.clone()
shared_point_numbers
};

// TODO: this
Expand All @@ -305,8 +305,8 @@ fn parse_variation_tuples<'a>(
// associated with that point number. All of these deltas must be applied
// cumulatively to the given point.

let deltas_count = if let Some(point_numbers) = point_numbers.clone() {
u16::try_from(point_numbers.clone().count()).ok()?
let deltas_count = if let Some(point_numbers) = point_numbers {
u16::try_from(point_numbers.count()).ok()?
} else {
points_len
};
Expand Down Expand Up @@ -597,7 +597,7 @@ mod packed_points {

#[inline]
pub fn restart(self) -> Self {
let mut iter = self.iter.clone();
let mut iter = self.iter;
iter.offset = 0;
iter.state = State::Control;
iter.points_left = 0;
Expand Down Expand Up @@ -1473,8 +1473,8 @@ fn infer_deltas(
} else {
// If not, find the last point with delta in the current contour.
let mut last_point = None;
let mut deltas = tuple.deltas.clone();
for (point, is_set) in points.clone().zip(points_set.clone()) {
let mut deltas = tuple.deltas;
for (point, is_set) in points.clone().zip(points_set) {
if is_set {
if let Some((x_delta, y_delta)) = deltas.next() {
last_point = Some(PointAndDelta {
Expand Down Expand Up @@ -1502,8 +1502,8 @@ fn infer_deltas(
if !curr_point.last_point {
// If the current point is not the last one in the contour,
// find the first set delta in the current contour.
let mut deltas = tuple.deltas.clone();
for (point, is_set) in points.clone().zip(points_set.clone()) {
let mut deltas = tuple.deltas;
for (point, is_set) in points.clone().zip(points_set) {
if is_set {
if let Some((x_delta, y_delta)) = deltas.next() {
next_point = Some(PointAndDelta {
Expand Down Expand Up @@ -1532,9 +1532,9 @@ fn infer_deltas(
// doesn't allow implementing a reverse iterator.
// So we have to parse everything once again.

let mut all_points = all_points.clone();
let mut deltas = tuple.deltas.clone().restart();
let mut points_set = points_set.clone().restart();
let mut all_points = all_points;
let mut deltas = tuple.deltas.restart();
let mut points_set = points_set.restart();

let mut contour = 0;
while let (Some(point), Some(is_set)) = (all_points.next(), points_set.next()) {
Expand Down