|
1 | 1 | use crate::repr::{ColumnType, Data};
|
2 |
| -use std::{collections::HashSet, fmt::Debug, isize}; |
| 2 | +use std::{collections::HashSet, fmt::Debug}; |
3 | 3 |
|
4 | 4 | #[derive(Debug, Clone, PartialEq)]
|
5 | 5 | pub struct Point<X = Data, Y = Data> {
|
@@ -224,11 +224,7 @@ impl Scale {
|
224 | 224 |
|
225 | 225 | pub fn points(&self) -> Vec<Data> {
|
226 | 226 | match &self.values {
|
227 |
| - ScaleValues::Text(values) => values |
228 |
| - .iter() |
229 |
| - .cloned() |
230 |
| - .map(|value| Data::Text(value)) |
231 |
| - .collect(), |
| 227 | + ScaleValues::Text(values) => values.iter().cloned().map(Data::Text).collect(), |
232 | 228 | ScaleValues::Number { start, step, .. } => {
|
233 | 229 | let mut output = Vec::default();
|
234 | 230 | let n = self.length as isize;
|
@@ -416,8 +412,6 @@ impl Scale {
|
416 | 412 | let mut seen = Vec::default();
|
417 | 413 |
|
418 | 414 | for point in points {
|
419 |
| - let point = point; |
420 |
| - |
421 | 415 | if !seen.iter().any(|pnt| *pnt == point) {
|
422 | 416 | seen.push(point);
|
423 | 417 | }
|
@@ -484,19 +478,19 @@ impl Scale {
|
484 | 478 |
|
485 | 479 | impl From<Vec<i32>> for Scale {
|
486 | 480 | fn from(value: Vec<i32>) -> Self {
|
487 |
| - Self::new(value.into_iter(), ScaleKind::Integer) |
| 481 | + Self::new(value, ScaleKind::Integer) |
488 | 482 | }
|
489 | 483 | }
|
490 | 484 |
|
491 | 485 | impl From<Vec<isize>> for Scale {
|
492 | 486 | fn from(value: Vec<isize>) -> Self {
|
493 |
| - Self::new(value.into_iter(), ScaleKind::Number) |
| 487 | + Self::new(value, ScaleKind::Number) |
494 | 488 | }
|
495 | 489 | }
|
496 | 490 |
|
497 | 491 | impl From<Vec<f32>> for Scale {
|
498 | 492 | fn from(value: Vec<f32>) -> Self {
|
499 |
| - Self::new(value.into_iter(), ScaleKind::Float) |
| 493 | + Self::new(value, ScaleKind::Float) |
500 | 494 | }
|
501 | 495 | }
|
502 | 496 |
|
@@ -599,9 +593,6 @@ mod tests {
|
599 | 593 | let mut scale = Scale::new(pnts, ScaleKind::Integer);
|
600 | 594 | scale.sort();
|
601 | 595 |
|
602 |
| - println!("{scale:?}"); |
603 |
| - println!("{:?}", scale.points()); |
604 |
| - |
605 | 596 | assert_eq!(scale.length, 4);
|
606 | 597 | assert_eq!(
|
607 | 598 | scale.points(),
|
|
0 commit comments