Apply most clippy lints

Author: AaronErhardt

plotters-backend/src/rasterizer/polygon.rs

@@ -49,7 +49,7 @@ impl Edge {
 
 impl PartialOrd for Edge {
  fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
- self.get_slave_pos().partial_cmp(&other.get_slave_pos())
+ Some(self.cmp(other))
  }
 }
 

plotters-bitmap/src/bitmap_pixel/bgrx.rs

@@ -36,7 +36,7 @@ impl PixelFormat for BGRXPixel {
  a: f64,
  ) {
  let (w, h) = target.get_size();
- let a = a.min(1.0).max(0.0);
+ let a = a.clamp(0.0, 1.0);
  if a == 0.0 {
  return;
  }

plotters-bitmap/src/bitmap_pixel/rgb.rs

@@ -40,7 +40,7 @@ impl PixelFormat for RGBPixel {
  a: f64,
  ) {
  let (w, h) = target.get_size();
- let a = a.min(1.0).max(0.0);
+ let a = a.clamp(0.0, 1.0);
  if a == 0.0 {
  return;
  }

plotters-svg/src/svg.rs

@@ -27,20 +27,13 @@ fn make_svg_opacity(color: BackendColor) -> String {
 enum Target<'a> {
  File(String, &'a Path),
  Buffer(&'a mut String),
- // TODO: At this point we won't make the breaking change
- // so the u8 buffer is still supported. But in 0.3, we definitely
- // should get rid of this.
- #[cfg(feature = "deprecated_items")]
- U8Buffer(String, &'a mut Vec<u8>),
 }
 
 impl Target<'_> {
  fn get_mut(&mut self) -> &mut String {
  match self {
  Target::File(ref mut buf, _) => buf,
  Target::Buffer(buf) => buf,
- #[cfg(feature = "deprecated_items")]
- Target::U8Buffer(ref mut buf, _) => buf,
  }
  }
 }
@@ -147,24 +140,6 @@ impl<'a> SVGBackend<'a> {
  ret
  }
 
- /// Create a new SVG drawing backend and store the document into a u8 vector
- #[cfg(feature = "deprecated_items")]
- #[deprecated(
- note = "This will be replaced by `with_string`, consider use `with_string` to avoid breaking change in the future"
- )]
- pub fn with_buffer(buf: &'a mut Vec<u8>, size: (u32, u32)) -> Self {
- let mut ret = Self {
- target: Target::U8Buffer(String::default(), buf),
- size,
- tag_stack: vec![],
- saved: false,
- };
-
- ret.init_svg_file(size);
-
- ret
- }
-
  /// Create a new SVG drawing backend and store the document into a String buffer
  pub fn with_string(buf: &'a mut String, size: (u32, u32)) -> Self {
  let mut ret = Self {
@@ -203,11 +178,6 @@ impl<'a> DrawingBackend for SVGBackend<'a> {
  .map_err(DrawingErrorKind::DrawingError)?;
  }
  Target::Buffer(_) => {}
- #[cfg(feature = "deprecated_items")]
- Target::U8Buffer(ref actual, ref mut target) => {
- target.clear();
- target.extend_from_slice(actual.as_bytes());
- }
  }
  self.saved = true;
  }
@@ -481,11 +451,11 @@ impl<'a> DrawingBackend for SVGBackend<'a> {
  }
 
  #[cfg(all(not(target_arch = "wasm32"), feature = "image"))]
- fn blit_bitmap<'b>(
+ fn blit_bitmap(
  &mut self,
  pos: BackendCoord,
  (w, h): (u32, u32),
- src: &'b [u8],
+ src: &[u8],
  ) -> Result<(), DrawingErrorKind<Self::ErrorType>> {
  use image::codecs::png::PngEncoder;
  use image::ImageEncoder;
@@ -508,9 +478,7 @@ impl<'a> DrawingBackend for SVGBackend<'a> {
  }
 
  let padding = (3 - data.len() % 3) % 3;
- for _ in 0..padding {
- data.push(0);
- }
+ data.resize(data.len() + padding, 0);
 
  let mut rem_bits = 0;
  let mut rem_num = 0;

plotters/Cargo.toml

@@ -4,6 +4,7 @@ version = "0.3.6"
 authors = ["Hao Hou <haohou302@gmail.com>"]
 edition = "2018"
 license = "MIT"
+msrv = "1.56"
 description = "A Rust drawing library focus on data plotting for both WASM and native applications"
 repository = "https://github.com/plotters-rs/plotters"
 homepage = "https://plotters-rs.github.io/"
@@ -12,6 +13,10 @@ categories = ["visualization", "wasm"]
 readme = "../README.md"
 exclude = ["doc-template", "plotters-doc-data"]
 
+[lints.rust]
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(doc_cfg)'] }
+deprecated = { level = "allow" }
+
 [dependencies]
 num-traits = "0.2.14"
 chrono = { version = "0.4.32", optional = true }

plotters/clippy.toml

@@ -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("3D Plot Test".to_string(), ("sans", 20))
+ .caption("3D Plot Test", ("sans", 20))
  .build_cartesian_3d(x_axis.clone(), -3.0..3.0, z_axis.clone())?;
 
  chart.with_projection(|mut pb| {

plotters/examples/3d-plot.rs

@@ -11,7 +11,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
  .margin(5)
  .top_x_label_area_size(40)
  .y_label_area_size(40)
- .build_cartesian_2d(0i32..15i32, 15i32..0i32)?;
+ .build_cartesian_2d(0i32..15i32, 0i32..15i32)?;
 
  chart
  .configure_mesh()

plotters/examples/matshow.rs

@@ -194,7 +194,7 @@ impl<'a, 'b, DB: DrawingBackend> ChartBuilder<'a, 'b, DB> {
  Sets the size of the X label area at the bottom of the chart.
 
  - `size`: The desired size of the X label area in backend units (pixels).
- If set to 0, the X label area is removed.
+  If set to 0, the X label area is removed.
 
  See [`ChartBuilder::on()`] for more information and examples.
  */
@@ -206,7 +206,7 @@ impl<'a, 'b, DB: DrawingBackend> ChartBuilder<'a, 'b, DB> {
  Sets the size of the Y label area to the left of the chart.
 
  - `size`: The desired size of the Y label area in backend units (pixels).
- If set to 0, the Y label area is removed.
+  If set to 0, the Y label area is removed.
 
  See [`ChartBuilder::on()`] for more information and examples.
  */
@@ -218,7 +218,7 @@ impl<'a, 'b, DB: DrawingBackend> ChartBuilder<'a, 'b, DB> {
  Sets the size of the X label area at the top of the chart.
 
  - `size`: The desired size of the top X label area in backend units (pixels).
- If set to 0, the top X label area is removed.
+  If set to 0, the top X label area is removed.
 
  See [`ChartBuilder::on()`] for more information and examples.
  */
@@ -230,7 +230,7 @@ impl<'a, 'b, DB: DrawingBackend> ChartBuilder<'a, 'b, DB> {
  Sets the size of the Y label area to the right of the chart.
 
  - `size`: The desired size of the Y label area in backend units (pixels).
- If set to 0, the Y label area to the right is removed.
+  If set to 0, the Y label area to the right is removed.
 
  See [`ChartBuilder::on()`] for more information and examples.
  */
@@ -243,7 +243,7 @@ impl<'a, 'b, DB: DrawingBackend> ChartBuilder<'a, 'b, DB> {
 
  - `pos`: The position of the desired label area to adjust
  - `size`: The desired size of the label area in backend units (pixels).
- If set to 0, the label area is removed.
+  If set to 0, the label area is removed.
 
  See [`ChartBuilder::on()`] for more information and examples.
  */

plotters/src/chart/builder.rs

@@ -106,9 +106,9 @@ where
  /// Override the 3D projection matrix. This function allows to override the default projection
  /// matrix.
  /// - `pf`: A function that takes the default projection matrix configuration and returns the
- /// projection matrix. This function will allow you to adjust the pitch, yaw angle and the
- /// centeral point of the projection, etc. You can also build a projection matrix which is not
- /// relies on the default configuration as well.
+ ///  projection matrix. This function will allow you to adjust the pitch, yaw angle and the
+ ///  centeral point of the projection, etc. You can also build a projection matrix which is not
+ ///  relies on the default configuration as well.
  pub fn with_projection<P: FnOnce(ProjectionMatrixBuilder) -> ProjectionMatrix>(
  &mut self,
  pf: P,