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

Remove the cstore reference from Session in order to prepare encapsulating CrateStore access in tcx.

Browse source
This commit is contained in:
Michael Woerister 2017-09-05 16:48:24 +02:00 • committed by Alex Crichton
parent 817e1b81e2
commit 54fa047d92
22 changed files with 135 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/test/run-make/issue-19371/foo.rs
View file

@ -60,7 +60,7 @@ fn basic_sess(sysroot: PathBuf) -> (Session, Rc<CStore>) {
let descriptions = Registry::new(&rustc::DIAGNOSTICS);
let dep_graph = DepGraph::new(opts.build_dep_graph());
let cstore = Rc::new(CStore::new(Box::new(rustc_trans::LlvmMetadataLoader)));
let sess = build_session(opts, &dep_graph, None, descriptions, cstore.clone());
let sess = build_session(opts, &dep_graph, None, descriptions);
rustc_trans::init(&sess);
rustc_lint::register_builtins(&mut sess.lint_store.borrow_mut(), Some(&sess));
(sess, cstore)

2
src/test/run-pass-fulldeps/compiler-calls.rs
View file

@ -21,6 +21,7 @@ extern crate rustc_driver;
extern crate syntax;
extern crate rustc_errors as errors;
use rustc::middle::cstore::CrateStore;
use rustc::session::Session;
use rustc::session::config::{self, Input};
use rustc_driver::{driver, CompilerCalls, Compilation};
@ -47,6 +48,7 @@ impl<'a> CompilerCalls<'a> for TestCalls {
fn late_callback(&mut self,
_: &getopts::Matches,
_: &Session,
_: &CrateStore,
_: &Input,
_: &Option<PathBuf>,
_: &Option<PathBuf>)