Skip to content

Commit 48b9a06

Browse files
Fix warnings from 'cargo clippy'
1 parent a689b6b commit 48b9a06

File tree

1 file changed

+5
-12
lines changed

1 file changed

+5
-12
lines changed

src/main.rs

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -142,19 +142,13 @@ fn load_portfolio() -> Option<Portfolio> {
142142
// get the filename and read the file
143143
let filename = prompt("Enter filename to load: ");
144144
let data = fs::read_to_string(filename);
145-
146-
let raw_portfolio: String;
147-
if data.is_ok() {
148-
raw_portfolio = data.unwrap();
149-
} else {
150-
return None;
151-
};
145+
let raw_portfolio: String = if let Ok(x) = data { x } else { return None };
152146

153147
// convert the read file into an actual Portfolio struct
154148
let portfolio = serde_json::from_str(&raw_portfolio);
155149

156-
if portfolio.is_ok() {
157-
Some(portfolio.unwrap())
150+
if let Ok(x) = portfolio {
151+
Some(x)
158152
} else {
159153
None
160154
}
@@ -163,9 +157,8 @@ fn load_portfolio() -> Option<Portfolio> {
163157
fn dump_portfolio(portfolio: &Portfolio) {
164158
let json = serde_json::to_string(&portfolio);
165159
let filename = prompt("Enter filename to dump assets to: ");
166-
if json.is_ok() {
167-
//println!("{}", json.unwrap())
168-
let result = fs::write(filename, json.unwrap());
160+
if let Ok(x) = json {
161+
let result = fs::write(filename, x);
169162
if result.is_err() {
170163
println!("Error occurred when dumping. Portfolio not dumped.");
171164
}

0 commit comments

Comments
 (0)