Remove unnecessary nested module

Author: alexdewar

src/highs_example_rust/constraint.rs renamed to src/constraint.rs

@@ -1,5 +1,5 @@
 //! Provides functionality for optimisation constraints.
-use super::variable_definition::VariableDefinition;
+use crate::variable_definition::VariableDefinition;
 use polars::prelude::*;
 use std::path::Path;
 

src/main.rs

@@ -1,6 +1,13 @@
 //! Provides the main entry point to the highs_example_rust program.
 
-mod highs_example_rust;
+mod constraint;
+mod optimisation;
+mod settings;
+mod solver;
+mod variable_definition;
+
+#[cfg(test)]
+mod test_common;
 
 use std::env;
 use std::path::Path;
@@ -12,5 +19,5 @@ fn main() {
         panic!("Must provide path to model configuration TOML file.");
     }
 
-    highs_example_rust::run(Path::new(&args[1]))
+    optimisation::run(Path::new(&args[1]))
 }

src/highs_example_rust.rs renamed to src/optimisation.rs

@@ -1,14 +1,6 @@
 //! The main crate for highs_example_rust. This contains all of MUSE's functionality.
-pub mod constraint;
-mod settings;
-mod solver;
-pub mod variable_definition;
-
-#[cfg(test)]
-pub mod test_common;
-
-use settings::read_settings;
-use solver::{solve_highs, Sense};
+use crate::settings::read_settings;
+use crate::solver::{solve_highs, Sense};
 use std::path::Path;
 
 /// Run an optimisation.

src/highs_example_rust/settings.rs renamed to src/settings.rs

@@ -1,6 +1,6 @@
 //! Data structures representing settings files and a function for reading them.
-use super::constraint::Constraint;
-use super::variable_definition::VariableDefinition;
+use crate::constraint::Constraint;
+use crate::variable_definition::VariableDefinition;
 use std::path::Path;
 
 use serde::Deserialize;

src/highs_example_rust/solver.rs renamed to src/solver.rs

@@ -1,6 +1,6 @@
 //! Provides data structures and functions for performing optimisation.
-use super::constraint::Constraint;
-use super::variable_definition::VariableDefinition;
+use crate::constraint::Constraint;
+use crate::variable_definition::VariableDefinition;
 pub use highs::Sense;
 use highs::{HighsModelStatus, RowProblem};
 

src/highs_example_rust/test_common.rs renamed to src/test_common.rs

@@ -1,6 +1,6 @@
 //! Common functionality used by tests.
-use super::constraint::Constraint;
-use super::variable_definition::VariableDefinition;
+use crate::constraint::Constraint;
+use crate::variable_definition::VariableDefinition;
 use std::f64::INFINITY;
 use std::path::{Path, PathBuf};
 
@@ -11,8 +11,6 @@ pub fn get_example_path() -> PathBuf {
         .unwrap()
         .parent()
         .unwrap()
-        .parent()
-        .unwrap()
         .join("example")
 }
 

src/highs_example_rust/variable_definition.rs renamed to src/variable_definition.rs

@@ -1,5 +1,4 @@
 //! Provides variable definition data structures for optimisation.
-use csv;
 use serde::Deserialize;
 use std::path::Path;