From f8aae504692295095454fa221c2ca1a7a46fb3c5 Mon Sep 17 00:00:00 2001
From: oli <oli@uhura.edef.eu>
Date: Mon, 26 Oct 2020 12:49:49 +0000
Subject: Prefer `bug!` over `unwrap()`

---
 compiler/rustc_codegen_ssa/src/mir/debuginfo.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'compiler/rustc_codegen_ssa')

diff --git a/compiler/rustc_codegen_ssa/src/mir/debuginfo.rs b/compiler/rustc_codegen_ssa/src/mir/debuginfo.rs
index e93830397c9..f45b52115bc 100644
--- a/compiler/rustc_codegen_ssa/src/mir/debuginfo.rs
+++ b/compiler/rustc_codegen_ssa/src/mir/debuginfo.rs
@@ -60,7 +60,9 @@ impl<'tcx, S: Copy, L: Copy> DebugScope<S, L> {
         span: Span,
     ) -> S {
         // FIXME(eddyb) this should never be `None`.
-        let dbg_scope = self.dbg_scope.unwrap();
+        let dbg_scope = self
+            .dbg_scope
+            .unwrap_or_else(|| bug!("`dbg_scope` is only `None` during initialization"));
 
         let pos = span.lo();
         if pos < self.file_start_pos || pos >= self.file_end_pos {
-- 
cgit 1.4.1-3-g733a5