diff options
| author | Ralf Jung <post@ralfj.de> | 2020-02-12 19:40:31 +0100 |
|---|---|---|
| committer | Ralf Jung <post@ralfj.de> | 2020-02-13 11:04:49 +0100 |
| commit | ed2f22c5a973f4deffa4bd6efbbee0393ff91691 (patch) | |
| tree | e648d02dc43fed955e3e444793c8a61d8b3f3951 /src/librustc_codegen_ssa | |
| parent | 7e7d1c39edafcbce55ba08449689566e335545b7 (diff) | |
| download | rust-ed2f22c5a973f4deffa4bd6efbbee0393ff91691.tar.gz rust-ed2f22c5a973f4deffa4bd6efbbee0393ff91691.zip | |
rename PanicInfo -> AssertKind
Diffstat (limited to 'src/librustc_codegen_ssa')
| -rw-r--r-- | src/librustc_codegen_ssa/mir/block.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/librustc_codegen_ssa/mir/block.rs b/src/librustc_codegen_ssa/mir/block.rs index 835050fece6..916c15eb1b6 100644 --- a/src/librustc_codegen_ssa/mir/block.rs +++ b/src/librustc_codegen_ssa/mir/block.rs @@ -11,7 +11,7 @@ use crate::MemFlags; use rustc::middle::lang_items; use rustc::mir; -use rustc::mir::PanicInfo; +use rustc::mir::AssertKind; use rustc::ty::layout::{self, FnAbiExt, HasTyCtxt, LayoutOf}; use rustc::ty::{self, Instance, Ty, TypeFoldable}; use rustc_index::vec::Idx; @@ -378,7 +378,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> { // checked operation, just a comparison with the minimum // value, so we have to check for the assert message. if !bx.check_overflow() { - if let PanicInfo::OverflowNeg = *msg { + if let AssertKind::OverflowNeg = *msg { const_cond = Some(expected); } } @@ -412,7 +412,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> { // Put together the arguments to the panic entry point. let (lang_item, args) = match msg { - PanicInfo::BoundsCheck { ref len, ref index } => { + AssertKind::BoundsCheck { ref len, ref index } => { let len = self.codegen_operand(&mut bx, len).immediate(); let index = self.codegen_operand(&mut bx, index).immediate(); (lang_items::PanicBoundsCheckFnLangItem, vec![location, index, len]) |
