Prevent failure in case there is no config.toml file

rust-lang · Jun 25, 2020 · 3156deb · 3156deb
1 parent 228a0ed
commit 3156deb
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
@@ -444,8 +444,7 @@ impl Config {
 
         let toml = file
             .map(|file| {
-                let contents = t!(fs::read_to_string(&file));
-                match toml::from_str(&contents) {
+                fs::read_to_string(&file).ok().map(|contents| match toml::from_str(&contents) {
                     Ok(table) => table,
                     Err(err) => {
                         println!(
@@ -455,8 +454,9 @@ impl Config {
                         );
                         process::exit(2);
                     }
-                }
+                })
             })
+            .flatten()
             .unwrap_or_else(TomlConfig::default);
 
         let build = toml.build.clone().unwrap_or_default();