diff options
| author | Brian Anderson <banderson@mozilla.com> | 2011-07-07 18:13:24 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2011-07-08 09:37:00 -0700 |
| commit | 82983e5005956b9f08151bdaa8c8a2e5ddbb058f (patch) | |
| tree | 82d050e148045b7605b07b50183664e709a58187 /src/comp/driver | |
| parent | b23ecd47ceb7468d5132b9bf81d1d9c4e3fd1084 (diff) | |
| download | rust-82983e5005956b9f08151bdaa8c8a2e5ddbb058f.tar.gz rust-82983e5005956b9f08151bdaa8c8a2e5ddbb058f.zip | |
Replace the crate cache in session with the one in cstore
Diffstat (limited to 'src/comp/driver')
| -rw-r--r-- | src/comp/driver/rustc.rs | 3 | ||||
| -rw-r--r-- | src/comp/driver/session.rs | 6 |
2 files changed, 1 insertions, 8 deletions
diff --git a/src/comp/driver/rustc.rs b/src/comp/driver/rustc.rs index 4c6615f11b3..687376ca695 100644 --- a/src/comp/driver/rustc.rs +++ b/src/comp/driver/rustc.rs @@ -353,8 +353,7 @@ fn build_session_options(str binary, getopts::match match, str binary_dir) -> fn build_session(@session::options sopts) -> session::session { auto target_cfg = build_target_config(); auto cstore = metadata::cstore::mk_cstore(); - auto crate_cache = std::map::new_int_hash[session::crate_metadata](); - ret session::session(target_cfg, sopts, cstore, crate_cache, [], + ret session::session(target_cfg, sopts, cstore, [], [], [], codemap::new_codemap(), 0u); } diff --git a/src/comp/driver/session.rs b/src/comp/driver/session.rs index d0112704e24..7b52919ccad 100644 --- a/src/comp/driver/session.rs +++ b/src/comp/driver/session.rs @@ -46,7 +46,6 @@ type crate_metadata = rec(str name, vec[u8] data); obj session(@config targ_cfg, @options opts, metadata::cstore::cstore cstore, - map::hashmap[int, crate_metadata] crates, mutable vec[str] used_crate_files, mutable vec[str] used_libraries, mutable vec[str] used_link_args, @@ -101,11 +100,6 @@ obj session(@config targ_cfg, self.span_bug(sp, "unimplemented " + msg); } fn unimpl(str msg) -> ! { self.bug("unimplemented " + msg); } - fn get_external_crate(int num) -> crate_metadata { ret crates.get(num); } - fn set_external_crate(int num, &crate_metadata metadata) { - crates.insert(num, metadata); - } - fn has_external_crate(int num) -> bool { ret crates.contains_key(num); } fn add_used_link_args(&str args) { used_link_args += str::split(args, ' ' as u8); } |
