fix fmt & clippy

Signed-off-by: Andrei Gherghescu <[email protected]>

Author: andrei-ng

examples/wasm-yew-callback-minimal/src/main.rs

@@ -1,12 +1,10 @@
-use plotly::{Plot,common::Mode, Scatter,Histogram};
-use plotly::callbacks::{ClickEvent};
+use plotly::callbacks::ClickEvent;
+use plotly::{Histogram, Plot, Scatter, common::Mode};
 use web_sys::js_sys::Math;
 use yew::prelude::*;
 
-
 #[function_component(App)]
 pub fn plot_component() -> Html {
-
     let x = use_state(|| None::<f64>);
     let y = use_state(|| None::<f64>);
     let point_numbers = use_state(|| None::<Vec<usize>>);
@@ -29,15 +27,10 @@ pub fn plot_component() -> Html {
         fig.add_trace(
             Scatter::new(xs.clone(), ys.clone())
                 .mode(Mode::Markers)
-                .name("Sine markers")
-        );
-        let random_values: Vec<f64> = (0..100)
-            .map(|_| Math::random())
-            .collect();
-        fig.add_trace(
-            Histogram::new(random_values)
-                .name("Random histogram")
+                .name("Sine markers"),
         );
+        let random_values: Vec<f64> = (0..100).map(|_| Math::random()).collect();
+        fig.add_trace(Histogram::new(random_values).name("Random histogram"));
         let layout = plotly::Layout::new().title("Click Event Callback Example in Yew");
         fig.set_layout(layout);
         async move {
@@ -77,4 +70,4 @@ pub fn plot_component() -> Html {
 fn main() {
     wasm_logger::init(wasm_logger::Config::default());
     yew::Renderer::<App>::new().render();
-}
+}

plotly/src/bindings.rs

@@ -25,7 +25,6 @@ extern "C" {
 pub async fn new_plot(id: &str, plot: &Plot) {
     let plot_obj = &plot.to_js_object();
 
-    
     // This will only fail if the Rust Plotly library has produced
     // plotly-incompatible JSON. An error here should have been handled by the
     // library, rather than down here.

plotly/src/callbacks.rs

@@ -5,14 +5,14 @@ use web_sys::{js_sys::Function, window, HtmlElement};
 /// Provides utilities for binding Plotly.js click events to Rust closures
 /// via `wasm-bindgen`.  
 ///  
-/// This module defines a `PlotlyDiv` foreign type for the Plotly `<div>` element,  
-/// a high-level `bind_click` function to wire up Rust callbacks, and  
+/// This module defines a `PlotlyDiv` foreign type for the Plotly `<div>`
+/// element, a high-level `bind_click` function to wire up Rust callbacks, and  
 /// the `ClickPoint`/`ClickEvent` data structures to deserialize event payloads.
-
 #[wasm_bindgen]
 extern "C" {
 
-    /// A wrapper around the JavaScript `HTMLElement` representing a Plotly `<div>`.
+    /// A wrapper around the JavaScript `HTMLElement` representing a Plotly
+    /// `<div>`.
     ///
     /// This type extends `web_sys::HtmlElement` and exposes Plotly’s  
     /// `.on(eventName, callback)` method for attaching event listeners.
@@ -37,17 +37,18 @@ extern "C" {
 /// Bind a Rust callback to the Plotly `plotly_click` event on a given `<div>`.
 ///
 /// # Type Parameters
-/// - `F`: A `'static + FnMut(ClickEvent)` closure type to handle the click data.
+/// - `F`: A `'static + FnMut(ClickEvent)` closure type to handle the click
+///   data.
 ///
 /// # Parameters
 /// - `div_id`: The DOM `id` attribute of the Plotly `<div>`.
 /// - `cb`: A mutable Rust closure that will be called with a `ClickEvent`.
 ///
 /// # Details
-/// 1. Looks up the element by `div_id`, converts it to `PlotlyDiv`.  
-/// 2. Wraps a `Closure<dyn FnMut(JsValue)>` that deserializes the JS event  
-///    into our `ClickEvent` type via `serde_wasm_bindgen`.  
-/// 3. Calls `plot_div.on("plotly_click", …)` to register the listener.  
+/// 1. Looks up the element by `div_id`, converts it to `PlotlyDiv`.
+/// 2. Wraps a `Closure<dyn FnMut(JsValue)>` that deserializes the JS event into
+///    our `ClickEvent` type via `serde_wasm_bindgen`.
+/// 3. Calls `plot_div.on("plotly_click", …)` to register the listener.
 /// 4. Forgets the closure so it lives for the lifetime of the page.
 ///
 /// # Example
@@ -56,43 +57,41 @@ extern "C" {
 ///     web_sys::console::log_1(&format!("{:?}", evt).into());
 /// });
 /// ```
-
-
 pub fn bind_click<F>(div_id: &str, mut cb: F)
-where 
-    F: 'static + FnMut(ClickEvent)
+where
+    F: 'static + FnMut(ClickEvent),
 {
-
-    let plot_div: PlotlyDiv = window().unwrap()
-        .document().unwrap()
-        .get_element_by_id(div_id).unwrap()
+    let plot_div: PlotlyDiv = window()
+        .unwrap()
+        .document()
+        .unwrap()
+        .get_element_by_id(div_id)
+        .unwrap()
         .unchecked_into();
     let closure = Closure::wrap(Box::new(move |event: JsValue| {
-        let event: ClickEvent = serde_wasm_bindgen::from_value(event)
-            .expect("\n Couldn't serialize the event \n");
+        let event: ClickEvent =
+            serde_wasm_bindgen::from_value(event).expect("\n Couldn't serialize the event \n");
         cb(event);
     }) as Box<dyn FnMut(JsValue)>);
-    plot_div.on("plotly_click", &closure.as_ref().unchecked_ref());
+    plot_div.on("plotly_click", closure.as_ref().unchecked_ref());
     closure.forget();
 }
 
-
 /// Represents a single point from a Plotly click event.
 ///
 /// Fields mirror Plotly’s `event.points[i]` properties, all optional
 /// where appropriate:
 ///
 /// - `curve_number`: The zero-based index of the trace that was clicked.
-/// - `point_numbers`: An optional list of indices if multiple points were selected.
+/// - `point_numbers`: An optional list of indices if multiple points were
+///   selected.
 /// - `point_number`: The index of the specific point clicked (if singular).
 /// - `x`, `y`, `z`: Optional numeric coordinates in data space.
 /// - `lat`, `lon`: Optional geographic coordinates (for map plots).
 ///
 /// # Serialization
 /// Uses `serde` with `camelCase` field names to match Plotly’s JS API.
-
-
-#[derive(Debug,Deserialize,Serialize,Default)]
+#[derive(Debug, Deserialize, Serialize, Default)]
 #[serde(rename_all = "camelCase")]
 pub struct ClickPoint {
     pub curve_number: usize,
@@ -102,41 +101,38 @@ pub struct ClickPoint {
     pub y: Option<f64>,
     pub z: Option<f64>,
     pub lat: Option<f64>,
-    pub lon: Option<f64>
+    pub lon: Option<f64>,
 }
 
-
 /// Provide a default single-point vector for `ClickEvent::points`.
 ///
 /// Returns `vec![ClickPoint::default()]` so deserialization always yields
 /// at least one element rather than an empty vector.
-
-fn default_click_event() -> Vec<ClickPoint> {vec![ClickPoint::default()]}
-
+fn default_click_event() -> Vec<ClickPoint> {
+    vec![ClickPoint::default()]
+}
 
 /// The top-level payload for a Plotly click event.
 ///
-/// - `points`: A `Vec<ClickPoint>` containing all clicked points.
-///   Defaults to the result of `default_click_event` to ensure
-///   `points` is non-empty even if Plotly sends no data.
+/// - `points`: A `Vec<ClickPoint>` containing all clicked points. Defaults to
+///   the result of `default_click_event` to ensure `points` is non-empty even
+///   if Plotly sends no data.
 ///
 /// # Serialization
 /// Uses `serde` with `camelCase` names and a custom default so you can
 /// call `event.points` without worrying about missing values.
-
-#[derive(Debug,Deserialize,Serialize)]
-#[serde(rename_all="camelCase",default)]
+#[derive(Debug, Deserialize, Serialize)]
+#[serde(rename_all = "camelCase", default)]
 pub struct ClickEvent {
-    #[serde(default="default_click_event")]
-    pub points: Vec<ClickPoint>
+    #[serde(default = "default_click_event")]
+    pub points: Vec<ClickPoint>,
 }
 
 /// A `Default` implementation yielding an empty `points` vector.
 ///
 /// Useful when you need a zero-event placeholder (e.g., initial state).
-
 impl Default for ClickEvent {
     fn default() -> Self {
         ClickEvent { points: vec![] }
     }
-}
+}