user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rustc: Remove a bunch of exterior vectors

Browse source
This commit is contained in:
Patrick Walton 2011-07-14 17:26:10 -07:00
parent a716eb28ec
commit 917afa4cc9
18 changed files with 302 additions and 331 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/comp/driver/rustc.rs
View file

@ -301,8 +301,12 @@ fn build_session_options(str binary, getopts::match match, str binary_dir) ->
@session::options {
auto library = opt_present(match, "lib");
auto static = opt_present(match, "static");
auto library_search_paths = [binary_dir + "/lib"];
library_search_paths += getopts::opt_strs(match, "L");
auto library_search_paths = ~[binary_dir + "/lib"];
// FIXME: Remove this vec->ivec conversion.
auto lsp_vec = getopts::opt_strs(match, "L");
for (str lsp in lsp_vec) { library_search_paths += ~[lsp]; }
auto output_type =
if (opt_present(match, "parse-only")) {
link::output_type_none
@ -398,7 +402,7 @@ fn opts() -> vec[getopts::opt] {
}
fn main(vec[str] args) {
auto binary = vec::shift[str](args);
auto binary = vec::shift(args);
auto binary_dir = fs::dirname(binary);
auto match =
alt (getopts::getopts(args, opts())) {
@ -554,7 +558,10 @@ fn main(vec[str] args) {
gcc_args += ["-l" + libarg];
}
gcc_args += cstore::get_used_link_args(cstore);
// FIXME: Remove this ivec->vec conversion.
auto ula = cstore::get_used_link_args(cstore);
for (str arg in ula) { gcc_args += [arg]; }
auto used_libs = cstore::get_used_libraries(cstore);
for (str l in used_libs) {
gcc_args += ["-l" + l];

5
src/comp/driver/session.rs
View file

@ -10,7 +10,6 @@ import std::option;
import std::option::some;
import std::option::none;
import std::str;
import std::vec;
import syntax::parse::parser::parse_sess;
tag os { os_win32; os_macos; os_linux; }
@ -36,14 +35,14 @@ type options =
bool time_passes,
bool time_llvm_passes,
back::link::output_type output_type,
vec[str] library_search_paths,
str[] library_search_paths,
str sysroot,
// The crate config requested for the session, which may be combined
// with additional crate configurations during the compile process
ast::crate_cfg cfg,
bool test);
type crate_metadata = rec(str name, vec[u8] data);
type crate_metadata = rec(str name, u8[] data);
obj session(@config targ_cfg,
@options opts,