Beginning of moving all backend-agnostic code to rustc_codegen_ssa

[rust.git] / src / librustc_codegen_llvm / interfaces / mod.rs

diff --git a/src/librustc_codegen_llvm/interfaces/mod.rs b/src/librustc_codegen_llvm/interfaces/mod.rs
index 4c5c9b164af23e971bb79b044c70f008936291e3..0547ce7ce4c45f0e98ff3d897d70cb8325425b55 100644 (file)
--- a/src/librustc_codegen_llvm/interfaces/mod.rs
+++ b/src/librustc_codegen_llvm/interfaces/mod.rs
@@ -8,25 +8,30 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-mod backend;
+mod abi;
+mod asm;
 mod builder;
 mod consts;
 mod debuginfo;
+mod declare;
 mod intrinsic;
 mod misc;
 mod statics;
 mod type_;
 
-pub use self::backend::{Backend, BackendTypes};
+pub use self::abi::{AbiBuilderMethods, AbiMethods};
+pub use self::asm::{AsmBuilderMethods, AsmMethods};
 pub use self::builder::BuilderMethods;
 pub use self::consts::ConstMethods;
-pub use self::debuginfo::DebugInfoMethods;
+pub use self::debuginfo::{DebugInfoBuilderMethods, DebugInfoMethods};
+pub use self::declare::{DeclareMethods, PreDefineMethods};
 pub use self::intrinsic::{IntrinsicCallMethods, IntrinsicDeclarationMethods};
 pub use self::misc::MiscMethods;
 pub use self::statics::StaticMethods;
-pub use self::type_::{BaseTypeMethods, DerivedTypeMethods, LayoutTypeMethods, TypeMethods};
-
-use std::fmt;
+pub use self::type_::{
+    ArgTypeMethods, BaseTypeMethods, DerivedTypeMethods, LayoutTypeMethods, TypeMethods,
+};
+pub use rustc_codegen_ssa::interfaces::{Backend, BackendMethods, BackendTypes, CodegenObject};
 
 pub trait CodegenMethods<'tcx>:
     Backend<'tcx>
@@ -35,6 +40,11 @@ pub trait CodegenMethods<'tcx>:
     + ConstMethods<'tcx>
     + StaticMethods<'tcx>
     + DebugInfoMethods<'tcx>
+    + AbiMethods<'tcx>
+    + IntrinsicDeclarationMethods<'tcx>
+    + DeclareMethods<'tcx>
+    + AsmMethods<'tcx>
+    + PreDefineMethods<'tcx>
 {
 }
 
@@ -45,6 +55,11 @@ impl<'tcx, T> CodegenMethods<'tcx> for T where
         + ConstMethods<'tcx>
         + StaticMethods<'tcx>
         + DebugInfoMethods<'tcx>
+        + AbiMethods<'tcx>
+        + IntrinsicDeclarationMethods<'tcx>
+        + DeclareMethods<'tcx>
+        + AsmMethods<'tcx>
+        + PreDefineMethods<'tcx>
 {}
 
 pub trait HasCodegen<'tcx>: Backend<'tcx> {
@@ -54,8 +69,7 @@ pub trait HasCodegen<'tcx>: Backend<'tcx> {
             BasicBlock = Self::BasicBlock,
             Type = Self::Type,
             Context = Self::Context,
+            Funclet = Self::Funclet,
+            DIScope = Self::DIScope,
         >;
 }
-
-pub trait CodegenObject: Copy + PartialEq + fmt::Debug {}
-impl<T: Copy + PartialEq + fmt::Debug> CodegenObject for T {}