fix rustc_tests

Author: RalfJung

rustc_tests/Cargo.lock

@@ -2,6 +2,7 @@
 extern crate miri;
 extern crate getopts;
 extern crate rustc;
+extern crate rustc_metadata;
 extern crate rustc_driver;
 extern crate rustc_errors;
 extern crate rustc_codegen_utils;
@@ -14,7 +15,7 @@ use std::io;
 
 
 use rustc::session::Session;
-use rustc::middle::cstore::CrateStore;
+use rustc_metadata::cstore::CStore;
 use rustc_driver::{Compilation, CompilerCalls, RustcDefaultCalls};
 use rustc_driver::driver::{CompileState, CompileController};
 use rustc::session::config::{self, Input, ErrorOutputType};
@@ -56,7 +57,7 @@ impl<'a> CompilerCalls<'a> for MiriCompilerCalls {
         trans: &CodegenBackend,
         matches: &getopts::Matches,
         sess: &Session,
-        cstore: &CrateStore,
+        cstore: &CStore,
         input: &Input,
         odir: &Option<PathBuf>,
         ofile: &Option<PathBuf>,