Rename rustc_trans to rustc_codegen_llvm

Author: bjorn3

src/Cargo.lock

@@ -10,7 +10,7 @@
 
 //! rustc compiler intrinsics.
 //!
-//! The corresponding definitions are in librustc_trans/intrinsic.rs.
+//! The corresponding definitions are in librustc_codegen_llvm/intrinsic.rs.
 //!
 //! # Volatiles
 //!

src/doc/rustc-ux-guidelines.md

@@ -32,21 +32,21 @@ syntax_pos = { path = "../libsyntax_pos" }
 # rlib/dylib pair but all crates.io crates tend to just be rlibs. This means
 # we've got a problem for dependency graphs that look like:
 #
-#           foo - rustc_trans
-#         /                  \
-#   rustc                     ---- rustc_driver
+#           foo - rustc_codegen_llvm
+#         /                         \
+#   rustc                        ----- rustc_driver
 #         \                     /
 #           foo - rustc_metadata
 #
-# Here the crate `foo` is linked into the `rustc_trans` and the
+# Here the crate `foo` is linked into the `rustc_codegen_llvm` and the
 # `rustc_metadata` dylibs, meaning we've got duplicate copies! When we then
 # go to link `rustc_driver` the compiler notices this and gives us a compiler
 # error.
 #
 # To work around this problem we just add these crates.io dependencies to the
 # `rustc` crate which is a shared dependency above. That way the crate `foo`
 # shows up in the dylib for the `rustc` crate, deduplicating it and allowing
-# crates like `rustc_trans` to use `foo` *through* the `rustc` crate.
+# crates like `rustc_codegen_llvm` to use `foo` *through* the `rustc` crate.
 #
 # tl;dr; this is not needed to get `rustc` to compile, but if you remove it then
 #        later crate stop compiling. If you can remove this and everything

src/libcore/intrinsics.rs

@@ -84,7 +84,7 @@ pub fn profq_msg(msg: ProfileQueriesMsg) {
             // Do nothing.
             //
             // FIXME(matthewhammer): Multi-threaded translation phase triggers the panic below.
-            // From backtrace: rustc_trans::back::write::spawn_work::{{closure}}.
+            // From backtrace: rustc_codegen_llvm::back::write::spawn_work::{{closure}}.
             //
             // panic!("no channel on which to send profq_msg: {:?}", msg)
         }

src/librustc/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 authors = ["The Rust Project Developers"]
-name = "rustc_trans"
+name = "rustc_codegen_llvm"
 version = "0.0.0"
 
 [lib]
-name = "rustc_trans"
+name = "rustc_codegen_llvm"
 path = "lib.rs"
 crate-type = ["dylib"]
 test = false

src/librustc/README.md

@@ -85,7 +85,7 @@ fn get_simple_intrinsic(ccx: &CrateContext, name: &str) -> Option<ValueRef> {
 
 /// Remember to add all intrinsics here, in librustc_typeck/check/mod.rs,
 /// and in libcore/intrinsics.rs; if you need access to any llvm intrinsics,
-/// add them to librustc_trans/trans/context.rs
+/// add them to librustc_codegen_llvm/trans/context.rs
 pub fn trans_intrinsic_call<'a, 'tcx>(bcx: &Builder<'a, 'tcx>,
                                       callee_ty: Ty<'tcx>,
                                       fn_ty: &FnType,

src/librustc/util/common.rs

@@ -329,7 +329,7 @@ pub struct CrateInfo {
     used_crates_dynamic: Vec<(CrateNum, LibSource)>,
 }
 
-__build_diagnostic_array! { librustc_trans, DIAGNOSTICS }
+__build_diagnostic_array! { librustc_codegen_llvm, DIAGNOSTICS }
 
 pub fn provide_local(providers: &mut Providers) {
     back::symbol_names::provide(providers);

src/librustc_trans/Cargo.toml renamed to src/librustc_codegen_llvm/Cargo.toml

@@ -126,7 +126,7 @@ pub fn print(req: PrintRequest, sess: &Session) {
         match req {
             PrintRequest::TargetCPUs => llvm::LLVMRustPrintTargetCPUs(tm),
             PrintRequest::TargetFeatures => llvm::LLVMRustPrintTargetFeatures(tm),
-            _ => bug!("rustc_trans can't handle print request: {:?}", req),
+            _ => bug!("rustc_codegen_llvm can't handle print request: {:?}", req),
         }
     }
 }

src/librustc_trans/README.md renamed to src/librustc_codegen_llvm/README.md

@@ -30,7 +30,7 @@ rustc_plugin = { path = "../librustc_plugin" }
 rustc_privacy = { path = "../librustc_privacy" }
 rustc_resolve = { path = "../librustc_resolve" }
 rustc_save_analysis = { path = "../librustc_save_analysis" }
-rustc_trans = { path = "../librustc_trans", optional = true }
+rustc_codegen_llvm = { path = "../librustc_codegen_llvm", optional = true }
 rustc_trans_utils = { path = "../librustc_trans_utils" }
 rustc_typeck = { path = "../librustc_typeck" }
 serialize = { path = "../libserialize" }
@@ -41,4 +41,4 @@ syntax_pos = { path = "../libsyntax_pos" }
 ar = "0.3.0"
 
 [features]
-llvm = ["rustc_trans"]
+llvm = ["rustc_codegen_llvm"]

src/librustc_trans/abi.rs renamed to src/librustc_codegen_llvm/abi.rs

@@ -48,7 +48,7 @@ extern crate rustc_mir;
 extern crate rustc_resolve;
 extern crate rustc_save_analysis;
 #[cfg(feature="llvm")]
-extern crate rustc_trans;
+extern crate rustc_codegen_llvm;
 extern crate rustc_trans_utils;
 extern crate rustc_typeck;
 extern crate serialize;
@@ -156,10 +156,10 @@ pub fn run<F>(run_compiler: F) -> isize
 #[cfg(not(feature="llvm"))]
 pub use rustc_trans_utils::trans_crate::MetadataOnlyTransCrate as DefaultTransCrate;
 #[cfg(feature="llvm")]
-pub use rustc_trans::LlvmTransCrate as DefaultTransCrate;
+pub use rustc_codegen_llvm::LlvmTransCrate as DefaultTransCrate;
 
 #[cfg(not(feature="llvm"))]
-mod rustc_trans {
+mod rustc_codegen_llvm {
     use syntax_pos::symbol::Symbol;
     use rustc::session::Session;
     use rustc::session::config::PrintRequest;
@@ -205,7 +205,7 @@ pub fn run_compiler<'a>(args: &[String],
     let (sopts, cfg) = config::build_session_options_and_crate_config(&matches);
 
     if sopts.debugging_opts.debug_llvm {
-        rustc_trans::enable_llvm_debug();
+        rustc_codegen_llvm::enable_llvm_debug();
     }
 
     let descriptions = diagnostics_registry();
@@ -231,7 +231,7 @@ pub fn run_compiler<'a>(args: &[String],
     let mut sess = session::build_session_with_codemap(
         sopts, input_file_path, descriptions, codemap, emitter_dest,
     );
-    rustc_trans::init(&sess);
+    rustc_codegen_llvm::init(&sess);
     rustc_lint::register_builtins(&mut sess.lint_store.borrow_mut(), Some(&sess));
 
     let mut cfg = config::build_configuration(&sess, cfg);
@@ -263,7 +263,9 @@ pub fn run_compiler<'a>(args: &[String],
             Some(sess))
         }
         Some("llvm") => {
-            let cstore = Rc::new(CStore::new(rustc_trans::LlvmTransCrate::metadata_loader()));
+            let cstore = Rc::new(
+                CStore::new(rustc_codegen_llvm::LlvmTransCrate::metadata_loader())
+            );
 
             do_or_return!(callbacks.late_callback(&matches,
                                                   &sess,
@@ -272,13 +274,13 @@ pub fn run_compiler<'a>(args: &[String],
                                                   &odir,
                                                   &ofile), Some(sess));
 
-            (driver::compile_input::<rustc_trans::LlvmTransCrate>(&sess,
-                                                                 &cstore,
-                                                                 &input,
-                                                                 &odir,
-                                                                 &ofile,
-                                                                 Some(plugins),
-                                                                 &control),
+            (driver::compile_input::<rustc_codegen_llvm::LlvmTransCrate>(&sess,
+                                                                         &cstore,
+                                                                         &input,
+                                                                         &odir,
+                                                                         &ofile,
+                                                                         Some(plugins),
+                                                                         &control),
             Some(sess))
         }
         Some(trans_name) => sess.fatal(&format!("Invalid trans {}", trans_name)),
@@ -546,7 +548,7 @@ impl<'a> CompilerCalls<'a> for RustcDefaultCalls {
                 let mut sess = build_session(sopts.clone(),
                     None,
                     descriptions.clone());
-                rustc_trans::init(&sess);
+                rustc_codegen_llvm::init(&sess);
                 rustc_lint::register_builtins(&mut sess.lint_store.borrow_mut(), Some(&sess));
                 let mut cfg = config::build_configuration(&sess, cfg.clone());
                 target_features::add_configuration(&mut cfg, &sess);
@@ -806,20 +808,20 @@ impl RustcDefaultCalls {
                 }
                 PrintRequest::RelocationModels => {
                     println!("Available relocation models:");
-                    for &(name, _) in rustc_trans::back::write::RELOC_MODEL_ARGS.iter() {
+                    for &(name, _) in rustc_codegen_llvm::back::write::RELOC_MODEL_ARGS.iter() {
                         println!("    {}", name);
                     }
                     println!("");
                 }
                 PrintRequest::CodeModels => {
                     println!("Available code models:");
-                    for &(name, _) in rustc_trans::back::write::CODE_GEN_MODEL_ARGS.iter(){
+                    for &(name, _) in rustc_codegen_llvm::back::write::CODE_GEN_MODEL_ARGS.iter(){
                         println!("    {}", name);
                     }
                     println!("");
                 }
                 PrintRequest::TargetCPUs | PrintRequest::TargetFeatures => {
-                    rustc_trans::print(*req, sess);
+                    rustc_codegen_llvm::print(*req, sess);
                 }
                 PrintRequest::NativeStaticLibs => {
                     println!("Native static libs can be printed only during linking");
@@ -861,7 +863,7 @@ pub fn version(binary: &str, matches: &getopts::Matches) {
         println!("commit-date: {}", unw(commit_date_str()));
         println!("host: {}", config::host_triple());
         println!("release: {}", unw(release_str()));
-        rustc_trans::print_version();
+        rustc_codegen_llvm::print_version();
     }
 }
 
@@ -1158,7 +1160,7 @@ pub fn handle_options(args: &[String]) -> Option<getopts::Matches> {
     }
 
     if cg_flags.contains(&"passes=list".to_string()) {
-        rustc_trans::print_passes();
+        rustc_codegen_llvm::print_passes();
         return None;
     }
 
@@ -1287,7 +1289,7 @@ pub fn diagnostics_registry() -> errors::registry::Registry {
     all_errors.extend_from_slice(&rustc_resolve::DIAGNOSTICS);
     all_errors.extend_from_slice(&rustc_privacy::DIAGNOSTICS);
     #[cfg(feature="llvm")]
-    all_errors.extend_from_slice(&rustc_trans::DIAGNOSTICS);
+    all_errors.extend_from_slice(&rustc_codegen_llvm::DIAGNOSTICS);
     all_errors.extend_from_slice(&rustc_const_eval::DIAGNOSTICS);
     all_errors.extend_from_slice(&rustc_metadata::DIAGNOSTICS);
     all_errors.extend_from_slice(&rustc_passes::DIAGNOSTICS);

src/librustc_trans/adt.rs renamed to src/librustc_codegen_llvm/adt.rs

@@ -11,7 +11,6 @@
 use syntax::ast;
 use rustc::session::Session;
 use syntax::symbol::Symbol;
-use rustc_trans;
 
 /// Add `target_feature = "..."` cfgs for a variety of platform
 /// specific features (SSE, NEON etc.).
@@ -21,7 +20,7 @@ use rustc_trans;
 pub fn add_configuration(cfg: &mut ast::CrateConfig, sess: &Session) {
     let tf = Symbol::intern("target_feature");
 
-    for feat in rustc_trans::target_features(sess) {
+    for feat in ::rustc_codegen_llvm::target_features(sess) {
         cfg.insert((tf, Some(feat)));
     }