Merge branch 'master' into dash

Author: KmolYuan

plotters-backend/src/lib.rs

@@ -33,7 +33,7 @@
   ```text
                                         .ensure_prepared() &&
     +-------------+    +-------------+    .draw_pixels()             +--------------+   drop
-    |Start drwaing|--->|Ready to draw| ------------------------+---->|Finish 1 frame| --------->
+    |Start drawing|--->|Ready to draw| ------------------------+---->|Finish 1 frame| --------->
     +-------------+    +-------------+                         |     +--------------+
            ^                  ^                                |            |
            |                  +------------------------------- +            |

plotters-backend/src/text.rs

@@ -60,9 +60,10 @@ impl<'a> From<&'a str> for FontFamily<'a> {
 /// ```
 pub mod text_anchor {
     /// The horizontal position of the anchor point relative to the text.
-    #[derive(Clone, Copy)]
+    #[derive(Clone, Copy, Default)]
     pub enum HPos {
         /// Anchor point is on the left side of the text
+        #[default]
         Left,
         /// Anchor point is on the right side of the text
         Right,
@@ -71,9 +72,10 @@ pub mod text_anchor {
     }
 
     /// The vertical position of the anchor point relative to the text.
-    #[derive(Clone, Copy)]
+    #[derive(Clone, Copy, Default)]
     pub enum VPos {
         /// Anchor point is on the top of the text
+        #[default]
         Top,
         /// Anchor point is in the vertical center of the text
         Center,
@@ -82,7 +84,7 @@ pub mod text_anchor {
     }
 
     /// The text anchor position.
-    #[derive(Clone, Copy)]
+    #[derive(Clone, Copy, Default)]
     pub struct Pos {
         /// The horizontal position of the anchor point
         pub h_pos: HPos,
@@ -106,21 +108,6 @@ pub mod text_anchor {
             Pos { h_pos, v_pos }
         }
 
-        /// Create a default text anchor position (top left).
-        ///
-        /// - **returns** The default text anchor position
-        ///
-        /// ```rust
-        /// use plotters_backend::text_anchor::{Pos, HPos, VPos};
-        ///
-        /// let pos = Pos::default();
-        /// ```
-        pub fn default() -> Self {
-            Pos {
-                h_pos: HPos::Left,
-                v_pos: VPos::Top,
-            }
-        }
     }
 }
 

plotters-bitmap/src/bitmap.rs

@@ -91,7 +91,7 @@ impl<'a> BitMapBackend<'a, RGBPixel> {
 
     /// Create a new bitmap backend which only lives in-memory
     ///
-    /// When this is used, the bitmap backend will write to a user provided [u8] array (or Vec<u8>)
+    /// When this is used, the bitmap backend will write to a user provided [u8] array (or `Vec<u8>`)
     /// in RGB pixel format.
     ///
     /// Note: This function provides backward compatibility for those code that assumes Plotters

plotters/Cargo.toml

@@ -9,7 +9,7 @@ repository = "https://github.com/plotters-rs/plotters"
 homepage = "https://plotters-rs.github.io/"
 keywords = ["WebAssembly", "Visualization", "Plotting", "Drawing"]
 categories = ["visualization", "wasm"]
-readme = "README.md"
+readme = "../README.md"
 exclude = ["doc-template", "plotters-doc-data"]
 
 [dependencies]

plotters/examples/3d-plot.rs

@@ -1,5 +1,5 @@
 use plotters::prelude::*;
-const OUT_FILE_NAME: &'static str = "plotters-doc-data/3d-plot.svg";
+const OUT_FILE_NAME: &str = "plotters-doc-data/3d-plot.svg";
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let area = SVGBackend::new(OUT_FILE_NAME, (1024, 760)).into_drawing_area();
 
@@ -9,7 +9,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     let z_axis = (-3.0..3.0).step(0.1);
 
     let mut chart = ChartBuilder::on(&area)
-        .caption(format!("3D Plot Test"), ("sans", 20))
+        .caption("3D Plot Test".to_string(), ("sans", 20))
         .build_cartesian_3d(x_axis.clone(), -3.0..3.0, z_axis.clone())?;
 
     chart.with_projection(|mut pb| {
@@ -44,12 +44,9 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
             &BLACK,
         ))?
         .label("Line")
-        .legend(|(x, y)| PathElement::new(vec![(x, y), (x + 20, y)], &BLACK));
+        .legend(|(x, y)| PathElement::new(vec![(x, y), (x + 20, y)], BLACK));
 
-    chart
-        .configure_series_labels()
-        .border_style(&BLACK)
-        .draw()?;
+    chart.configure_series_labels().border_style(BLACK).draw()?;
 
     // To avoid the IO failure being ignored silently, we manually call the present function
     area.present().expect("Unable to write result to file, please make sure 'plotters-doc-data' dir exists under current dir");

plotters/examples/3d-plot2.rs

@@ -3,12 +3,12 @@ fn pdf(x: f64, y: f64) -> f64 {
     const SDX: f64 = 0.1;
     const SDY: f64 = 0.1;
     const A: f64 = 5.0;
-    let x = x as f64 / 10.0;
-    let y = y as f64 / 10.0;
+    let x = x / 10.0;
+    let y = y / 10.0;
     A * (-x * x / 2.0 / SDX / SDX - y * y / 2.0 / SDY / SDY).exp()
 }
 
-const OUT_FILE_NAME: &'static str = "plotters-doc-data/3d-plot2.gif";
+const OUT_FILE_NAME: &str = "plotters-doc-data/3d-plot2.gif";
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let root = BitMapBackend::gif(OUT_FILE_NAME, (600, 400), 100)?.into_drawing_area();
 

plotters/examples/animation.rs

@@ -17,7 +17,7 @@ fn snowflake_iter(points: &[(f64, f64)]) -> Vec<(f64, f64)> {
     ret
 }
 
-const OUT_FILE_NAME: &'static str = "plotters-doc-data/animation.gif";
+const OUT_FILE_NAME: &str = "plotters-doc-data/animation.gif";
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let root = BitMapBackend::gif(OUT_FILE_NAME, (800, 600), 1_000)?.into_drawing_area();
 
@@ -45,11 +45,11 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
         chart.draw_series(std::iter::once(Polygon::new(
             snowflake_vertices.clone(),
-            &RED.mix(0.2),
+            RED.mix(0.2),
         )))?;
 
         snowflake_vertices.push(snowflake_vertices[0]);
-        chart.draw_series(std::iter::once(PathElement::new(snowflake_vertices, &RED)))?;
+        chart.draw_series(std::iter::once(PathElement::new(snowflake_vertices, RED)))?;
 
         root.present()?;
     }

plotters/examples/area-chart.rs

@@ -4,7 +4,7 @@ use rand::SeedableRng;
 use rand_distr::{Distribution, Normal};
 use rand_xorshift::XorShiftRng;
 
-const OUT_FILE_NAME: &'static str = "plotters-doc-data/area-chart.png";
+const OUT_FILE_NAME: &str = "plotters-doc-data/area-chart.png";
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let data: Vec<_> = {
         let norm_dist = Normal::new(500.0, 100.0).unwrap();
@@ -38,9 +38,9 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         AreaSeries::new(
             (0..).zip(data.iter()).map(|(x, y)| (x, *y)),
             0.0,
-            &RED.mix(0.2),
+            RED.mix(0.2),
         )
-        .border_style(&RED),
+        .border_style(RED),
     )?;
 
     // To avoid the IO failure being ignored silently, we manually call the present function

plotters/examples/blit-bitmap.rs

@@ -5,7 +5,7 @@ use image::{imageops::FilterType, ImageFormat};
 use std::fs::File;
 use std::io::BufReader;
 
-const OUT_FILE_NAME: &'static str = "plotters-doc-data/blit-bitmap.png";
+const OUT_FILE_NAME: &str = "plotters-doc-data/blit-bitmap.png";
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let root = BitMapBackend::new(OUT_FILE_NAME, (1024, 768)).into_drawing_area();

plotters/examples/boxplot.rs

@@ -21,7 +21,7 @@ fn read_data<BR: BufRead>(reader: BR) -> HashMap<(String, String), Vec<f64>> {
     ds
 }
 
-const OUT_FILE_NAME: &'static str = "plotters-doc-data/boxplot.svg";
+const OUT_FILE_NAME: &str = "plotters-doc-data/boxplot.svg";
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let root = SVGBackend::new(OUT_FILE_NAME, (1024, 768)).into_drawing_area();
     root.fill(&WHITE)?;
@@ -40,7 +40,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     };
     let dataset: Vec<(String, String, Quartiles)> = ds
         .iter()
-        .map(|(k, v)| (k.0.clone(), k.1.clone(), Quartiles::new(&v)))
+        .map(|(k, v)| (k.0.clone(), k.1.clone(), Quartiles::new(v)))
         .collect();
 
     let host_list: Vec<_> = dataset
@@ -60,11 +60,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         entry.0.push((x.0.clone(), &x.2));
     }
 
-    let values: Vec<f32> = dataset
-        .iter()
-        .map(|x| x.2.values().to_vec())
-        .flatten()
-        .collect();
+    let values: Vec<f32> = dataset.iter().flat_map(|x| x.2.values().to_vec()).collect();
     let values_range = fitting_range(values.iter());
 
     let mut chart = ChartBuilder::on(&upper)
@@ -81,13 +77,13 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         .x_desc("Ping, ms")
         .y_desc("Host")
         .y_labels(host_list.len())
-        .light_line_style(&WHITE)
+        .light_line_style(WHITE)
         .draw()?;
 
     for (label, (values, style, offset)) in &series {
         chart
             .draw_series(values.iter().map(|x| {
-                Boxplot::new_horizontal(SegmentValue::CenterOf(&x.0), &x.1)
+                Boxplot::new_horizontal(SegmentValue::CenterOf(&x.0), x.1)
                     .width(20)
                     .whisker_width(0.5)
                     .style(style)
@@ -100,7 +96,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         .configure_series_labels()
         .position(SeriesLabelPosition::UpperRight)
         .background_style(WHITE.filled())
-        .border_style(&BLACK.mix(0.5))
+        .border_style(BLACK.mix(0.5))
         .legend_area_size(22)
         .draw()?;
 
@@ -120,7 +116,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
             .iter()
             .chain(quartiles_b.values().iter()),
     );
-    let mut chart = ChartBuilder::on(&left)
+    let mut chart = ChartBuilder::on(left)
         .x_label_area_size(40)
         .y_label_area_size(40)
         .caption("Vertical Boxplot", ("sans-serif", 20))
@@ -129,19 +125,19 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
             values_range.start - 10.0..values_range.end + 10.0,
         )?;
 
-    chart.configure_mesh().light_line_style(&WHITE).draw()?;
+    chart.configure_mesh().light_line_style(WHITE).draw()?;
     chart.draw_series(vec![
         Boxplot::new_vertical(SegmentValue::CenterOf(&"a"), &quartiles_a),
         Boxplot::new_vertical(SegmentValue::CenterOf(&"b"), &quartiles_b),
     ])?;
 
-    let mut chart = ChartBuilder::on(&right)
+    let mut chart = ChartBuilder::on(right)
         .x_label_area_size(40)
         .y_label_area_size(40)
         .caption("Horizontal Boxplot", ("sans-serif", 20))
         .build_cartesian_2d(-30f32..90f32, 0..3)?;
 
-    chart.configure_mesh().light_line_style(&WHITE).draw()?;
+    chart.configure_mesh().light_line_style(WHITE).draw()?;
     chart.draw_series(vec![
         Boxplot::new_horizontal(1, &quartiles_a),
         Boxplot::new_horizontal(2, &Quartiles::new(&[30])),