diff --git a/src/comp/back/Link.rs b/src/comp/back/link.rs similarity index 99% rename from src/comp/back/Link.rs rename to src/comp/back/link.rs index 50b07915b60..830264d35e0 100644 --- a/src/comp/back/Link.rs +++ b/src/comp/back/link.rs @@ -50,7 +50,7 @@ fn link_intrinsics(session::session sess, ModuleRef llmod) { } } -mod Write { +mod write { fn is_object_or_assembly(output_type ot) -> bool { if (ot == output_type_assembly) { ret true; diff --git a/src/comp/driver/rustc.rs b/src/comp/driver/rustc.rs index 4940e7a0dfa..6effc44f694 100644 --- a/src/comp/driver/rustc.rs +++ b/src/comp/driver/rustc.rs @@ -10,7 +10,7 @@ import middle::resolve; import middle::ty; import middle::typeck; import middle::typestate_check; -import back::Link; +import back::link; import lib::llvm; import util::common; @@ -29,7 +29,7 @@ import std::getopts::optmulti; import std::getopts::optflag; import std::getopts::opt_present; -import back::Link::output_type; +import back::link::output_type; fn default_environment(session::session sess, str argv0, @@ -87,7 +87,7 @@ fn compile_input(session::session sess, auto p = parser::new_parser(sess, env, def, input, 0u, 0u); auto crate = time(time_passes, "parsing", bind parse_input(sess, p, input)); - if (sess.get_opts().output_type == Link::output_type_none) {ret;} + if (sess.get_opts().output_type == link::output_type_none) {ret;} crate = time(time_passes, "external crate reading", bind creader::read_crates(sess, crate)); @@ -112,7 +112,7 @@ fn compile_input(session::session sess, type_cache, output)); time[()](time_passes, "LLVM passes", - bind Link::Write::run_passes(sess, llmod, output)); + bind link::write::run_passes(sess, llmod, output)); } fn pretty_print_input(session::session sess, @@ -241,13 +241,13 @@ fn main(vec[str] args) { auto output_file = getopts::opt_maybe_str(match, "o"); auto library_search_paths = getopts::opt_strs(match, "L"); - auto output_type = Link::output_type_bitcode; + auto output_type = link::output_type_bitcode; if (opt_present(match, "parse-only")) { - output_type = Link::output_type_none; + output_type = link::output_type_none; } else if (opt_present(match, "S")) { - output_type = Link::output_type_assembly; + output_type = link::output_type_assembly; } else if (opt_present(match, "c")) { - output_type = Link::output_type_object; + output_type = link::output_type_object; } auto verify = !opt_present(match, "noverify"); @@ -317,10 +317,10 @@ fn main(vec[str] args) { let vec[str] parts = _str::split(ifile, '.' as u8); _vec::pop[str](parts); alt (output_type) { - case (Link::output_type_none) { parts += vec("pp"); } - case (Link::output_type_bitcode) { parts += vec("bc"); } - case (Link::output_type_assembly) { parts += vec("s"); } - case (Link::output_type_object) { parts += vec("o"); } + case (link::output_type_none) { parts += vec("pp"); } + case (link::output_type_bitcode) { parts += vec("bc"); } + case (link::output_type_assembly) { parts += vec("s"); } + case (link::output_type_object) { parts += vec("o"); } } auto ofile = _str::connect(parts, "."); compile_input(sess, env, ifile, ofile); diff --git a/src/comp/driver/session.rs b/src/comp/driver/session.rs index 12129a93858..71d4d9d2ddf 100644 --- a/src/comp/driver/session.rs +++ b/src/comp/driver/session.rs @@ -34,7 +34,7 @@ type options = rec(bool shared, bool stats, bool time_passes, bool time_llvm_passes, - back::Link::output_type output_type, + back::link::output_type output_type, vec[str] library_search_paths, str sysroot); diff --git a/src/comp/middle/trans.rs b/src/comp/middle/trans.rs index d822be174bb..4f1636d4b50 100644 --- a/src/comp/middle/trans.rs +++ b/src/comp/middle/trans.rs @@ -14,7 +14,7 @@ import front::ast; import front::creader; import driver::session; import middle::ty; -import back::Link; +import back::link; import back::x86; import back::abi; import back::upcall; @@ -7892,7 +7892,7 @@ fn make_common_glue(&session::session sess, &str output) { trans::trans_exit_task_glue(glues, new_str_hash[ValueRef](), tn, llmod); - Link::Write::run_passes(sess, llmod, output); + link::write::run_passes(sess, llmod, output); } fn create_module_map(&@crate_ctxt ccx) -> ValueRef { diff --git a/src/comp/rustc.rc b/src/comp/rustc.rc index a0fb45c40ab..47682235843 100644 --- a/src/comp/rustc.rc +++ b/src/comp/rustc.rc @@ -39,7 +39,7 @@ mod front { } mod back { - mod Link; + mod link; mod abi; mod upcall; mod x86;