Use unstable Crate rustfmt option

rustfmt.toml

@@ -1,2 +1,2 @@
-# unstable_features = true
+unstable_features = true
-# imports_granularity = "Crate"
+imports_granularity = "Crate"

src/color.rs

@@ -1,7 +1,5 @@
-use serde::Deserialize;
+use serde::{Deserialize, Serialize};
-use serde::Serialize;
+use std::{num::ParseIntError, str::FromStr};
-use std::num::ParseIntError;
-use std::str::FromStr;
 
 #[derive(Copy, Clone, Debug, PartialEq, Deserialize, Serialize, Default)]
 pub struct Rgb(pub u8, pub u8, pub u8);

src/errors.rs

@@ -1,6 +1,5 @@
 use core::any::Any;
-use std::fmt;
+use std::{fmt, io};
-use std::io;
 
 pub type ProgramResult<T> = Result<T, ProgramError>;
 

src/main.rs

@@ -36,10 +36,12 @@ mod template;
 mod ui;
 mod webui;
 use errors::{ProgramError, ProgramResult};
-use std::io;
+use std::{
-use std::io::Write;
+    io,
-use std::sync::mpsc::{channel, Sender};
+    io::Write,
-use std::thread;
+    sync::mpsc::{channel, Sender},
+    thread,
+};
 use strip::LedStrip;
 use ui::console_ui_loop;
 

src/pattern.rs

@@ -1,7 +1,6 @@
 use crate::color::Rgb;
 use serde::{Deserialize, Serialize};
 use std::collections::vec_deque;
-use std::iter;
 
 pub mod collide;
 pub mod fade;
@@ -66,7 +65,7 @@ impl InputRender for Rgb {
 impl InputRender for Vec<Rgb> {
     fn render(&self, name: &str, _multi_index: Option<usize>) -> String {
         self.iter()
-            .chain(iter::once(&Rgb::default()))
+            // .chain(iter::once(&Rgb::default()))
             .enumerate()
             .fold(String::new(), |acc, (i, c)| {
                 acc + &c.render(name, Some(i)) + "\n"

src/pattern/collide.rs

@@ -1,8 +1,7 @@
 use super::{FormRender, InputRender, Pattern};
 use crate::color::{self, Rgb};
 use serde::{Deserialize, Serialize};
-use std::collections::vec_deque;
+use std::collections::{vec_deque, VecDeque};
-use std::collections::VecDeque;
 
 #[derive(Serialize, Deserialize, Clone, Debug)]
 pub struct CollideParams {

src/pattern/fade.rs

@@ -1,9 +1,10 @@
 use super::{FormRender, InputRender, Pattern};
 use crate::color::{self, merge_colors_u8, Rgb};
 use serde::{Deserialize, Serialize};
-use std::collections::vec_deque;
+use std::{
-use std::collections::VecDeque;
+    collections::{vec_deque, VecDeque},
-use std::iter;
+    iter,
+};
 
 #[derive(Serialize, Deserialize, Clone, Debug)]
 pub struct FadeParams {

src/pattern/moving_pixel.rs

@@ -1,8 +1,7 @@
 use super::{FormRender, InputRender, Pattern};
 use crate::color::{self, Rgb};
 use serde::{Deserialize, Serialize};
-use std::collections::vec_deque;
+use std::collections::{vec_deque, VecDeque};
-use std::collections::VecDeque;
 
 #[derive(Serialize, Deserialize, Clone, Debug)]
 pub struct MovingPixelParams {

src/pattern/moving_rainbow.rs

@@ -1,9 +1,11 @@
 use super::{FormRender, InputRender, Pattern};
 use crate::color::{self, Rgb, RAINBOW};
 use serde::{Deserialize, Serialize};
-use std::collections::{vec_deque, VecDeque};
+use std::{
-use std::convert::TryFrom;
+    collections::{vec_deque, VecDeque},
-use std::iter;
+    convert::TryFrom,
+    iter,
+};
 
 #[derive(Serialize, Deserialize, Clone, Debug)]
 pub struct MovingRainbowParams {

src/pattern/orb.rs

@@ -1,9 +1,10 @@
 use super::{FormRender, InputRender, Pattern};
 use crate::color::{self, Rgb};
 use serde::{Deserialize, Serialize};
-use std::collections::vec_deque;
+use std::{
-use std::collections::VecDeque;
+    collections::{vec_deque, VecDeque},
-use std::iter;
+    iter,
+};
 
 #[derive(Serialize, Deserialize, Clone, Debug)]
 pub struct OrbParams {

src/pattern/solid.rs

@@ -1,8 +1,7 @@
 use super::{FormRender, InputRender, Pattern};
 use crate::color::{self, Rgb};
 use serde::{Deserialize, Serialize};
-use std::collections::vec_deque;
+use std::collections::{vec_deque, VecDeque};
-use std::collections::VecDeque;
 
 #[derive(Serialize, Deserialize, Clone, Debug)]
 pub struct SolidParams {

src/strip.rs

@@ -1,14 +1,17 @@
-use crate::color;
+use crate::{
-use crate::errors;
+    color, errors,
-use crate::errors::ProgramError;
+    errors::ProgramError,
-use crate::pattern::{self, Pattern};
+    pattern::{self, Pattern},
-use std::cmp;
+};
-use std::ops::Add;
+use std::{
-use std::process;
+    cmp,
-use std::sync::mpsc::{Receiver, Sender};
+    ops::Add,
-use std::time::{Duration, Instant};
+    process,
-use ws2818_rgb_led_spi_driver::adapter_gen::Ws28xxAdapter;
+    sync::mpsc::{Receiver, Sender},
-use ws2818_rgb_led_spi_driver::adapter_spi::Ws28xxSpiAdapter;
+    thread,
+    time::{Duration, Instant},
+};
+use ws2818_rgb_led_spi_driver::{adapter_gen::Ws28xxAdapter, adapter_spi::Ws28xxSpiAdapter};
 
 /// Maximum number of lights allowed
 const MAX_NUM_LIGHTS: u16 = 128;

src/template.rs

@@ -1,5 +1,7 @@
-use crate::pattern::{FormRender, Parameters};
+use crate::{
-use crate::strip;
+    pattern::{FormRender, Parameters},
+    strip,
+};
 use std::sync::{mpsc::Sender, Arc, Mutex};
 
 #[derive(askama::Template, Clone, Debug, Default)]

src/ui.rs

@@ -1,10 +1,10 @@
-use crate::color::Rgb;
+use crate::{
-use crate::errors::{self, ProgramError, ProgramResult};
+    color::Rgb,
-use crate::pattern::{self, Pattern};
+    errors::{self, ProgramError, ProgramResult},
-use crate::strip;
+    pattern::{self, Pattern},
-use std::io;
+    strip,
-use std::io::Write;
+};
-use std::sync::mpsc::Sender;
+use std::{io, io::Write, sync::mpsc::Sender};
 
 pub fn console_ui_loop(
     message_tx: &Sender<errors::Message>,

src/webui.rs

@@ -1,20 +1,21 @@
-use crate::errors;
+use crate::{
-use crate::pattern;
+    errors, pattern, strip,
-use crate::strip;
+    template::{AppTemplate, ControlTemplate},
-use crate::template::{AppTemplate, ControlTemplate};
+};
 use actix_web::HttpResponse;
 use actix_web_actors::ws;
 use live_view::{LiveView, StateSocket, Template};
 
-use actix_web::HttpRequest;
 use actix_web::{
     error::{ErrorInternalServerError, JsonPayloadError, UrlencodedError},
     get, post, web,
     web::JsonConfig,
-    App, HttpServer, Responder, Result,
+    App, HttpRequest, HttpServer, Responder, Result,
+};
+use std::{
+    io,
+    sync::{mpsc::Sender, Arc, Mutex},
 };
-use std::io;
-use std::sync::{mpsc::Sender, Arc, Mutex};
 
 struct AppState {
     strip_tx: Arc<Mutex<Sender<strip::Message>>>,