Moved Backend interface into rustc_codegen_utils

Author: denismerigoux

src/librustc_codegen_llvm/back/lto.rs

@@ -24,7 +24,8 @@ use rustc::session::config::{self, Lto};
 use rustc::util::common::time_ext;
 use rustc_data_structures::fx::FxHashMap;
 use time_graph::Timeline;
-use {ModuleCodegen, ModuleLlvm, ModuleKind};
+use ModuleLlvm;
+use rustc_codegen_utils::{ModuleCodegen, ModuleKind};
 
 use libc;
 

src/librustc_codegen_llvm/back/write.rs

@@ -29,8 +29,8 @@ use rustc::util::nodemap::FxHashMap;
 use time_graph::{self, TimeGraph, Timeline};
 use llvm::{self, DiagnosticInfo, PassManager, SMDiagnostic};
 use llvm_util;
-use {CodegenResults, ModuleCodegen, CompiledModule, ModuleKind, ModuleLlvm,
-     CachedModuleCodegen};
+use {CodegenResults, ModuleLlvm};
+use rustc_codegen_utils::{ModuleCodegen, ModuleKind, CachedModuleCodegen, CompiledModule};
 use CrateInfo;
 use rustc::hir::def_id::{CrateNum, LOCAL_CRATE};
 use rustc::ty::TyCtxt;

src/librustc_codegen_llvm/base.rs

@@ -24,9 +24,7 @@
 //!     int) and rec(x=int, y=int, z=int) will have the same llvm::Type.
 
 use super::ModuleLlvm;
-use super::ModuleCodegen;
-use super::ModuleKind;
-use super::CachedModuleCodegen;
+use rustc_codegen_utils::{ModuleCodegen, ModuleKind, CachedModuleCodegen};
 use super::LlvmCodegenBackend;
 
 use abi;
@@ -1314,25 +1312,3 @@ pub fn visibility_to_llvm(linkage: Visibility) -> llvm::Visibility {
         Visibility::Protected => llvm::Visibility::Protected,
     }
 }
-
-// FIXME(mw): Anything that is produced via DepGraph::with_task() must implement
-//            the HashStable trait. Normally DepGraph::with_task() calls are
-//            hidden behind queries, but CGU creation is a special case in two
-//            ways: (1) it's not a query and (2) CGU are output nodes, so their
-//            Fingerprints are not actually needed. It remains to be clarified
-//            how exactly this case will be handled in the red/green system but
-//            for now we content ourselves with providing a no-op HashStable
-//            implementation for CGUs.
-mod temp_stable_hash_impls {
-    use rustc_data_structures::stable_hasher::{StableHasherResult, StableHasher,
-                                               HashStable};
-    use {ModuleCodegen, ModuleLlvm};
-
-    impl<HCX> HashStable<HCX> for ModuleCodegen<ModuleLlvm> {
-        fn hash_stable<W: StableHasherResult>(&self,
-                                              _: &mut HCX,
-                                              _: &mut StableHasher<W>) {
-            // do nothing
-        }
-    }
-}

src/librustc_codegen_llvm/interfaces/abi.rs

@@ -10,7 +10,7 @@
 
 use abi::FnType;
 use rustc::ty::{FnSig, Ty, Instance};
-use super::backend::Backend;
+use super::Backend;
 use super::builder::HasCodegen;
 
 pub trait AbiMethods<'tcx> {

src/librustc_codegen_llvm/interfaces/asm.rs

@@ -10,7 +10,7 @@
 
 use rustc::hir::{InlineAsm, GlobalAsm};
 use mir::place::PlaceRef;
-use super::backend::Backend;
+use super::Backend;
 use super::builder::HasCodegen;
 
 pub trait AsmBuilderMethods<'a, 'll: 'a, 'tcx: 'll> : HasCodegen<'a, 'll, 'tcx>{

src/librustc_codegen_llvm/interfaces/builder.rs

@@ -13,7 +13,7 @@ use libc::c_char;
 use rustc::ty::TyCtxt;
 use rustc::ty::layout::{Align, Size};
 use builder::MemFlags;
-use super::backend::Backend;
+use super::Backend;
 use super::CodegenMethods;
 use super::debuginfo::DebugInfoBuilderMethods;
 use super::intrinsic::IntrinsicCallMethods;

src/librustc_codegen_llvm/interfaces/debuginfo.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 use rustc::ty::{Ty, FnSig};
-use super::backend::Backend;
+use super::Backend;
 use super::builder::HasCodegen;
 use rustc::mir;
 use monomorphize::Instance;

src/librustc_codegen_llvm/interfaces/declare.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 use rustc::ty::Ty;
-use super::backend::Backend;
+use super::Backend;
 use rustc::hir::def_id::DefId;
 use rustc::mir::mono::{Linkage, Visibility};
 use monomorphize::Instance;

src/librustc_codegen_llvm/interfaces/intrinsic.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use super::backend::Backend;
+use super::Backend;
 use super::builder::HasCodegen;
 use mir::operand::OperandRef;
 use rustc::ty::Ty;

src/librustc_codegen_llvm/interfaces/misc.rs

@@ -11,7 +11,7 @@
 use std::cell::RefCell;
 use rustc::util::nodemap::FxHashMap;
 use rustc::ty::{Ty, self, Instance};
-use super::backend::Backend;
+use super::Backend;
 use rustc::session::Session;
 use libc::c_uint;
 use rustc::mir::mono::Stats;