Merge pull request #68 from Janekdererste/#67_clippy_issues

#67 remove errors pointed out by clippy

Author: paulheinr

src/simulation/io/network.rs

@@ -146,7 +146,7 @@ impl IONetwork {
 
         // to make via swollow this, it neads an xml tag, as well as a dtd header.
         let network_header = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE network SYSTEM \"http://www.matsim.org/files/dtd/network_v2.dtd\">";
-        writer.write(network_header.as_ref()).unwrap();
+        writer.write_all(network_header.as_ref()).unwrap();
 
         // write the actual network
         to_writer(writer, self).unwrap();

src/simulation/routing/road_router.rs

@@ -235,8 +235,10 @@ pub(self) fn find_edge_id_of_outgoing(
     next_node: NodeId,
     network: &RoutingKitNetwork,
 ) -> u64 {
-    //TODO this is marked as unnecessary comparison - why?
-    assert!(last_out_index - first_out_index >= 0, "No outgoing edges!");
+    assert!(
+        last_out_index as i64 - first_out_index as i64 >= 0,
+        "No outgoing edges!"
+    );
     let mut result = None;
     for i in first_out_index..=last_out_index {
         if *network.head.get(i).unwrap() == next_node {

src/simulation/simulation.rs

@@ -105,16 +105,14 @@ impl<'sim> Simulation<'sim> {
             );
 
             if self.router.is_some() {
-                if !agent.curr_act().is_interaction() && agent.next_act().is_interaction() {
-                    self.update_walk_leg(&mut agent);
-                } else if agent.curr_act().is_interaction() && !agent.next_act().is_interaction() {
+                if (!agent.curr_act().is_interaction() && agent.next_act().is_interaction())
+                    || (agent.curr_act().is_interaction() && !agent.next_act().is_interaction())
+                {
                     self.update_walk_leg(&mut agent);
                 } else if agent.curr_act().is_interaction() && agent.next_act().is_interaction() {
                     self.update_main_leg(&mut agent);
                 } else {
-                    panic!(
-                        "Computing a leg between two interaction activities should never happen."
-                    )
+                    panic!("Computing a leg between two main activities should never happen.")
                 }
             }