Merge pull request #197 from mbrubeck/cleanup

Clean up some Path code in bookconfig
This commit is contained in:
Mathieu David 2017-01-02 19:43:45 +01:00 committed by GitHub
commit 9a318adc03
1 changed files with 2 additions and 2 deletions

View File

@ -62,13 +62,13 @@ impl BookConfig {
// Read book.toml or book.json if exists // Read book.toml or book.json if exists
if Path::new(root.join("book.toml").as_os_str()).exists() { if root.join("book.toml").exists() {
debug!("[*]: Reading config"); debug!("[*]: Reading config");
let data = read_file(root.join("book.toml")); let data = read_file(root.join("book.toml"));
self.parse_from_toml_string(&data); self.parse_from_toml_string(&data);
} else if Path::new(root.join("book.json").as_os_str()).exists() { } else if root.join("book.json").exists() {
debug!("[*]: Reading config"); debug!("[*]: Reading config");
let data = read_file(root.join("book.json")); let data = read_file(root.join("book.json"));