Rustup to rustc 1.32.0-nightly (3e90a12a8
2018-11-29)
This commit is contained in:
parent
36c0461654
commit
a16e85707d
@ -298,6 +298,8 @@ impl<'a, 'mir, 'tcx> Machine<'a, 'mir, 'tcx> for TransPlaceInterpreter {
|
||||
type MemoryKinds = !;
|
||||
type PointerTag = ();
|
||||
type AllocExtra = ();
|
||||
type MemoryExtra = ();
|
||||
type FrameExtra = ();
|
||||
type MemoryMap = FxHashMap<AllocId, (MemoryKind<!>, Allocation<()>)>;
|
||||
const STATIC_KIND: Option<!> = None;
|
||||
|
||||
@ -329,8 +331,9 @@ fn call_intrinsic(
|
||||
}
|
||||
|
||||
fn find_foreign_static(
|
||||
_: ::rustc::ty::query::TyCtxtAt<'a, 'tcx, 'tcx>,
|
||||
_: DefId,
|
||||
_: ::rustc::ty::query::TyCtxtAt<'a, 'tcx, 'tcx>,
|
||||
_: &(),
|
||||
) -> EvalResult<'tcx, Cow<'tcx, Allocation>> {
|
||||
panic!();
|
||||
}
|
||||
@ -358,7 +361,10 @@ fn tag_dereference(
|
||||
panic!();
|
||||
}
|
||||
|
||||
fn adjust_static_allocation(alloc: &Allocation) -> Cow<'_, Allocation> {
|
||||
fn adjust_static_allocation<'alloc>(
|
||||
alloc: &'alloc Allocation,
|
||||
_: &(),
|
||||
) -> Cow<'alloc, Allocation> {
|
||||
Cow::Borrowed(alloc)
|
||||
}
|
||||
|
||||
@ -369,4 +375,12 @@ fn tag_new_allocation(
|
||||
) -> EvalResult<'tcx, Pointer> {
|
||||
Ok(ptr)
|
||||
}
|
||||
|
||||
fn stack_push(_: &mut EvalContext<'a, 'mir, 'tcx, Self>) -> EvalResult<'tcx>{
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn stack_pop(_: &mut EvalContext<'a, 'mir, 'tcx, Self>, _: ()) -> EvalResult<'tcx> {
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
#![feature(rustc_private, macro_at_most_once_rep, never_type, decl_macro)]
|
||||
#![feature(rustc_private, never_type, decl_macro)]
|
||||
#![allow(intra_doc_link_resolution_failure)]
|
||||
|
||||
extern crate log;
|
||||
|
Loading…
Reference in New Issue
Block a user