diff --git a/parser/src/main.rs b/parser/src/main.rs index 7f244e2..651a143 100644 --- a/parser/src/main.rs +++ b/parser/src/main.rs @@ -50,13 +50,13 @@ fn main() { let mut outfile = fs::File::create("../compiled.csv").unwrap(); - outfile.write_all(data.as_bytes()).unwrap(); + outfile.write(data.as_bytes()).unwrap(); } fn parse_props(infile: Vec) -> Properties { - let part_number = scan_fmt!(&infile[1], "Part Number {}", String).unwrap(); - let part_name = scan_fmt!(&infile[2], "Part Name {}", String).unwrap(); - let material_name = scan_fmt!(&infile[4], "Material Name {}", String).unwrap(); + let part_number = scan_fmt!(&infile[1], "Part Number {/.+/}", String).unwrap(); + let part_name = scan_fmt!(&infile[2], "Part Name {/.+/}", String).unwrap(); + let material_name = scan_fmt!(&infile[4], "Material Name {/.+/}", String).unwrap(); let mass = scan_fmt!(&infile[14], "Mass {} g", f64).unwrap(); let volume = scan_fmt!(&infile[15], "Volume {} mm^3", f64).unwrap(); @@ -89,7 +89,7 @@ fn parse_props(infile: Vec) -> Properties { let Izy = scan_fmt!(&infile[32], "Izy {}", f64).unwrap(); let Izz = scan_fmt!(&infile[33], "Izz {}", f64).unwrap(); - Properties { + return Properties { part_number, part_name, material_name, @@ -112,5 +112,5 @@ fn parse_props(infile: Vec) -> Properties { Izx, Izy, Izz, - } + }; }