summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CLI/rust/src/game_of_life.rs5
-rw-r--r--CLI/rust/src/game_of_life/generators/input.rs2
-rw-r--r--CLI/rust/src/game_of_life/simulation/plane.rs2
-rw-r--r--CLI/rust/src/game_of_life/simulation/universe.rs6
4 files changed, 7 insertions, 8 deletions
diff --git a/CLI/rust/src/game_of_life.rs b/CLI/rust/src/game_of_life.rs
index 30da75d..ffbe175 100644
--- a/CLI/rust/src/game_of_life.rs
+++ b/CLI/rust/src/game_of_life.rs
@@ -3,7 +3,8 @@
use clap::{crate_authors, crate_version, App, Arg, Error};
/// Options module for validations and Opts struct
-pub(crate) mod opts; use opts::{validators, Opts};
+pub(crate) mod opts;
+use opts::{validators, Opts};
/// Generators Module to provide interface for generating universes
/// using Seed or File input
@@ -173,8 +174,8 @@ pub(crate) fn generate(opts: Opts) -> Result<Universe, Error> {
#[cfg(test)]
mod generate {
use super::*;
- use mocktopus::mocking::*;
use crate::game_of_life::simulation::plane::Plane;
+ use mocktopus::mocking::*;
fn universe_mock(opts: Opts) -> Universe {
Universe {
diff --git a/CLI/rust/src/game_of_life/generators/input.rs b/CLI/rust/src/game_of_life/generators/input.rs
index cfa2784..8d0ae0d 100644
--- a/CLI/rust/src/game_of_life/generators/input.rs
+++ b/CLI/rust/src/game_of_life/generators/input.rs
@@ -1,5 +1,5 @@
use crate::game_of_life::opts::Opts;
-use crate::game_of_life::simulation::{universe::Universe, plane::Plane};
+use crate::game_of_life::simulation::{plane::Plane, universe::Universe};
use clap::{Error, ErrorKind};
use curl::easy::Easy;
use regex::Regex;
diff --git a/CLI/rust/src/game_of_life/simulation/plane.rs b/CLI/rust/src/game_of_life/simulation/plane.rs
index 10acd43..fad9398 100644
--- a/CLI/rust/src/game_of_life/simulation/plane.rs
+++ b/CLI/rust/src/game_of_life/simulation/plane.rs
@@ -1,5 +1,5 @@
-use std::ops::{Index, IndexMut};
use super::circular_index;
+use std::ops::{Index, IndexMut};
/// Game of Life universe building blocks (a plane is a circular Vec)
///
diff --git a/CLI/rust/src/game_of_life/simulation/universe.rs b/CLI/rust/src/game_of_life/simulation/universe.rs
index 5e5a921..a7a464c 100644
--- a/CLI/rust/src/game_of_life/simulation/universe.rs
+++ b/CLI/rust/src/game_of_life/simulation/universe.rs
@@ -1,8 +1,7 @@
+use super::circular_index;
use crate::game_of_life::opts::Opts;
use crate::game_of_life::simulation::plane::Plane;
use std::ops::Index;
-use super::circular_index;
-
/// Game of Life universe struct for running simulations
#[derive(Debug, Clone, PartialEq)]
@@ -12,8 +11,7 @@ pub(crate) struct Universe {
pub future: Vec<Plane>,
}
-impl Index<isize> for Universe
-{
+impl Index<isize> for Universe {
type Output = Plane;
fn index(&self, idx: isize) -> &Plane {
let len = self.current.len() as isize;