Merge pull request #25 from OSCPS-Project/linter_fix

Linter fix

Author: bhargavakula01

oscps-lib/src/blocks.rs

@@ -42,7 +42,7 @@ pub trait MassBalance {
         let mass_in_kg = mass_in.get::<kilogram>();
         let mass_out_kg = mass_out.get::<kilogram>();
         let mass_difference = mass_in_kg - mass_out_kg;
-        return mass_difference <= TOLERENCE_MASS.get::<kilogram>();
+        mass_difference <= TOLERENCE_MASS.get::<kilogram>()
     }
 }
 
@@ -62,9 +62,7 @@ pub trait EnergyBalance {
         let energy_in_joules = energy_in.get::<joule>();
         let energy_out_joules = energy_out.get::<joule>();
         let energy_difference = energy_in_joules - energy_out_joules;
-        let within_threshold = energy_difference <= 
-            TOLERENCE_ENERGY.get::<joule>();
-        return within_threshold;
+        energy_difference <= TOLERENCE_ENERGY.get::<joule>()
     }
 }
 
@@ -106,15 +104,15 @@ impl Mixer {
         in_streams_mass: Vec<connector::Mconnector>,
         in_streams_energy: Vec<connector::Econnector>,
     ) -> Mixer {
-        return Mixer {
+        Mixer {
             block_id: id,
             x_cord,
             y_cord,
             input_streams_mass: in_streams_mass,
             input_streams_energy: in_streams_energy,
             outlet_stream_mass: None,
             outlet_stream_energy: None,
-        };
+        }
     }
 
     /// Execute the mixer block (calculate balances, output streams, etc)
@@ -143,19 +141,19 @@ impl Mixer {
         let mut mass_flow_sum: f64 = 0.0;
 
         for stream in &self.input_streams_mass {
-            mass_flow_sum = mass_flow_sum + stream.m_flow_total;
+            mass_flow_sum += stream.m_flow_total;
         }
-        return Some(mass_flow_sum);
+        Some(mass_flow_sum)
     }
 
     /// Determines the total energy flowing through the block
     fn compute_outlet_energy_flows(&self) -> Option<f64> {
         let mut energy_flow_sum: f64 = 0.0;
 
         for stream in &self.input_streams_energy {
-            energy_flow_sum = energy_flow_sum + stream.energy_flow_total;
+            energy_flow_sum += stream.energy_flow_total;
         }
-        return Some(energy_flow_sum);
+        Some(energy_flow_sum)
     }
 
     /// Determines the phase fractions of the output using thermodynamics.

oscps-lib/src/component.rs

@@ -54,7 +54,7 @@ impl Chemical {
                     break;
                 },
                 _ => {
-                    request_counter = request_counter + 1;
+                    request_counter += 1;
                     thread::sleep(Duration::from_secs(10));
                 }
             };
@@ -63,19 +63,19 @@ impl Chemical {
         // let cid_vec = pubchem_chemical_object.cids().unwrap();
         let cid: i32 = cid_vec.unwrap()[0];
         let prop = ChemicalProperties::new(cid).unwrap();
-        return Ok(Chemical {
+        Ok(Chemical {
             pubchem_obj: pubchem_chemical_object,
             properties: prop,
-        });
+        })
     }
     /// Returns the pubchem object for the compound.
     pub fn get_pubchem_obj(&self) -> &pubchem::Compound {
-        return &self.pubchem_obj;
+        &self.pubchem_obj
     }
 
     /// Returns the "ChemicalProperties" object for the "Chemical" object.
     pub fn get_properties(&self) -> &ChemicalProperties {
-        return &self.properties;
+        &self.properties
     }
 }
 
@@ -97,12 +97,12 @@ impl ChemicalProperties {
     /// Constructor for the ChemicalProperties struct.
     pub fn new(cid: i32) -> Result<Self> {
         println!("Recieving information for compound/element {cid}");
-        return Ok(ChemicalProperties {
+        Ok(ChemicalProperties {
             molar_mass: 0.0,        // kg/mol
             critical_temp: 0.0,     // K
             critical_pressure: 0.0, // Pa
             acentric_factor: 0.0,
-        });
+        })
     }
 }
 

oscps-lib/src/connector.rs

@@ -22,10 +22,10 @@ pub struct Mconnector {
 impl Mconnector {
     /// Constructor for a connector.
     pub fn new(id: String) -> Mconnector {
-        return Mconnector {
+        Mconnector {
             m_conn_id: id,
             m_flow_total: 0.0,
-        };
+        }
     }
 }
 
@@ -46,9 +46,9 @@ pub struct Econnector {
 impl Econnector {
     /// Constructor for a connector.
     pub fn new(id: String) -> Econnector {
-        return Econnector {
+        Econnector {
             e_conn_id: id,
             energy_flow_total: 0.0,
-        };
+        }
     }
 }