Rustup to rustc 1.40.0-nightly (fa0f7d008 2019-10-17)

Author: bjorn3

src/allocator.rs

@@ -10,7 +10,7 @@
 
 use crate::prelude::*;
 
-use syntax::ext::allocator::{AllocatorKind, AllocatorTy, ALLOCATOR_METHODS};
+use syntax_expand::allocator::{AllocatorKind, AllocatorTy, ALLOCATOR_METHODS};
 
 /// Returns whether an allocator shim was created
 pub fn codegen(tcx: TyCtxt<'_>, module: &mut Module<impl Backend + 'static>) -> bool {

src/constant.rs

@@ -171,7 +171,7 @@ fn trans_const_place<'tcx>(
         let ptr = ecx.allocate(op.layout, MemoryKind::Stack);
         ecx.copy_op(op, ptr.into())?;
         let alloc = ecx
-            .memory()
+            .memory
             .get(ptr.to_ref().to_scalar()?.to_ptr()?.alloc_id)?;
         Ok(fx.tcx.intern_const_alloc(alloc.clone()))
     };

src/lib.rs

@@ -14,6 +14,7 @@ extern crate rustc_index;
 extern crate rustc_mir;
 extern crate rustc_target;
 extern crate syntax;
+extern crate syntax_expand;
 
 use std::any::Any;