diff options
Diffstat (limited to 'src/librustc/back/link.rs')
| -rw-r--r-- | src/librustc/back/link.rs | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/src/librustc/back/link.rs b/src/librustc/back/link.rs index 85268ad8f02..59d9886455a 100644 --- a/src/librustc/back/link.rs +++ b/src/librustc/back/link.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use core::prelude::*; use back::rpath; use driver::session; @@ -30,7 +29,6 @@ use core::cmp; use core::hash; use core::io::{Writer, WriterUtil}; use core::libc::{c_int, c_uint, c_char}; -use core::os::consts::{macos, freebsd, linux, win32}; use core::os; use core::ptr; use core::run; @@ -43,7 +41,9 @@ use syntax::ast_map::{path, path_mod, path_name}; use syntax::attr; use syntax::print::pprust; -pub enum output_type { +use core::os::consts::{macos, freebsd, linux, win32}; + +enum output_type { output_type_none, output_type_bitcode, output_type_assembly, @@ -59,7 +59,7 @@ impl output_type : cmp::Eq { pure fn ne(&self, other: &output_type) -> bool { !(*self).eq(other) } } -pub fn llvm_err(sess: Session, +msg: ~str) -> ! unsafe { +fn llvm_err(sess: Session, +msg: ~str) -> ! unsafe { let cstr = llvm::LLVMRustGetLastError(); if cstr == ptr::null() { sess.fatal(msg); @@ -68,7 +68,7 @@ pub fn llvm_err(sess: Session, +msg: ~str) -> ! unsafe { } } -pub fn WriteOutputFile(sess: Session, +fn WriteOutputFile(sess: Session, PM: lib::llvm::PassManagerRef, M: ModuleRef, Triple: *c_char, // FIXME: When #2334 is fixed, change @@ -86,14 +86,10 @@ pub fn WriteOutputFile(sess: Session, pub mod jit { #[legacy_exports]; - use back::link::llvm_err; use lib::llvm::llvm; - use lib::llvm::{ModuleRef, PassManagerRef, mk_target_data}; use metadata::cstore; - use session::Session; use core::cast; - use core::libc::c_int; use core::ptr; use core::str; @@ -165,19 +161,11 @@ mod write { #[legacy_exports]; use back::link::jit; - use back::link::{ModuleRef, WriteOutputFile, output_type}; - use back::link::{output_type_assembly, output_type_bitcode}; - use back::link::{output_type_exe, output_type_llvm_assembly}; - use back::link::{output_type_object}; use driver::session; use lib::llvm::llvm; - use lib::llvm::{False, True, mk_pass_manager, mk_target_data}; use lib; - use session::Session; use core::char; - use core::libc::{c_char, c_int, c_uint}; - use core::path::Path; use core::str; use core::vec; |
