A couple more cleanups before cargo publish.

Author: AldaronLau

Cargo.toml

@@ -34,8 +34,8 @@ stronghold = {version = "0.2", optional = true} # file
 serde = {version = "1.0", optional = true}
 stick = {version = "0.7", optional = true} # joystick / controller
 # barg = {version = "0.2", optional = true} # video
-window = {optional = true, path = "../window"}
-fonterator = {version = "0.5", optional = true, default-features = false, features = ["normal-font"]}
+window = {version = "0.3", optional = true}
+fonterator = {version = "0.6", optional = true, default-features = false, features = ["normal-font"]}
 rvg = {version = "0.0.2", optional = true, features = ["footile"]}
 chrono = {version = "0.4", optional = true} # clock
 

changelog.md

@@ -8,12 +8,12 @@ and this project adheres to [Semantic Versioning](https://code.plopgrizzly.com/s
 ### TODO
 - Possibly redesign the controller API to be event based using a message queue.
 
-## [0.6.0] - 2019-10-24
+## [0.6.0] - 2019-10-25
 ### Added
 - `aspect()` for getting aspect ratio
 
 ### Fixed
-- Some warnings
+- All of warnings, including clippy warnings
 
 ### Changed
 - Replaced instances with groups.

src/clock.rs

@@ -44,6 +44,9 @@ impl Duration {
 impl Div<i32> for Duration {
     type Output = Duration;
 
+    // This is a fraction, so multiplication is in fact the machine operation to
+    // use, even though it's the division operator.
+    #[allow(clippy::suspicious_arithmetic_impl)]
     fn div(mut self, mut other: i32) -> Self::Output {
         if other.is_negative() {
             self.seconds = -self.seconds;
@@ -171,8 +174,8 @@ impl Clock {
         sec: u8,
     ) -> Option<Self> {
         let date = chrono::offset::Utc
-            .ymd(year, month as u32, day as u32)
-            .and_hms(hour as u32, min as u32, sec as u32);
+            .ymd(year, u32::from(month), u32::from(day))
+            .and_hms(u32::from(hour), u32::from(min), u32::from(sec));
 
         Some(Clock(date.naive_utc()))
     }
@@ -191,8 +194,8 @@ impl Clock {
         sec: u8,
     ) -> Option<Self> {
         let date = chrono::offset::Local
-            .ymd(year, month as u32, day as u32)
-            .and_hms(hour as u32, min as u32, sec as u32)
+            .ymd(year, u32::from(month), u32::from(day))
+            .and_hms(u32::from(hour), u32::from(min), u32::from(sec))
             .with_timezone(&chrono::Utc);
 
         Some(Clock(date.naive_utc()))
@@ -256,10 +259,10 @@ impl Clock {
         .unwrap();
 
         // Multiply time by reciprocal fraction (numerator).
-        let frac_den = frac.denominator as i128;
-        let frac_num = frac.seconds as i128;
-        let seconds = seconds as i128 * frac_num;
-        let nanos = nanos as i128 * frac_num;
+        let frac_den = i128::from(frac.denominator);
+        let frac_num = i128::from(frac.seconds);
+        let seconds = i128::from(seconds) * frac_num;
+        let nanos = i128::from(nanos) * frac_num;
 
         // Denominator
         let seconds_remaining = seconds % frac_den; // what couldn't be divided
@@ -272,6 +275,12 @@ impl Clock {
     }
 }
 
+impl Default for Clock {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 impl Debug for Clock {
     fn fmt(&self, f: &mut Formatter) -> Result {
         write!(f, "{}", self.0)

src/icons.rs

@@ -3,19 +3,19 @@
 use fonterator::footile;
 use rvg::*;
 
-const BACK: &'static [u8] = include_bytes!("../rvg/back.svg.rvg");
-const EXIT: &'static [u8] = include_bytes!("../rvg/exit.svg.rvg");
-const FULLSCREEN: &'static [u8] = include_bytes!("../rvg/fullscreen.svg.rvg");
-const GRID: &'static [u8] = include_bytes!("../rvg/grid.svg.rvg");
-const HIDE: &'static [u8] = include_bytes!("../rvg/hide.svg.rvg");
-const MENU: &'static [u8] = include_bytes!("../rvg/menu.svg.rvg");
-const MORE: &'static [u8] = include_bytes!("../rvg/more.svg.rvg");
-const NEW: &'static [u8] = include_bytes!("../rvg/new.svg.rvg");
-const NEXT: &'static [u8] = include_bytes!("../rvg/next.svg.rvg");
-const SEARCH: &'static [u8] = include_bytes!("../rvg/search.svg.rvg");
-const VIEW: &'static [u8] = include_bytes!("../rvg/view.svg.rvg");
-const ZOOM_IN: &'static [u8] = include_bytes!("../rvg/zoom_in.svg.rvg");
-const ZOOM_OUT: &'static [u8] = include_bytes!("../rvg/zoom_out.svg.rvg");
+const BACK: &[u8] = include_bytes!("../rvg/back.svg.rvg");
+const EXIT: &[u8] = include_bytes!("../rvg/exit.svg.rvg");
+const FULLSCREEN: &[u8] = include_bytes!("../rvg/fullscreen.svg.rvg");
+const GRID: &[u8] = include_bytes!("../rvg/grid.svg.rvg");
+const HIDE: &[u8] = include_bytes!("../rvg/hide.svg.rvg");
+const MENU: &[u8] = include_bytes!("../rvg/menu.svg.rvg");
+const MORE: &[u8] = include_bytes!("../rvg/more.svg.rvg");
+const NEW: &[u8] = include_bytes!("../rvg/new.svg.rvg");
+const NEXT: &[u8] = include_bytes!("../rvg/next.svg.rvg");
+const SEARCH: &[u8] = include_bytes!("../rvg/search.svg.rvg");
+const VIEW: &[u8] = include_bytes!("../rvg/view.svg.rvg");
+const ZOOM_IN: &[u8] = include_bytes!("../rvg/zoom_in.svg.rvg");
+const ZOOM_OUT: &[u8] = include_bytes!("../rvg/zoom_out.svg.rvg");
 
 pub fn text(
     pixels: &mut [footile::Rgba8],
@@ -27,13 +27,14 @@ pub fn text(
     let graphic_h = graphic_h / 2;
 
     // Render
-    let mut p = footile::Plotter::new(width as u32, graphic_h as u32 * 2);
+    let mut p =
+        footile::Plotter::new(u32::from(width), u32::from(graphic_h) * 2);
     let r = footile::RasterB::new(p.width(), p.height());
     let path: Vec<_> = font
         .render(
-            text,                                       /*text*/
-            (0.0, 0.0, width as f32, graphic_h as f32), /*bbox*/
-            (graphic_h as f32, graphic_h as f32),       /*size*/
+            text,                                               /*text*/
+            (0.0, 0.0, f32::from(width), f32::from(graphic_h)), /*bbox*/
+            (f32::from(graphic_h), f32::from(graphic_h)),       /*size*/
             fonterator::TextAlign::Center,
         )
         .0
@@ -44,7 +45,7 @@ pub fn text(
         unsafe {
             std::slice::from_raw_parts_mut(
                 pixels.as_mut_ptr(),
-                width as usize * graphic_h as usize * 2,
+                usize::from(width) * usize::from(graphic_h) * 2,
             )
         },
     );
@@ -62,7 +63,7 @@ fn half(
     let ad = (graphic_h / 2) - (margin);
 
     let offs = if x > 6 {
-        x = x - 6;
+        x -= 6;
         width - (8 * ad)
     } else {
         0
@@ -82,7 +83,7 @@ fn full(
     let ad = (graphic_h / 2) - (margin);
 
     let offs = if x > 6 {
-        x = x - 6;
+        x -= 6;
         width - (8 * ad)
     } else {
         0

src/internal/barg.rs

@@ -71,7 +71,7 @@ impl Shader {
 fn toolbar(buffer: &mut [u8], width: u16) {
     let height = buffer.len() / (4 * width as usize);
     let size = (width, height as u16);
-    let mut p = fonterator::footile::Plotter::new(size.0 as u32, size.1 as u32);
+    let mut p = fonterator::footile::Plotter::new(u32::from(size.0), u32::from(size.1));
     let image = fonterator::footile::RasterB::new(p.width(), p.height());
 
     use fonterator::PathOp::*;

src/timer.rs

@@ -9,6 +9,7 @@ pub struct TimedLoop {
 
 impl TimedLoop {
     /// Seconds and nanoseconds (1 / 1_000_000_000 of a second).
+    #[allow(clippy::cast_lossless)] // const fn doesn't support u64::from() yet
     pub const fn new(secs: u32, nanos: u32) -> TimedLoop {
         let whol = secs as u64 * 1_000_000_000u64;
         let frac = nanos as u64;