bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Layout errors can happen because something was too generic

Browse source
This commit is contained in:
Oliver Schneider 2018-08-30 16:30:20 +02:00 • committed by Oliver Scherer
parent cce53b3631
commit 6f84d6edf1
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/librustc/mir/interpret/error.rs
View file

@ -12,7 +12,7 @@ use std::{fmt, env};
use mir; use mir;
use ty::{Ty, layout}; use ty::{Ty, layout};
use ty::layout::{Size, Align}; use ty::layout::{Size, Align, LayoutError};
use rustc_target::spec::abi::Abi; use rustc_target::spec::abi::Abi;
use super::{ use super::{
@ -113,9 +113,10 @@ impl<'a, 'gcx, 'tcx> ConstEvalErr<'tcx> {
lint_root: Option<ast::NodeId>, lint_root: Option<ast::NodeId>,
) -> Result<DiagnosticBuilder<'tcx>, ErrorHandled> { ) -> Result<DiagnosticBuilder<'tcx>, ErrorHandled> {
match self.error.kind { match self.error.kind {
EvalErrorKind::Layout(LayoutError::Unknown(_)) |
EvalErrorKind::TooGeneric => return Err(ErrorHandled::TooGeneric), EvalErrorKind::TooGeneric => return Err(ErrorHandled::TooGeneric),
EvalErrorKind::TypeckError | EvalErrorKind::Layout(LayoutError::SizeOverflow(_)) |
EvalErrorKind::Layout(_) => return Err(ErrorHandled::Reported), EvalErrorKind::TypeckError => return Err(ErrorHandled::Reported),
_ => {}, _ => {},
} }
trace!("reporting const eval failure at {:?}", self.span); trace!("reporting const eval failure at {:?}", self.span);