about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMara Bos <m-ou.se@m-ou.se>2020-09-20 12:39:07 +0200
committerMara Bos <m-ou.se@m-ou.se>2020-09-21 20:43:44 +0200
commit9e3f94dabc334586d669f3aba0bded607ac782fc (patch)
treec48a961d6a964a5cf3a14caa0cfe9338cc30dd53
parentdb74e1f1e3e5c7497bb9af68814497c8df1fd0b8 (diff)
downloadrust-9e3f94dabc334586d669f3aba0bded607ac782fc.tar.gz
rust-9e3f94dabc334586d669f3aba0bded607ac782fc.zip
Don't unwrap but report a fatal error for TargetDataLayout::parse.
-rw-r--r--compiler/rustc_session/src/config.rs4
1 files changed, 3 insertions, 1 deletions
diff --git a/compiler/rustc_session/src/config.rs b/compiler/rustc_session/src/config.rs
index 09e5948cdd7..ab96b0333f4 100644
--- a/compiler/rustc_session/src/config.rs
+++ b/compiler/rustc_session/src/config.rs
@@ -749,7 +749,9 @@ pub fn default_configuration(sess: &Session) -> CrateConfig {
     let min_atomic_width = sess.target.target.min_atomic_width();
     let max_atomic_width = sess.target.target.max_atomic_width();
     let atomic_cas = sess.target.target.options.atomic_cas;
-    let layout = TargetDataLayout::parse(&sess.target.target).unwrap();
+    let layout = TargetDataLayout::parse(&sess.target.target).unwrap_or_else(|err| {
+        sess.fatal(&err);
+    });
 
     let mut ret = FxHashSet::default();
     ret.reserve(6); // the minimum number of insertions