move criterion_plot into main crate

Boshen · Mar 16, 2024 · 09cb348 · 09cb348
1 parent 12382e6
commit 09cb348
Show file tree

Hide file tree

Showing 31 changed files with 74 additions and 141 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -48,7 +48,6 @@ cast = "0.3"
 num-traits = { version = "0.2", default-features = false, features = ["std"] }
 oorandom = "11.1"
 regex = { version = "1.10", default-features = false, features = ["std"] }
-criterion-plot = { path = "plot", version = "0.5.0" }
 
 # Optional dependencies
 rayon = { version = "1.9", optional = true }
@@ -73,6 +72,8 @@ approx = "0.5.1"
 quickcheck = { version = "1.0", default-features = false }
 rand = "0.8"
 futures = { version = "0.3", default-features = false, features = ["executor"] }
+itertools-num = "0.1"
+num-complex = "0.4.5"
 
 [features]
 stable = [

diff --git a/plot/.gitignore b/plot/.gitignore
diff --git a/plot/CONTRIBUTING.md b/plot/CONTRIBUTING.md
diff --git a/plot/Cargo.toml b/plot/Cargo.toml
diff --git a/plot/LICENSE-APACHE b/plot/LICENSE-APACHE
diff --git a/plot/LICENSE-MIT b/plot/LICENSE-MIT
diff --git a/plot/README.md b/plot/README.md
diff --git a/plot/src/prelude.rs b/plot/src/prelude.rs
diff --git a/plot/src/axis.rs → src/criterion_plot/axis.rs b/plot/src/axis.rs → src/criterion_plot/axis.rs
@@ -3,9 +3,9 @@
 use std::borrow::Cow;
 use std::iter::IntoIterator;
 
-use crate::map;
-use crate::traits::{Configure, Data, Set};
-use crate::{
+use super::map;
+use super::traits::{Configure, Data, Set};
+use super::{
     grid, Axis, Default, Display, Grid, Label, Range, Scale, ScaleFactor, Script, TicLabels,
 };
 
@@ -191,7 +191,7 @@ impl<'a> Script for (Axis, &'a Properties) {
     }
 }
 
-impl crate::ScaleFactorTrait for Properties {
+impl super::ScaleFactorTrait for Properties {
     fn scale_factor(&self) -> f64 {
         self.scale_factor
     }

diff --git a/plot/src/candlestick.rs → src/criterion_plot/candlestick.rs b/plot/src/candlestick.rs → src/criterion_plot/candlestick.rs
@@ -5,9 +5,9 @@ use std::iter::IntoIterator;
 
 use itertools::izip;
 
-use crate::data::Matrix;
-use crate::traits::{self, Data, Set};
-use crate::{Color, Default, Display, Figure, Label, LineType, LineWidth, Plot, Script};
+use super::data::Matrix;
+use super::traits::{self, Data, Set};
+use super::{Color, Default, Display, Figure, Label, LineType, LineWidth, Plot, Script};
 
 /// Properties common to candlestick plots
 pub struct Properties {
@@ -128,7 +128,7 @@ where
     where
         F: FnOnce(&mut Properties) -> &mut Properties,
     {
-        let (x_factor, y_factor) = crate::scale_factor(&self.axes, crate::Axes::BottomXLeftY);
+        let (x_factor, y_factor) = super::scale_factor(&self.axes, super::Axes::BottomXLeftY);
         let Candlesticks { x, whisker_min, box_min, box_high, whisker_high } = candlesticks;
 
         let data = Matrix::new(

diff --git a/plot/src/curve.rs → src/criterion_plot/curve.rs b/plot/src/curve.rs → src/criterion_plot/curve.rs
@@ -5,9 +5,9 @@ use std::iter::IntoIterator;
 
 use itertools::izip;
 
-use crate::data::Matrix;
-use crate::traits::{self, Data, Set};
-use crate::{
+use super::data::Matrix;
+use super::traits::{self, Data, Set};
+use super::{
     Axes, Color, CurveDefault, Display, Figure, Label, LineType, LineWidth, Plot, PointSize,
     PointType, Script,
 };
@@ -263,7 +263,7 @@ where
         configure(&mut props);
 
         let (x_factor, y_factor) =
-            crate::scale_factor(&self.axes, props.axes.unwrap_or(crate::Axes::BottomXLeftY));
+            super::scale_factor(&self.axes, props.axes.unwrap_or(super::Axes::BottomXLeftY));
 
         let data = Matrix::new(izip!(x, y), (x_factor, y_factor));
         self.plots.push(Plot::new(data, &props));

diff --git a/plot/src/data.rs → src/criterion_plot/data.rs b/plot/src/data.rs → src/criterion_plot/data.rs
@@ -2,7 +2,7 @@ use std::mem;
 
 use cast::From as _0;
 
-use crate::traits::Data;
+use super::traits::Data;
 
 macro_rules! impl_data {
     ($($ty:ty),+) => {

diff --git a/plot/src/display.rs → src/criterion_plot/display.rs b/plot/src/display.rs → src/criterion_plot/display.rs
@@ -1,7 +1,7 @@
 use std::borrow::Cow;
 
-use crate::key::{Horizontal, Justification, Order, Stacked, Vertical};
-use crate::{Axes, Axis, Color, Display, Grid, LineType, PointType, Terminal};
+use super::key::{Horizontal, Justification, Order, Stacked, Vertical};
+use super::{Axes, Axis, Color, Display, Grid, LineType, PointType, Terminal};
 
 impl Display<&'static str> for Axis {
     fn display(&self) -> &'static str {

diff --git a/plot/src/errorbar.rs → src/criterion_plot/errorbar.rs b/plot/src/errorbar.rs → src/criterion_plot/errorbar.rs
@@ -5,9 +5,9 @@ use std::iter::IntoIterator;
 
 use itertools::izip;
 
-use crate::data::Matrix;
-use crate::traits::{self, Data, Set};
-use crate::{
+use super::data::Matrix;
+use super::traits::{self, Data, Set};
+use super::{
     Color, Display, ErrorBarDefault, Figure, Label, LineType, LineWidth, Plot, PointSize,
     PointType, Script,
 };
@@ -232,7 +232,7 @@ where
     where
         F: FnOnce(&mut Properties) -> &mut Properties,
     {
-        let (x_factor, y_factor) = crate::scale_factor(&self.axes, crate::Axes::BottomXLeftY);
+        let (x_factor, y_factor) = super::scale_factor(&self.axes, super::Axes::BottomXLeftY);
 
         let style = e.style();
         let (x, y, length, height, e_factor) = match e {

diff --git a/plot/src/filledcurve.rs → src/criterion_plot/filledcurve.rs b/plot/src/filledcurve.rs → src/criterion_plot/filledcurve.rs
@@ -5,9 +5,9 @@ use std::iter::IntoIterator;
 
 use itertools::izip;
 
-use crate::data::Matrix;
-use crate::traits::{self, Data, Set};
-use crate::{Axes, Color, Default, Display, Figure, Label, Opacity, Plot, Script};
+use super::data::Matrix;
+use super::traits::{self, Data, Set};
+use super::{Axes, Color, Default, Display, Figure, Label, Opacity, Plot, Script};
 
 /// Properties common to filled curve plots
 pub struct Properties {
@@ -128,7 +128,7 @@ where
         configure(&mut props);
 
         let (x_factor, y_factor) =
-            crate::scale_factor(&self.axes, props.axes.unwrap_or(crate::Axes::BottomXLeftY));
+            super::scale_factor(&self.axes, props.axes.unwrap_or(super::Axes::BottomXLeftY));
 
         let data = Matrix::new(izip!(x, y1, y2), (x_factor, y_factor, y_factor));
         self.plots.push(Plot::new(data, &props));

diff --git a/plot/src/grid.rs → src/criterion_plot/grid.rs b/plot/src/grid.rs → src/criterion_plot/grid.rs
@@ -1,6 +1,6 @@
 //! Gridline
 
-use crate::{Axis, Default, Display, Grid, Script};
+use super::{Axis, Default, Display, Grid, Script};
 
 /// Gridline properties
 #[derive(Clone, Copy)]

diff --git a/plot/src/key.rs → src/criterion_plot/key.rs b/plot/src/key.rs → src/criterion_plot/key.rs
@@ -2,8 +2,8 @@
 
 use std::borrow::Cow;
 
-use crate::traits::Set;
-use crate::{Default, Display, Script, Title};
+use super::traits::Set;
+use super::{Default, Display, Script, Title};
 
 /// Properties of the key
 #[derive(Clone)]

diff --git a/plot/src/map.rs → src/criterion_plot/map.rs b/plot/src/map.rs → src/criterion_plot/map.rs
@@ -1,7 +1,7 @@
 //! Enum Maps
 
 pub mod axis {
-    use crate::Axis;
+    use super::super::Axis;
 
     const LENGTH: usize = 4;
 
@@ -79,7 +79,7 @@ pub mod axis {
 }
 
 pub mod grid {
-    use crate::Grid;
+    use super::super::Grid;
 
     const LENGTH: usize = 2;