Moved DeclareMethods, MiscMethods and StaticMethods

Author: denismerigoux

src/librustc_codegen_llvm/interfaces/mod.rs

@@ -12,24 +12,19 @@ mod builder;
 mod consts;
 mod type_;
 mod intrinsic;
-mod statics;
-mod misc;
 mod debuginfo;
 mod abi;
-mod declare;
 mod asm;
 
 pub use self::builder::{BuilderMethods, HasCodegen};
-pub use rustc_codegen_ssa::interfaces::{Backend, BackendMethods, CodegenObject};
+pub use rustc_codegen_ssa::interfaces::{Backend, BackendMethods, CodegenObject, MiscMethods,
+    StaticMethods, DeclareMethods, PreDefineMethods};
 pub use self::consts::ConstMethods;
 pub use self::type_::{TypeMethods, BaseTypeMethods, DerivedTypeMethods,
     LayoutTypeMethods, ArgTypeMethods};
 pub use self::intrinsic::{IntrinsicCallMethods, IntrinsicDeclarationMethods};
-pub use self::statics::StaticMethods;
-pub use self::misc::MiscMethods;
 pub use self::debuginfo::{DebugInfoMethods, DebugInfoBuilderMethods};
 pub use self::abi::{AbiMethods, AbiBuilderMethods};
-pub use self::declare::{DeclareMethods, PreDefineMethods};
 pub use self::asm::{AsmMethods, AsmBuilderMethods};
 
 pub trait CodegenMethods<'ll, 'tcx: 'll> :

src/librustc_codegen_llvm/interfaces/declare.rs renamed to src/librustc_codegen_ssa/interfaces/declare.rs

@@ -12,7 +12,7 @@ use rustc::ty::Ty;
 use super::Backend;
 use rustc::hir::def_id::DefId;
 use rustc::mir::mono::{Linkage, Visibility};
-use monomorphize::Instance;
+use rustc_mir::monomorphize::Instance;
 
 pub trait DeclareMethods<'ll, 'tcx: 'll> : Backend<'ll> {
 

src/librustc_codegen_llvm/interfaces/misc.rs renamed to src/librustc_codegen_ssa/interfaces/misc.rs

@@ -16,7 +16,7 @@ use rustc::session::Session;
 use libc::c_uint;
 use rustc::mir::mono::Stats;
 use std::sync::Arc;
-use monomorphize::partitioning::CodegenUnit;
+use rustc_mir::monomorphize::partitioning::CodegenUnit;
 
 pub trait MiscMethods<'ll, 'tcx: 'll> : Backend<'ll> {
     fn vtables(&self) -> &RefCell<FxHashMap<(Ty<'tcx>,

src/librustc_codegen_ssa/interfaces/mod.rs

@@ -10,7 +10,13 @@
 
 use std::fmt;
 mod backend;
+mod misc;
+mod statics;
+mod declare;
 
 pub use self::backend::{Backend, BackendMethods};
+pub use self::misc::MiscMethods;
+pub use self::statics::StaticMethods;
+pub use self::declare::{DeclareMethods, PreDefineMethods};
 
 pub trait CodegenObject : Copy + PartialEq + fmt::Debug {}

src/librustc_codegen_llvm/interfaces/statics.rs renamed to src/librustc_codegen_ssa/interfaces/statics.rs

@@ -19,6 +19,7 @@
 #![feature(box_patterns)]
 #![feature(box_syntax)]
 #![feature(custom_attribute)]
+#![feature(libc)]
 #![feature(nll)]
 #![allow(unused_attributes)]
 #![allow(dead_code)]
@@ -33,6 +34,7 @@ extern crate rustc_mir;
 extern crate syntax;
 extern crate syntax_pos;
 extern crate rustc_data_structures;
+extern crate libc;
 
 use std::path::PathBuf;
 use rustc::dep_graph::WorkProduct;