Merge branch 'master' into next-release-devel

Author: 38

.github/workflows/rust-clippy.yml

@@ -0,0 +1,54 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# rust-clippy is a tool that runs a bunch of lints to catch common
+# mistakes in your Rust code and help improve your Rust code.
+# More details at https://github.com/rust-lang/rust-clippy 
+# and https://rust-lang.github.io/rust-clippy/
+
+name: rust-clippy analyze
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ "master" ]
+  schedule:
+    - cron: '44 13 * * 2'
+
+jobs:
+  rust-clippy-analyze:
+    name: Run rust-clippy analyzing
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      security-events: write
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Install Rust toolchain
+        uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af #@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          components: clippy
+          override: true
+
+      - name: Install required cargo
+        run: cargo install clippy-sarif sarif-fmt
+
+      - name: Run rust-clippy
+        run:
+          cargo clippy
+          --all-features
+          --message-format=json | clippy-sarif | tee rust-clippy-results.sarif | sarif-fmt
+        continue-on-error: true
+
+      - name: Upload analysis results to GitHub
+        uses: github/codeql-action/upload-sarif@v1
+        with:
+          sarif_file: rust-clippy-results.sarif
+          wait-for-processing: true

Cargo.lock

@@ -13,6 +13,7 @@ use std::fs::File;
 use std::io::Cursor;
 use std::io::{BufWriter, Error, Write};
 use std::path::Path;
+use std::fmt::Write as _;
 
 fn make_svg_color(color: BackendColor) -> String {
     let (r, g, b) = color.rgb;
@@ -314,7 +315,7 @@ impl<'a> DrawingBackend for SVGBackend<'a> {
                 (
                     "points",
                     &path.into_iter().fold(String::new(), |mut s, (x, y)| {
-                        s.push_str(&format!("{},{} ", x, y));
+                        write!(s, "{},{} ", x, y).ok();
                         s
                     }),
                 ),
@@ -340,7 +341,7 @@ impl<'a> DrawingBackend for SVGBackend<'a> {
                 (
                     "points",
                     &path.into_iter().fold(String::new(), |mut s, (x, y)| {
-                        s.push_str(&format!("{},{} ", x, y));
+                        write!(s, "{},{} ", x, y).ok();
                         s
                     }),
                 ),

plotters-svg/src/svg.rs

@@ -106,9 +106,9 @@ deprecated_items = [] # Keep some of the deprecated items for backward compatibi
 itertools = "0.10.0"
 criterion = "0.3.4"
 rayon = "1.5.1"
-serde_json = "1.0.64"
-serde = "1.0.126"
-serde_derive = "1.0.126"
+serde_json = "1.0.82"
+serde = "1.0.138"
+serde_derive = "1.0.138"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
 rand = "0.8.3"

plotters/Cargo.toml

@@ -253,7 +253,7 @@ impl<'a, 'b, DB: DrawingBackend> ChartBuilder<'a, 'b, DB> {
         size: S,
     ) -> &mut Self {
         let size = size.in_pixels(self.root_area);
-        self.label_area_size[pos as usize] = size.abs() as u32;
+        self.label_area_size[pos as usize] = size.unsigned_abs();
         self.overlap_plotting_area[pos as usize] = size < 0;
         self
     }

plotters/src/chart/builder.rs

@@ -68,7 +68,7 @@ impl<'a, DB: DrawingBackend, CT: CoordTranslate> ChartContext<'a, DB, CT> {
     }
 }
 
-impl<'a, 'b, DB, CT> From<&ChartContext<'a, DB, CT>> for ChartState<CT>
+impl<'a, DB, CT> From<&ChartContext<'a, DB, CT>> for ChartState<CT>
 where
     DB: DrawingBackend,
     CT: CoordTranslate + Clone,

plotters/src/chart/state.rs

@@ -154,7 +154,7 @@ impl<'a> FontDesc<'a> {
     pub fn box_size(&self, text: &str) -> FontResult<(u32, u32)> {
         let ((min_x, min_y), (max_x, max_y)) = self.layout_box(text)?;
         let (w, h) = self.get_transform().transform(max_x - min_x, max_y - min_y);
-        Ok((w.abs() as u32, h.abs() as u32))
+        Ok((w.unsigned_abs(), h.unsigned_abs()))
     }
 
     /// Actually draws a font with a drawing function