Skip to content

Improve error message when config file is not found #422

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 2, 2019
Merged

Improve error message when config file is not found #422

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 7 additions & 14 deletions src/bindgen/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,8 @@

use std::collections::HashMap;
use std::default::Default;
use std::fmt;
use std::fs::File;
use std::io::prelude::*;
use std::io::{self, BufReader};
use std::path::Path as StdPath;
use std::str::FromStr;
use std::{fmt, fs, path::Path as StdPath};

use serde::de::value::{MapAccessDeserializer, SeqAccessDeserializer};
use serde::de::{Deserialize, Deserializer, MapAccess, SeqAccess, Visitor};
Expand Down Expand Up @@ -697,15 +693,12 @@ impl Default for Config {

impl Config {
pub fn from_file<P: AsRef<StdPath>>(file_name: P) -> Result<Config, String> {
fn read(file_name: &StdPath) -> io::Result<String> {
let file = File::open(file_name)?;
let mut reader = BufReader::new(&file);
let mut contents = String::new();
reader.read_to_string(&mut contents)?;
Ok(contents)
}

let config_text = read(file_name.as_ref()).unwrap();
let config_text = fs::read_to_string(file_name.as_ref()).or_else(|_| {
Err(format!(
"Couldn't open config file: {}.",
file_name.as_ref().display()
))
})?;

match toml::from_str::<Config>(&config_text) {
Ok(x) => Ok(x),
Expand Down