nhwn: use Option<NonZeroU32> in DebugLoc

2021-02-18 23:18:20 -06:00
parent 0148b971c9
commit f5aa1bceb9
3 changed files with 13 additions and 12 deletions
--- a/compiler/rustc_codegen_llvm/src/debuginfo/create_scope_map.rs
+++ b/compiler/rustc_codegen_llvm/src/debuginfo/create_scope_map.rs
@@ -102,8 +102,8 @@ fn make_mir_scope(
                DIB(cx),
                parent_scope.dbg_scope.unwrap(),
                file_metadata,
-                loc.line.unwrap_or(UNKNOWN_LINE_NUMBER),
-                loc.col.unwrap_or(UNKNOWN_COLUMN_NUMBER),
+                loc.line.map_or(UNKNOWN_LINE_NUMBER, |n| n.get()),
+                loc.col.map_or(UNKNOWN_COLUMN_NUMBER, |n| n.get()),
            )
        },
    };