Merge pull request #466 from solson/rustup

rustup
This commit is contained in:
Ralf Jung 2018-10-02 10:00:31 +02:00 committed by GitHub
commit 317f90525a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2,12 +2,13 @@ use rustc::mir;
use rustc::ty::layout::{self, LayoutOf, Size};
use rustc::ty;
use rustc::mir::interpret::{EvalResult, Scalar, ScalarMaybeUndef, PointerArithmetic};
use rustc_mir::interpret::{
PlaceTy, EvalContext, OpTy, Value
};
use rustc::mir::interpret::{EvalResult, PointerArithmetic};
use rustc_mir::interpret::{EvalContext, PlaceTy, OpTy};
use super::{FalibleScalarExt, OperatorEvalContextExt};
use super::{
Value, Scalar, ScalarMaybeUndef,
FalibleScalarExt, OperatorEvalContextExt
};
pub trait EvalContextExt<'tcx> {
fn call_intrinsic(