Skip to content

Commit 7c4ed88

Browse files
AaronErhardtAaronErhardt
authored
Merge pull request #509 from martinfrances107/clippy
Chore: ran cargo clippy --fix
2 parents 4323ec2 + 10a53df commit 7c4ed88

38 files changed

+147
-162
lines changed

‎plotters/examples/3d-plot.rs‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use plotters::prelude::*;
2-
const OUT_FILE_NAME: &'static str = "plotters-doc-data/3d-plot.svg";
2+
const OUT_FILE_NAME: &str = "plotters-doc-data/3d-plot.svg";
33
fn main() -> Result<(), Box<dyn std::error::Error>> {
44
let area = SVGBackend::new(OUT_FILE_NAME, (1024, 760)).into_drawing_area();
55

@@ -9,7 +9,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
99
let z_axis = (-3.0..3.0).step(0.1);
1010

1111
let mut chart = ChartBuilder::on(&area)
12-
.caption(format!("3D Plot Test"), ("sans", 20))
12+
.caption("3D Plot Test".to_string(), ("sans", 20))
1313
.build_cartesian_3d(x_axis.clone(), -3.0..3.0, z_axis.clone())?;
1414

1515
chart.with_projection(|mut pb| {
@@ -44,12 +44,9 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
4444
&BLACK,
4545
))?
4646
.label("Line")
47-
.legend(|(x, y)| PathElement::new(vec![(x, y), (x + 20, y)], &BLACK));
47+
.legend(|(x, y)| PathElement::new(vec![(x, y), (x + 20, y)], BLACK));
4848

49-
chart
50-
.configure_series_labels()
51-
.border_style(&BLACK)
52-
.draw()?;
49+
chart.configure_series_labels().border_style(BLACK).draw()?;
5350

5451
// To avoid the IO failure being ignored silently, we manually call the present function
5552
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‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ fn pdf(x: f64, y: f64) -> f64 {
33
const SDX: f64 = 0.1;
44
const SDY: f64 = 0.1;
55
const A: f64 = 5.0;
6-
let x = x as f64 / 10.0;
7-
let y = y as f64 / 10.0;
6+
let x = x / 10.0;
7+
let y = y / 10.0;
88
A * (-x * x / 2.0 / SDX / SDX - y * y / 2.0 / SDY / SDY).exp()
99
}
1010

11-
const OUT_FILE_NAME: &'static str = "plotters-doc-data/3d-plot2.gif";
11+
const OUT_FILE_NAME: &str = "plotters-doc-data/3d-plot2.gif";
1212
fn main() -> Result<(), Box<dyn std::error::Error>> {
1313
let root = BitMapBackend::gif(OUT_FILE_NAME, (600, 400), 100)?.into_drawing_area();
1414

‎plotters/examples/animation.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ fn snowflake_iter(points: &[(f64, f64)]) -> Vec<(f64, f64)> {
1717
ret
1818
}
1919

20-
const OUT_FILE_NAME: &'static str = "plotters-doc-data/animation.gif";
20+
const OUT_FILE_NAME: &str = "plotters-doc-data/animation.gif";
2121
fn main() -> Result<(), Box<dyn std::error::Error>> {
2222
let root = BitMapBackend::gif(OUT_FILE_NAME, (800, 600), 1_000)?.into_drawing_area();
2323

@@ -45,11 +45,11 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
4545

4646
chart.draw_series(std::iter::once(Polygon::new(
4747
snowflake_vertices.clone(),
48-
&RED.mix(0.2),
48+
RED.mix(0.2),
4949
)))?;
5050

5151
snowflake_vertices.push(snowflake_vertices[0]);
52-
chart.draw_series(std::iter::once(PathElement::new(snowflake_vertices, &RED)))?;
52+
chart.draw_series(std::iter::once(PathElement::new(snowflake_vertices, RED)))?;
5353

5454
root.present()?;
5555
}

‎plotters/examples/area-chart.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use rand::SeedableRng;
44
use rand_distr::{Distribution, Normal};
55
use rand_xorshift::XorShiftRng;
66

7-
const OUT_FILE_NAME: &'static str = "plotters-doc-data/area-chart.png";
7+
const OUT_FILE_NAME: &str = "plotters-doc-data/area-chart.png";
88
fn main() -> Result<(), Box<dyn std::error::Error>> {
99
let data: Vec<_> = {
1010
let norm_dist = Normal::new(500.0, 100.0).unwrap();
@@ -38,9 +38,9 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
3838
AreaSeries::new(
3939
(0..).zip(data.iter()).map(|(x, y)| (x, *y)),
4040
0.0,
41-
&RED.mix(0.2),
41+
RED.mix(0.2),
4242
)
43-
.border_style(&RED),
43+
.border_style(RED),
4444
)?;
4545

4646
// To avoid the IO failure being ignored silently, we manually call the present function

‎plotters/examples/blit-bitmap.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use image::{imageops::FilterType, ImageFormat};
55
use std::fs::File;
66
use std::io::BufReader;
77

8-
const OUT_FILE_NAME: &'static str = "plotters-doc-data/blit-bitmap.png";
8+
const OUT_FILE_NAME: &str = "plotters-doc-data/blit-bitmap.png";
99

1010
fn main() -> Result<(), Box<dyn std::error::Error>> {
1111
let root = BitMapBackend::new(OUT_FILE_NAME, (1024, 768)).into_drawing_area();

‎plotters/examples/boxplot.rs‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ fn read_data<BR: BufRead>(reader: BR) -> HashMap<(String, String), Vec<f64>> {
2121
ds
2222
}
2323

24-
const OUT_FILE_NAME: &'static str = "plotters-doc-data/boxplot.svg";
24+
const OUT_FILE_NAME: &str = "plotters-doc-data/boxplot.svg";
2525
fn main() -> Result<(), Box<dyn std::error::Error>> {
2626
let root = SVGBackend::new(OUT_FILE_NAME, (1024, 768)).into_drawing_area();
2727
root.fill(&WHITE)?;
@@ -40,7 +40,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
4040
};
4141
let dataset: Vec<(String, String, Quartiles)> = ds
4242
.iter()
43-
.map(|(k, v)| (k.0.clone(), k.1.clone(), Quartiles::new(&v)))
43+
.map(|(k, v)| (k.0.clone(), k.1.clone(), Quartiles::new(v)))
4444
.collect();
4545

4646
let host_list: Vec<_> = dataset
@@ -60,11 +60,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
6060
entry.0.push((x.0.clone(), &x.2));
6161
}
6262

63-
let values: Vec<f32> = dataset
64-
.iter()
65-
.map(|x| x.2.values().to_vec())
66-
.flatten()
67-
.collect();
63+
let values: Vec<f32> = dataset.iter().flat_map(|x| x.2.values().to_vec()).collect();
6864
let values_range = fitting_range(values.iter());
6965

7066
let mut chart = ChartBuilder::on(&upper)
@@ -81,13 +77,13 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
8177
.x_desc("Ping, ms")
8278
.y_desc("Host")
8379
.y_labels(host_list.len())
84-
.light_line_style(&WHITE)
80+
.light_line_style(WHITE)
8581
.draw()?;
8682

8783
for (label, (values, style, offset)) in &series {
8884
chart
8985
.draw_series(values.iter().map(|x| {
90-
Boxplot::new_horizontal(SegmentValue::CenterOf(&x.0), &x.1)
86+
Boxplot::new_horizontal(SegmentValue::CenterOf(&x.0), x.1)
9187
.width(20)
9288
.whisker_width(0.5)
9389
.style(style)
@@ -100,7 +96,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
10096
.configure_series_labels()
10197
.position(SeriesLabelPosition::UpperRight)
10298
.background_style(WHITE.filled())
103-
.border_style(&BLACK.mix(0.5))
99+
.border_style(BLACK.mix(0.5))
104100
.legend_area_size(22)
105101
.draw()?;
106102

@@ -120,7 +116,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
120116
.iter()
121117
.chain(quartiles_b.values().iter()),
122118
);
123-
let mut chart = ChartBuilder::on(&left)
119+
let mut chart = ChartBuilder::on(left)
124120
.x_label_area_size(40)
125121
.y_label_area_size(40)
126122
.caption("Vertical Boxplot", ("sans-serif", 20))
@@ -129,19 +125,19 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
129125
values_range.start - 10.0..values_range.end + 10.0,
130126
)?;
131127

132-
chart.configure_mesh().light_line_style(&WHITE).draw()?;
128+
chart.configure_mesh().light_line_style(WHITE).draw()?;
133129
chart.draw_series(vec![
134130
Boxplot::new_vertical(SegmentValue::CenterOf(&"a"), &quartiles_a),
135131
Boxplot::new_vertical(SegmentValue::CenterOf(&"b"), &quartiles_b),
136132
])?;
137133

138-
let mut chart = ChartBuilder::on(&right)
134+
let mut chart = ChartBuilder::on(right)
139135
.x_label_area_size(40)
140136
.y_label_area_size(40)
141137
.caption("Horizontal Boxplot", ("sans-serif", 20))
142138
.build_cartesian_2d(-30f32..90f32, 0..3)?;
143139

144-
chart.configure_mesh().light_line_style(&WHITE).draw()?;
140+
chart.configure_mesh().light_line_style(WHITE).draw()?;
145141
chart.draw_series(vec![
146142
Boxplot::new_horizontal(1, &quartiles_a),
147143
Boxplot::new_horizontal(2, &Quartiles::new(&[30])),

‎plotters/examples/chart.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use plotters::prelude::*;
22

3-
const OUT_FILE_NAME: &'static str = "plotters-doc-data/sample.png";
3+
const OUT_FILE_NAME: &str = "plotters-doc-data/sample.png";
44
fn main() -> Result<(), Box<dyn std::error::Error>> {
55
let root_area = BitMapBackend::new(OUT_FILE_NAME, (1024, 768)).into_drawing_area();
66

@@ -28,16 +28,16 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
2828

2929
cc.draw_series(LineSeries::new(x_axis.values().map(|x| (x, x.sin())), &RED))?
3030
.label("Sine")
31-
.legend(|(x, y)| PathElement::new(vec![(x, y), (x + 20, y)], &RED));
31+
.legend(|(x, y)| PathElement::new(vec![(x, y), (x + 20, y)], RED));
3232

3333
cc.draw_series(LineSeries::new(
3434
x_axis.values().map(|x| (x, x.cos())),
3535
&BLUE,
3636
))?
3737
.label("Cosine")
38-
.legend(|(x, y)| PathElement::new(vec![(x, y), (x + 20, y)], &BLUE));
38+
.legend(|(x, y)| PathElement::new(vec![(x, y), (x + 20, y)], BLUE));
3939

40-
cc.configure_series_labels().border_style(&BLACK).draw()?;
40+
cc.configure_series_labels().border_style(BLACK).draw()?;
4141

4242
/*
4343
// It's possible to use a existing pointing element
@@ -62,7 +62,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
6262
let drawing_areas = lower.split_evenly((1, 2));
6363

6464
for (drawing_area, idx) in drawing_areas.iter().zip(1..) {
65-
let mut cc = ChartBuilder::on(&drawing_area)
65+
let mut cc = ChartBuilder::on(drawing_area)
6666
.x_label_area_size(30)
6767
.y_label_area_size(30)
6868
.margin_right(20)

‎plotters/examples/colormaps.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use plotters::prelude::*;
22

3-
const OUT_FILE_NAME: &'static str = "plotters-doc-data/colormaps.png";
3+
const OUT_FILE_NAME: &str = "plotters-doc-data/colormaps.png";
44

55
fn main() -> Result<(), Box<dyn std::error::Error>> {
66
let colormaps_rgb: [(Box<dyn ColorMap<RGBColor>>, &str); 4] = [

‎plotters/examples/console.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ where
183183
Ok(())
184184
}
185185

186-
const OUT_FILE_NAME: &'static str = "plotters-doc-data/console-example.png";
186+
const OUT_FILE_NAME: &str = "plotters-doc-data/console-example.png";
187187
fn main() -> Result<(), Box<dyn Error>> {
188188
draw_chart(TextDrawingBackend(vec![PixelState::Empty; 5000]).into_drawing_area())?;
189189
let b = BitMapBackend::new(OUT_FILE_NAME, (1024, 768)).into_drawing_area();

‎plotters/examples/customized_coord.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use plotters::{
22
coord::ranged1d::{KeyPointHint, NoDefaultFormatting, ValueFormatter},
33
prelude::*,
44
};
5-
const OUT_FILE_NAME: &'static str = "plotters-doc-data/customized_coord.svg";
5+
const OUT_FILE_NAME: &str = "plotters-doc-data/customized_coord.svg";
66

77
struct CustomizedX(u32);
88

0 commit comments

Comments
 (0)