From bcca5e64544d55ae090b05048496c478bac22d59 Mon Sep 17 00:00:00 2001 From: Tamir Duberstein Date: Tue, 10 Nov 2015 12:42:37 -0500 Subject: [PATCH 1/2] trans::debuginfo: simplify --- src/librustc_trans/debuginfo/utils.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/librustc_trans/debuginfo/utils.rs b/src/librustc_trans/debuginfo/utils.rs index 3ee2497009f65..8d634c0e292ad 100644 --- a/src/librustc_trans/debuginfo/utils.rs +++ b/src/librustc_trans/debuginfo/utils.rs @@ -60,8 +60,7 @@ pub fn bytes_to_bits(bytes: u64) -> u64 { #[inline] pub fn debug_context<'a, 'tcx>(cx: &'a CrateContext<'a, 'tcx>) -> &'a CrateDebugContext<'tcx> { - let debug_context: &'a CrateDebugContext<'tcx> = cx.dbg_cx().as_ref().unwrap(); - debug_context + cx.dbg_cx().as_ref().unwrap() } #[inline] From 83fe5325d23fc77ff326db168c854cbc28e19258 Mon Sep 17 00:00:00 2001 From: Tamir Duberstein Date: Sun, 8 Nov 2015 13:39:27 -0500 Subject: [PATCH 2/2] statics in match arm: compile with -g Closes #24956. --- src/test/run-pass/match-arm-statics.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/run-pass/match-arm-statics.rs b/src/test/run-pass/match-arm-statics.rs index 9700ed247959b..78a37f5183786 100644 --- a/src/test/run-pass/match-arm-statics.rs +++ b/src/test/run-pass/match-arm-statics.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// compile-flags: -g #[derive(PartialEq, Eq)] struct NewBool(bool);