Group imports

diff --git a/src/common.rs b/src/common.rs
index f22fbfd..ab6774b 100644 (file)
--- a/src/common.rs
+++ b/src/common.rs
@@ -1,6 +1,4 @@
-use std::fs;\r
-use std::path::Path;\r
-use std::str::FromStr;\r
+use std::{fs, path::Path, str::FromStr};\r

 \r
 pub fn read_list_of_numbers<P, T>(file: P, sep: &str) -> Vec<T>\r
 where\r
 \r
 pub fn read_list_of_numbers<P, T>(file: P, sep: &str) -> Vec<T>\r
 where\r

diff --git a/src/day03.rs b/src/day03.rs
index 808f6f9..cb50f8a 100644 (file)
--- a/src/day03.rs
+++ b/src/day03.rs
@@ -1,7 +1,4 @@
-use std::iter::Iterator;\r
-use std::iter::FromIterator;\r
-use std::collections::HashSet;\r
-use std::collections::HashMap;\r
+use std::{collections::{HashMap, HashSet}, iter::{Iterator, FromIterator}};\r

 \r
 pub fn split_movements(movements: &str) -> Vec<&str> {\r
     movements.split(',').collect()\r
 \r
 pub fn split_movements(movements: &str) -> Vec<&str> {\r
     movements.split(',').collect()\r

diff --git a/src/day04.rs b/src/day04.rs
index 53a8c24..5f66df4 100644 (file)
--- a/src/day04.rs
+++ b/src/day04.rs
@@ -58,7 +58,7 @@ fn nb_passwords(min: i32, max: i32, valid_password: &dyn Fn(&Digits) -> bool) ->
 \r
     fn set_range(from: usize, to: usize, value: u8, digits: &mut Digits) {\r
         for d in &mut digits[from .. to] { *d = value; }\r
 \r
     fn set_range(from: usize, to: usize, value: u8, digits: &mut Digits) {\r
         for d in &mut digits[from .. to] { *d = value; }\r

-    };\r
+    }\r

 \r
     for i in (1 .. l).rev() {\r
         if digits[i - 1] < digits[i] {\r
 \r
     for i in (1 .. l).rev() {\r
         if digits[i - 1] < digits[i] {\r

diff --git a/src/day06.rs b/src/day06.rs
index c0d4ae0..1ff649d 100644 (file)
--- a/src/day06.rs
+++ b/src/day06.rs
@@ -1,5 +1,4 @@
-use std::collections::HashMap;
-use std::cmp;
+use std::{cmp, collections::HashMap};

 
 // All planets indexing their parent (planet -> parent).
 type Orbits = HashMap<String, String>;
 
 // All planets indexing their parent (planet -> parent).
 type Orbits = HashMap<String, String>;

diff --git a/src/day07.rs b/src/day07.rs
index 61a370a..1ab98f7 100644 (file)
--- a/src/day07.rs
+++ b/src/day07.rs
@@ -1,8 +1,10 @@
-use super::intcode;\r
+use std::sync::{Arc, Barrier, mpsc::{self, Sender, Receiver}, atomic::{AtomicI64, Ordering}};\r
+\r

 use itertools::Itertools;\r
 use itertools::Itertools;\r

-use std::sync::{ Arc, Barrier, mpsc::{ self, Sender, Receiver }, atomic::{ AtomicI64, Ordering } };\r

 use threadpool::ThreadPool;\r
 \r
 use threadpool::ThreadPool;\r
 \r

+use super::intcode;\r
+\r

 fn last_thruster_signal(code: &[i64], phase_setting: &[i64]) -> i64 {\r
     phase_setting.iter().fold(0, |last_output, input| intcode::execute_op_code(&code, &[*input, last_output])[0])\r
 }\r
 fn last_thruster_signal(code: &[i64], phase_setting: &[i64]) -> i64 {\r
     phase_setting.iter().fold(0, |last_output, input| intcode::execute_op_code(&code, &[*input, last_output])[0])\r
 }\r

diff --git a/src/day11.rs b/src/day11.rs
index 2320722..8847bb1 100644 (file)
--- a/src/day11.rs
+++ b/src/day11.rs
@@ -1,4 +1,5 @@
 use std::collections::HashMap;\r
 use std::collections::HashMap;\r

+\r

 use super::intcode;\r
 \r
 enum NextCommand {\r
 use super::intcode;\r
 \r
 enum NextCommand {\r

diff --git a/src/day12.rs b/src/day12.rs
index fbfe5de..db95447 100644 (file)
--- a/src/day12.rs
+++ b/src/day12.rs
@@ -1,5 +1,4 @@
-use std::ops::AddAssign;
-use std::cmp::Ordering;
+use std::{cmp::Ordering, ops::AddAssign};

 
 #[derive(Debug, Copy, Clone)]
 pub struct Vector3D {
 
 #[derive(Debug, Copy, Clone)]
 pub struct Vector3D {

diff --git a/src/day13.rs b/src/day13.rs
index edf2132..286791b 100644 (file)
--- a/src/day13.rs
+++ b/src/day13.rs
@@ -1,9 +1,10 @@
-use super::intcode;
-use std::cmp::Ordering;
-use std::convert::TryFrom;
+use std::{cmp::Ordering, convert::TryFrom};
+

 use itertools::Itertools;
 use num_enum::TryFromPrimitive;
 
 use itertools::Itertools;
 use num_enum::TryFromPrimitive;
 

+use super::intcode;
+

 // Not neccesary, to try to parse enum in Rust.
 #[derive(Debug, Eq, PartialEq, TryFromPrimitive)]
 #[repr(u8)]
 // Not neccesary, to try to parse enum in Rust.
 #[derive(Debug, Eq, PartialEq, TryFromPrimitive)]
 #[repr(u8)]

diff --git a/src/day15.rs b/src/day15.rs
index e6286e2..2af8e3c 100644 (file)
--- a/src/day15.rs
+++ b/src/day15.rs
@@ -1,7 +1,6 @@
+use std::{collections::{HashMap, HashSet}, iter::FromIterator};\r
+\r

 use super::intcode;\r
 use super::intcode;\r

-use std::iter::FromIterator;\r
-use std::collections::HashMap;\r
-use std::collections::HashSet;\r

 \r
 #[derive(Debug, Eq, PartialEq, Copy, Clone)]\r
 enum LocationState {\r
 \r
 #[derive(Debug, Eq, PartialEq, Copy, Clone)]\r
 enum LocationState {\r

diff --git a/src/day17.rs b/src/day17.rs
index 75ed1a9..c3c3917 100644 (file)
--- a/src/day17.rs
+++ b/src/day17.rs
@@ -1,8 +1,8 @@
-use super::intcode;\r
+use std::{collections::HashSet, convert::TryFrom, ops::Range};\r
+\r

 use itertools::Itertools;\r
 use itertools::Itertools;\r

-use std::collections::HashSet;\r
-use std::convert::TryFrom;\r
-use std::ops::Range;\r
+\r
+use super::intcode;\r

 \r
 #[derive(PartialEq, Eq, Copy, Clone, Debug)]\r
 enum Direction { Up, Left, Down, Right }\r
 \r
 #[derive(PartialEq, Eq, Copy, Clone, Debug)]\r
 enum Direction { Up, Left, Down, Right }\r

diff --git a/src/intcode.rs b/src/intcode.rs
index ff3e34b..fee58ca 100644 (file)
--- a/src/intcode.rs
+++ b/src/intcode.rs
@@ -73,7 +73,7 @@ pub fn execute_op_code_with_custom_io(code: &[i64], io: &mut dyn IO) {
             Mode::Immediate => code[position],\r
             Mode::Relative => if (code[position] + relative_base) as usize >= code.len() { 0 } else { code[(code[position] + relative_base) as usize] }\r
         }\r
             Mode::Immediate => code[position],\r
             Mode::Relative => if (code[position] + relative_base) as usize >= code.len() { 0 } else { code[(code[position] + relative_base) as usize] }\r
         }\r

-    };\r
+    }\r

 \r
     fn write(position: usize, value: i64, code: &mut Vec<i64>, mode: Mode, relative_base: i64) {\r
         let ref_position =\r
 \r
     fn write(position: usize, value: i64, code: &mut Vec<i64>, mode: Mode, relative_base: i64) {\r
         let ref_position =\r


@@ -97,7 +97,7 @@ pub fn execute_op_code_with_custom_io(code: &[i64], io: &mut dyn IO) {
         } else {\r
             cursor + 3\r
         }\r
         } else {\r
             cursor + 3\r
         }\r

-    };\r
+    }\r

 \r
     loop {\r
         if io.halt() { break; }\r
 \r
     loop {\r
         if io.halt() { break; }\r