Skip to content

Commit d01791c

Browse files
committed
change dir field into option
1 parent 404baf6 commit d01791c

File tree

1 file changed

+14
-12
lines changed

1 file changed

+14
-12
lines changed

src/runner/toml_frobber.rs

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use toml::{self, value::Array, Value};
77
pub(super) struct TomlFrobber<'a> {
88
krate: &'a Crate,
99
table: Table,
10-
dir: &'a Path,
10+
dir: Option<&'a Path>,
1111
}
1212

1313
impl<'a> TomlFrobber<'a> {
@@ -18,14 +18,18 @@ impl<'a> TomlFrobber<'a> {
1818
let table: Table = toml::from_str(&toml_content)
1919
.with_context(|_| format!("unable to parse {}", cargo_toml.display(),))?;
2020

21-
let dir = cargo_toml.parent().unwrap();
21+
let dir = cargo_toml.parent();
2222

2323
Ok(TomlFrobber { krate, table, dir })
2424
}
2525

2626
#[cfg(test)]
2727
fn new_with_table(krate: &'a Crate, table: Table) -> Self {
28-
TomlFrobber { krate, table }
28+
TomlFrobber {
29+
krate,
30+
table,
31+
dir: None,
32+
}
2933
}
3034

3135
pub(super) fn frob(&mut self) {
@@ -59,15 +63,13 @@ impl<'a> TomlFrobber<'a> {
5963

6064
fn remove_missing_items(&mut self, category: &str) {
6165
let folder = &(String::from(category) + "s");
62-
63-
let _krate = self.krate.to_string();
64-
let dir = self.dir;
65-
66-
if let Some(array) = self.table.get_mut(category) {
67-
let array = array.as_array_mut().unwrap();
68-
let dim = array.len();
69-
*(array) = Self::test_existance(dir, array, folder);
70-
info!("removed {} missing {}", dim - array.len(), folder);
66+
if let Some(dir) = self.dir {
67+
if let Some(array) = self.table.get_mut(category) {
68+
let array = array.as_array_mut().unwrap();
69+
let dim = array.len();
70+
*(array) = Self::test_existance(dir, array, folder);
71+
info!("removed {} missing {}", dim - array.len(), folder);
72+
}
7173
}
7274
}
7375

0 commit comments

Comments
 (0)