about summary refs log tree commit diff
path: root/src/librustc_codegen_ssa/traits
diff options
context:
space:
mode:
authorVadim Petrochenkov <vadim.petrochenkov@gmail.com>2019-07-16 21:06:17 +0300
committerVadim Petrochenkov <vadim.petrochenkov@gmail.com>2019-07-24 12:27:58 +0300
commita93fdfedf36dcb909d90cbf963b087c5873bec1d (patch)
treea6cd8127f5490298317446aa618a640316992016 /src/librustc_codegen_ssa/traits
parenta7f28678bbf4e16893bb6a718e427504167a9494 (diff)
downloadrust-a93fdfedf36dcb909d90cbf963b087c5873bec1d.tar.gz
rust-a93fdfedf36dcb909d90cbf963b087c5873bec1d.zip
Merge `rustc_allocator` into `libsyntax_ext`
Diffstat (limited to 'src/librustc_codegen_ssa/traits')
-rw-r--r--src/librustc_codegen_ssa/traits/backend.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc_codegen_ssa/traits/backend.rs b/src/librustc_codegen_ssa/traits/backend.rs
index 9d5aaa7655d..9fbb44dcc99 100644
--- a/src/librustc_codegen_ssa/traits/backend.rs
+++ b/src/librustc_codegen_ssa/traits/backend.rs
@@ -3,12 +3,12 @@ use rustc::ty::Ty;
 
 use super::write::WriteBackendMethods;
 use super::CodegenObject;
-use rustc::middle::allocator::AllocatorKind;
 use rustc::middle::cstore::EncodedMetadata;
 use rustc::session::{Session, config};
 use rustc::ty::TyCtxt;
 use rustc_codegen_utils::codegen_backend::CodegenBackend;
 use std::sync::Arc;
+use syntax::ext::allocator::AllocatorKind;
 use syntax_pos::symbol::InternedString;
 
 pub trait BackendTypes {