run clippy and fmt

Author: bmatthieu3

src/core/al-core/src/image/mod.rs

@@ -311,7 +311,7 @@ impl Image for ImageType {
                 for image in images {
                     image.insert_into_3d_texture(textures, offset)?
                 }
-            },
+            }
             ImageType::Blob { .. } => unreachable!(),
             ImageType::Canvas { canvas } => canvas.insert_into_3d_texture(textures, offset)?,
             ImageType::ImageRgba8u { image } => image.insert_into_3d_texture(textures, offset)?,

src/core/src/app.rs

@@ -80,7 +80,11 @@ impl ViewHpxCells {
         }
     }
 
-    pub(super) fn get_cells(&self, depth: u8, frame: CooSystem) -> Box<dyn Iterator<Item = HEALPixCell> + '_> {
+    pub(super) fn get_cells(
+        &self,
+        depth: u8,
+        frame: CooSystem,
+    ) -> Box<dyn Iterator<Item = HEALPixCell> + '_> {
         self.hpx_cells[frame as usize].get_cells(depth)
     }
 
@@ -204,21 +208,21 @@ impl HpxCells {
             Box::new(
                 self.cov
                     .flatten_to_fixed_depth_cells()
-                    .map(move |idx| HEALPixCell(depth, idx))
+                    .map(move |idx| HEALPixCell(depth, idx)),
             )
         } else if depth > cov_depth {
             let cov_d = cov_depth;
             let dd = depth - cov_d;
             Box::new(
                 self.cov
                     .flatten_to_fixed_depth_cells()
-                    .flat_map(move |idx| HEALPixCell(cov_d, idx).get_children_cells(dd))
+                    .flat_map(move |idx| HEALPixCell(cov_d, idx).get_children_cells(dd)),
             )
         } else {
             Box::new(
                 degrade((&self.cov.0).into_range_moc_iter(), depth)
                     .flatten_to_fixed_depth_cells()
-                    .map(move |idx| HEALPixCell(depth, idx))
+                    .map(move |idx| HEALPixCell(depth, idx)),
             )
         }
     }

src/core/src/camera/view_hpx_cells.rs

@@ -233,7 +233,11 @@ impl CameraViewPort {
         self.view_hpx_cells.get_cov(frame)
     }
 
-    pub fn get_hpx_cells(&self, depth: u8, frame: CooSystem) -> Box<dyn Iterator<Item = HEALPixCell> + '_> {
+    pub fn get_hpx_cells(
+        &self,
+        depth: u8,
+        frame: CooSystem,
+    ) -> Box<dyn Iterator<Item = HEALPixCell> + '_> {
         self.view_hpx_cells.get_cells(depth, frame)
     }
 

src/core/src/camera/viewport.rs

@@ -2,8 +2,8 @@
 // but contained inside a more specific type of query (e.g. for a tile or allsky)
 pub mod allsky;
 pub mod moc;
-pub mod tile;
 pub mod on_resolved;
+pub mod tile;
 
 use wasm_bindgen_futures::JsFuture;
 
@@ -162,6 +162,7 @@ use wasm_bindgen::JsCast;
 use web_sys::RequestInit;
 use web_sys::RequestMode;
 use web_sys::Response;
+#[allow(dead_code)]
 async fn query_bitmap_from_blob(
     url: &str,
     mode: RequestMode,

src/core/src/downloader/request/mod.rs

@@ -1,21 +1,20 @@
-/// This stores globally a notifier function that wakes up the JS.
-// It ultimately triggers a redraw of the scene.
-
-use std::cell::RefCell;
+//! This stores globally a notifier function that wakes up the JS.
+//! It ultimately triggers a redraw of the scene.
 
 thread_local! {
-    static WAKE_UP_CB: RefCell<Option<js_sys::Function>> = RefCell::new(None);
+    static WAKE_UP_CB: RefCell<Option<js_sys::Function>> = const { RefCell::new(None) };
 }
 
 pub fn set_on_resolved_cb(cb: js_sys::Function) {
     WAKE_UP_CB.with(|f| *f.borrow_mut() = Some(cb));
 }
 
 use crate::JsValue;
+use std::cell::RefCell;
 pub fn call_on_resolved_cb() {
     WAKE_UP_CB.with(|f| {
         if let Some(cb) = f.borrow().as_ref() {
             let _ = cb.call0(&JsValue::NULL);
         }
     });
-}
+}

src/core/src/downloader/request/on_resolved.rs

@@ -8,8 +8,8 @@ use al_core::image::ImageType;
 use super::super::query::CellDesc;
 use super::Url;
 use super::{Request, RequestType};
-use crate::downloader::request::query_html_image;
 use crate::downloader::request::query_blob;
+use crate::downloader::request::query_html_image;
 use crate::downloader::QueryId;
 
 pub struct TileRequest {
@@ -28,7 +28,6 @@ impl From<TileRequest> for RequestType {
     }
 }
 
-use al_core::image::bitmap::Bitmap;
 use al_core::image::html::HTMLImage;
 use wasm_bindgen::JsCast;
 use wasm_bindgen::JsValue;
@@ -74,10 +73,7 @@ impl From<query::Tile> for TileRequest {
                     })*/
                     let blob = query_blob(&url_clone, mode, credentials).await?;
 
-                    Ok(ImageType::Blob {
-                        blob,
-                        size
-                    })
+                    Ok(ImageType::Blob { blob, size })
                 } else {
                     // HTMLImageElement
                     let image = query_html_image(&url_clone, credentials).await?;
@@ -97,10 +93,7 @@ impl From<query::Tile> for TileRequest {
                     })*/
                     let blob = query_blob(&url_clone, mode, credentials).await?;
 
-                    Ok(ImageType::Blob {
-                        blob,
-                        size
-                    })
+                    Ok(ImageType::Blob { blob, size })
                 } else {
                     // HTMLImageElement
                     let image = query_html_image(&url_clone, credentials).await?;

src/core/src/downloader/request/tile.rs

@@ -86,7 +86,6 @@ mod utils;
 
 pub mod worker;
 
-
 use math::projection::*;
 
 //use votable::votable::VOTableWrapper;
@@ -207,17 +206,20 @@ impl WebClient {
     }
 
     #[wasm_bindgen(js_name = poll)]
-    pub fn poll(&mut self, dt: f64, pan: Option<Box<[f64]>>, zoom: Option<f64>) -> Result<PollInfo, JsValue> {
+    pub fn poll(
+        &mut self,
+        dt: f64,
+        pan: Option<Box<[f64]>>,
+        zoom: Option<f64>,
+    ) -> Result<PollInfo, JsValue> {
         // dt refers to the time taking (in ms) rendering the previous frame
         //self.dt = DeltaTime::from_millis(dt as f32);
 
         // Update the application and get back the
         // world coordinates of the center of projection in (ra, dec)
         self.app.poll(
             // Time of the previous frame rendering
-            dt,
-            pan,
-            zoom
+            dt, pan, zoom,
         )
     }
 
@@ -371,11 +373,7 @@ impl WebClient {
     }
 
     #[wasm_bindgen(js_name = isHDUVisible)]
-    pub fn is_hdu_visible(
-        &self,
-        layer: String,
-        hdu_id: usize,
-    ) -> Result<bool, JsValue> {
+    pub fn is_hdu_visible(&self, layer: String, hdu_id: usize) -> Result<bool, JsValue> {
         self.app.is_hdu_visible(layer.as_str(), hdu_id)
     }
 
@@ -386,7 +384,7 @@ impl WebClient {
         hdu_id: usize,
         visible: bool,
     ) -> Result<(), JsValue> {
-       self.app.make_hdu_visible(layer.as_str(), hdu_id, visible)
+        self.app.make_hdu_visible(layer.as_str(), hdu_id, visible)
     }
 
     #[wasm_bindgen(js_name = addRGBAImage)]