updates, clippy, formatting

[Mitarbeiter/Tim-Zeitz/stud-rust-base.git] / src / bin / example.rs

diff --git a/src/bin/example.rs b/src/bin/example.rs
index 775d2ca7a85aadccd1b47976cb7b5b4904970ea1..e1eb51f5362223956d84d3ddee8d86ef6c51d088 100644 (file)
--- a/src/bin/example.rs
+++ b/src/bin/example.rs
@@ -1,30 +1,26 @@
-extern crate stud_rust_base;
+use stud_rust_base::{io::*, time::report_time, types::*};
 
-use stud_rust_base::{
-    types::*,
-    io::*,
-    time::report_time,
-};
+use std::{env, error::Error, path::Path};
 
-use std::{env, path::Path};
-
-fn main() {
-    let mut args = env::args();
-    args.next();
-
-    let arg = &args.next().expect("No directory arg given");
+fn main() -> Result<(), Box<dyn Error>> {
+    let arg = &env::args().nth(1).expect("No directory arg given");
     let path = Path::new(arg);
 
-    let first_out = Vec::<EdgeId>::load_from(path.join("first_out").to_str().unwrap()).expect("could not read first_out");
-    let head = Vec::<NodeId>::load_from(path.join("head").to_str().unwrap()).expect("could not read head");
-    let travel_time = Vec::<Weight>::load_from(path.join("travel_time").to_str().unwrap()).expect("could not read travel_time");
+    let first_out = Vec::<EdgeId>::load_from(path.join("first_out"))?;
+    let head = Vec::<NodeId>::load_from(path.join("head"))?;
+    let travel_time = Vec::<Weight>::load_from(path.join("travel_time"))?;
 
     report_time("iterating over arcs of some node", || {
         let node_id = 42;
-        for &edge_id in &head[first_out[node_id] as usize .. first_out[node_id + 1] as usize] {
-            println!("There is an arc from {} to {} with weight {}", node_id, head[edge_id as usize], travel_time[edge_id as usize]);
+        for edge_id in first_out[node_id]..first_out[node_id + 1] {
+            println!(
+                "There is an arc from {} to {} with weight {}",
+                node_id, head[edge_id as usize], travel_time[edge_id as usize]
+            );
         }
     });
 
-    vec![42; 42].write_to(path.join("distances").to_str().unwrap()).expect("could not write distances");
+    vec![42; 42].write_to(&path.join("distances"))?;
+
+    Ok(())
 }