Skip to content

Commit 4c36dda

Browse files
committed
Use if let to be more clear and idiomatic
1 parent 3dd254e commit 4c36dda

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/main.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ fn main() {
9595
if i > 0 { print!("\t"); }
9696
if columns[i].value.is_empty() { print!("\\N"); }
9797
else {
98-
if columns[i].search != None && columns[i].replace != None {
99-
columns[i].value = columns[i].value.replace(columns[i].search.unwrap(), columns[i].replace.unwrap());
98+
if let (Some(s), Some(r)) = (columns[i].search, columns[i].replace) {
99+
columns[i].value = columns[i].value.replace(s, r);
100100
}
101101
print!("{}", columns[i].value);
102102
columns[i].value.clear();
@@ -111,8 +111,8 @@ fn main() {
111111
for i in 0..columns.len() {
112112
if path == columns[i].path {
113113
raw = false;
114-
if columns[i].search != None && columns[i].replace != None {
115-
rawstr = rawstr.replace(columns[i].search.unwrap(), columns[i].replace.unwrap());
114+
if let (Some(s), Some(r)) = (columns[i].search, columns[i].replace) {
115+
rawstr = rawstr.replace(s, r);
116116
}
117117
columns[i].value.push_str(&rawstr);
118118
rawstr.clear();

0 commit comments

Comments
 (0)