Merge branch 'main' of github.com:zaphar/kitchen into main

This commit is contained in:
Jeremy Wall 2022-02-15 17:44:16 -05:00
commit 5462912014

View File

@ -87,7 +87,7 @@ pub fn output_ingredients_list(rs: Vec<Recipe>) {
acc.accumulate_from(&r);
}
for (_, i) in acc.ingredients() {
print!("{}", i.amt);
print!("{}", i.amt.normalize());
println!(" {}", i.name);
}
}
@ -101,7 +101,7 @@ pub fn output_ingredients_csv(rs: Vec<Recipe>) {
let mut writer = csv::Writer::from_writer(out);
for (_, i) in acc.ingredients() {
writer
.write_record(&[format!("{}", i.amt), i.name])
.write_record(&[format!("{}", i.amt.normalize()), i.name])
.expect("Failed to write csv.");
}
}