Skip to content

Commit 0acd746

Browse files
committed
Allow commodity_levies.csv to be empty
Fixes #784.
1 parent 2dbdd9b commit 0acd746

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

src/input/commodity/levy.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//! Code for reading in the commodity levies CSV file.
2-
use super::super::{input_err_msg, read_csv, try_insert};
2+
use super::super::{input_err_msg, read_csv_optional, try_insert};
33
use crate::commodity::{BalanceType, CommodityID, CommodityLevy, CommodityLevyMap};
44
use crate::id::IDCollection;
55
use crate::region::{RegionID, parse_region_str};
@@ -44,7 +44,7 @@ struct CommodityLevyRaw {
4444
///
4545
/// # Returns
4646
///
47-
/// A map containing levies, grouped by commodity ID.
47+
/// A map containing levies, grouped by commodity ID or an error.
4848
pub fn read_commodity_levies(
4949
model_dir: &Path,
5050
commodity_ids: &IndexSet<CommodityID>,
@@ -53,7 +53,7 @@ pub fn read_commodity_levies(
5353
milestone_years: &[u32],
5454
) -> Result<HashMap<CommodityID, CommodityLevyMap>> {
5555
let file_path = model_dir.join(COMMODITY_LEVIES_FILE_NAME);
56-
let commodity_levies_csv = read_csv::<CommodityLevyRaw>(&file_path)?;
56+
let commodity_levies_csv = read_csv_optional(&file_path)?;
5757
read_commodity_levies_iter(
5858
commodity_levies_csv,
5959
commodity_ids,

0 commit comments

Comments
 (0)