Skip to content

Commit

Permalink
result
Browse files Browse the repository at this point in the history
  • Loading branch information
Dragon-taro committed Aug 22, 2019
1 parent f9bf592 commit 0b60521
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 7 deletions.
2 changes: 1 addition & 1 deletion exercises/result/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 17 additions & 6 deletions exercises/result/src/main.rs
Expand Up @@ -15,10 +15,14 @@ use std::fs::File;
fn main() {
let mut args = env::args();
if let Some(file) = args.nth(1) {
println!("{}", read_file(&file).unwrap());
/*
println!("{}", read_file2(&file));
*/
match read_file(&file) {
Ok(file) => println!("{}", file),
Err(err) => println!("no such file or directory")
}
match read_file2(&file) {
Ok(file) => println!("{}", file),
Err(err) => println!("{}", err)
}
}
}

Expand All @@ -29,7 +33,14 @@ fn read_file(filename: &String) -> Result<String, io::Error> {
Ok(content)
}

fn read_file2(filename: &String) -> String {
String::new()
fn read_file2(filename: &String) -> Result<String, String> {
File::open(filename)
.map_err(|err| err.to_string())
.and_then(|mut file| {
let mut contents = String::new();
file.read_to_string(&mut contents)
.map_err(|err| err.to_string())
.map(|_| contents)
})
}

0 comments on commit 0b60521

Please sign in to comment.