fix tests & rustdoc

12 files changed, 25 insertions, 22 deletions

diff --git a/src/doc/complement-lang-faq.md b/src/doc/complement-lang-faq.md
index 05c17606ce0..55abebf496d 100644
--- a/src/doc/complement-lang-faq.md
+++ b/src/doc/complement-lang-faq.md
@@ -158,7 +158,7 @@ can be combined to control the exact logging you want to see. For example, when
 debugging linking in the compiler, you might set the following:
 
 ```sh
-RUST_LOG=rustc::metadata::creader,rustc::util::filesearch,rustc::back::rpath
+RUST_LOG=rustc_metadata::creader,rustc::util::filesearch,rustc::back::rpath
 ```
 
 For a full description, see [the logging crate][1].
diff --git a/src/librustc_driver/test.rs b/src/librustc_driver/test.rs
index 7af301bec77..49d39d1eb4f 100644
--- a/src/librustc_driver/test.rs
+++ b/src/librustc_driver/test.rs
@@ -107,7 +107,7 @@ fn test_env<F>(source_string: &str,
     let diagnostic_handler = diagnostic::Handler::with_emitter(true, emitter);
     let span_diagnostic_handler = diagnostic::SpanHandler::new(diagnostic_handler, codemap);
 
-    let cstore = ::rustc::metadata::cstore::CStore::new(token::get_ident_interner());
+    let cstore = ::rustc_metadata::cstore::CStore::new(token::get_ident_interner());
     let sess = session::build_session_(options, None, span_diagnostic_handler,
                                        Box::new(cstore));
     rustc_lint::register_builtins(&mut sess.lint_store.borrow_mut(), Some(&sess));
diff --git a/src/librustdoc/clean/inline.rs b/src/librustdoc/clean/inline.rs
index 8ddce8a77d0..8b687a250dc 100644
--- a/src/librustdoc/clean/inline.rs
+++ b/src/librustdoc/clean/inline.rs
@@ -16,7 +16,7 @@ use syntax::ast;
 use syntax::attr::AttrMetaMethods;
 use rustc_front::hir;
 
-use rustc::metadata::util::{self as mdutil, CrateStore};
+use rustc::middle::cstore::{self, CrateStore};
 use rustc::middle::def;
 use rustc::middle::def_id::DefId;
 use rustc::middle::ty;
@@ -253,11 +253,11 @@ pub fn build_impls(cx: &DocContext, tcx: &ty::ctxt,
         }
 
         fn populate_impls(cx: &DocContext, tcx: &ty::ctxt,
-                          def: mdutil::DefLike,
+                          def: cstore::DefLike,
                           impls: &mut Vec<clean::Item>) {
             match def {
-                mdutil::DlImpl(did) => build_impl(cx, tcx, did, impls),
-                mdutil::DlDef(def::DefMod(did)) => {
+                cstore::DlImpl(did) => build_impl(cx, tcx, did, impls),
+                cstore::DlDef(def::DefMod(did)) => {
                     for item in tcx.sess.cstore.item_children(did) {
                         populate_impls(cx, tcx, item.def, impls)
                     }
@@ -450,20 +450,20 @@ fn build_module(cx: &DocContext, tcx: &ty::ctxt,
         let mut visited = HashSet::new();
         for item in tcx.sess.cstore.item_children(did) {
             match item.def {
-                mdutil::DlDef(def::DefForeignMod(did)) => {
+                cstore::DlDef(def::DefForeignMod(did)) => {
                     fill_in(cx, tcx, did, items);
                 }
-                mdutil::DlDef(def) if item.vis == hir::Public => {
+                cstore::DlDef(def) if item.vis == hir::Public => {
                     if !visited.insert(def) { return }
                     match try_inline_def(cx, tcx, def) {
                         Some(i) => items.extend(i),
                         None => {}
                     }
                 }
-                mdutil::DlDef(..) => {}
+                cstore::DlDef(..) => {}
                 // All impls were inlined above
-                mdutil::DlImpl(..) => {}
-                mdutil::DlField => panic!("unimplemented field"),
+                cstore::DlImpl(..) => {}
+                cstore::DlField => panic!("unimplemented field"),
             }
         }
     }
diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs
index 831d8613068..a1b3d88f083 100644
--- a/src/librustdoc/clean/mod.rs
+++ b/src/librustdoc/clean/mod.rs
@@ -35,7 +35,7 @@ use syntax::parse::token::{self, InternedString, special_idents};
 use syntax::ptr::P;
 
 use rustc_trans::back::link;
-use rustc::metadata::util::{self as mdutil, CrateStore};
+use rustc::middle::cstore::{self, CrateStore};
 use rustc::middle::def;
 use rustc::middle::def_id::{DefId, DefIndex};
 use rustc::middle::subst::{self, ParamSpace, VecPerParamSpace};
@@ -225,7 +225,7 @@ impl Clean<ExternalCrate> for CrateNum {
         cx.tcx_opt().map(|tcx| {
             for item in tcx.sess.cstore.crate_top_level_items(self.0) {
                 let did = match item.def {
-                    mdutil::DlDef(def::DefMod(did)) => did,
+                    cstore::DlDef(def::DefMod(did)) => did,
                     _ => continue
                 };
                 let attrs = inline::load_attrs(cx, tcx, did);
diff --git a/src/librustdoc/core.rs b/src/librustdoc/core.rs
index 8b97ff2f75b..1ccab1b16eb 100644
--- a/src/librustdoc/core.rs
+++ b/src/librustdoc/core.rs
@@ -12,7 +12,6 @@ pub use self::MaybeTyped::*;
 use rustc_lint;
 use rustc_driver::{driver, target_features};
 use rustc::session::{self, config};
-use rustc::metadata::cstore::CStore;
 use rustc::middle::def_id::DefId;
 use rustc::middle::privacy::AccessLevels;
 use rustc::middle::ty;
@@ -21,6 +20,7 @@ use rustc::lint;
 use rustc_trans::back::link;
 use rustc_resolve as resolve;
 use rustc_front::lowering::{lower_crate, LoweringContext};
+use rustc_metadata::cstore::CStore;
 
 use syntax::{ast, codemap, diagnostic};
 use syntax::feature_gate::UnstableFeatures;
diff --git a/src/librustdoc/html/format.rs b/src/librustdoc/html/format.rs
index 79585a94cd0..1a4085e30e8 100644
--- a/src/librustdoc/html/format.rs
+++ b/src/librustdoc/html/format.rs
@@ -18,7 +18,7 @@
 use std::fmt;
 use std::iter::repeat;
 
-use rustc::metadata::cstore::LOCAL_CRATE;
+use rustc::middle::cstore::LOCAL_CRATE;
 use rustc::middle::def_id::{CRATE_DEF_INDEX, DefId};
 use syntax::abi::Abi;
 use rustc_front::hir;
diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs
index 1b98f5bae0c..574b9b599f5 100644
--- a/src/librustdoc/html/render.rs
+++ b/src/librustdoc/html/render.rs
@@ -54,7 +54,7 @@ use externalfiles::ExternalHtml;
 
 use serialize::json::{self, ToJson};
 use syntax::{abi, ast};
-use rustc::metadata::cstore::LOCAL_CRATE;
+use rustc::middle::cstore::LOCAL_CRATE;
 use rustc::middle::def_id::{CRATE_DEF_INDEX, DefId};
 use rustc::middle::privacy::AccessLevels;
 use rustc::middle::stability;
diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs
index 9afe573936d..6997fa45cec 100644
--- a/src/librustdoc/lib.rs
+++ b/src/librustdoc/lib.rs
@@ -43,6 +43,7 @@ extern crate rustc_resolve;
 extern crate rustc_lint;
 extern crate rustc_back;
 extern crate rustc_front;
+extern crate rustc_metadata;
 extern crate serialize;
 extern crate syntax;
 extern crate test as testing;
diff --git a/src/librustdoc/test.rs b/src/librustdoc/test.rs
index 9eb5e0dfb73..3e303b29d5c 100644
--- a/src/librustdoc/test.rs
+++ b/src/librustdoc/test.rs
@@ -26,13 +26,13 @@ use std::sync::{Arc, Mutex};
 use testing;
 use rustc_lint;
 use rustc::front::map as hir_map;
-use rustc::metadata::cstore::CStore;
 use rustc::session::{self, config};
 use rustc::session::config::{get_unstable_features_setting, OutputType};
 use rustc::session::search_paths::{SearchPaths, PathKind};
 use rustc_front::lowering::{lower_crate, LoweringContext};
 use rustc_back::tempdir::TempDir;
 use rustc_driver::{driver, Compilation};
+use rustc_metadata::cstore::CStore;
 use syntax::codemap::CodeMap;
 use syntax::diagnostic;
 use syntax::parse::token;
diff --git a/src/test/run-make/execution-engine/test.rs b/src/test/run-make/execution-engine/test.rs
index b8d3a8b1f1f..20dd16872a6 100644
--- a/src/test/run-make/execution-engine/test.rs
+++ b/src/test/run-make/execution-engine/test.rs
@@ -16,6 +16,7 @@ extern crate rustc;
 extern crate rustc_driver;
 extern crate rustc_front;
 extern crate rustc_lint;
+extern crate rustc_metadata;
 extern crate rustc_resolve;
 extern crate syntax;
 
@@ -27,14 +28,14 @@ use std::thread::Builder;
 
 use rustc::front::map as ast_map;
 use rustc::llvm;
-use rustc::metadata::cstore::{CStore, RequireDynamic};
-use rustc::metadata::util::CrateStore;
+use rustc::middle::cstore::{CrateStore, LinkagePreference};
 use rustc::middle::ty;
 use rustc::session::config::{self, basic_options, build_configuration, Input, Options};
 use rustc::session::build_session;
 use rustc_driver::driver;
 use rustc_front::lowering::{lower_crate, LoweringContext};
 use rustc_resolve::MakeGlobMap;
+use rustc_metadata::cstore::CStore;
 use libc::c_void;
 
 use syntax::diagnostics::registry::Registry;
@@ -240,7 +241,7 @@ fn compile_program(input: &str, sysroot: PathBuf)
 
             let trans = driver::phase_4_translate_to_llvm(tcx, mir_map, analysis);
 
-            let crates = tcx.sess.cstore.used_crates(RequireDynamic);
+            let crates = tcx.sess.cstore.used_crates(LinkagePreference::RequireDynamic);
 
             // Collect crates used in the session.
             // Reverse order finds dependencies first.
diff --git a/src/test/run-make/issue-19371/foo.rs b/src/test/run-make/issue-19371/foo.rs
index a46ccc49259..58bf5049cf1 100644
--- a/src/test/run-make/issue-19371/foo.rs
+++ b/src/test/run-make/issue-19371/foo.rs
@@ -13,12 +13,13 @@
 extern crate rustc;
 extern crate rustc_driver;
 extern crate rustc_lint;
+extern crate rustc_metadata;
 extern crate syntax;
 
-use rustc::metadata::cstore::CStore;
 use rustc::session::{build_session, Session};
 use rustc::session::config::{basic_options, build_configuration, Input, OutputType};
 use rustc_driver::driver::{compile_input, CompileController};
+use rustc_metadata::cstore::CStore;
 use syntax::diagnostics::registry::Registry;
 use syntax::parse::token;
 
diff --git a/src/test/run-make/libs-through-symlinks/Makefile b/src/test/run-make/libs-through-symlinks/Makefile
index f097d8fabd1..2f425121f66 100644
--- a/src/test/run-make/libs-through-symlinks/Makefile
+++ b/src/test/run-make/libs-through-symlinks/Makefile
@@ -10,5 +10,5 @@ all:
 	mkdir -p $(TMPDIR)/outdir
 	$(RUSTC) foo.rs -o $(TMPDIR)/outdir/$(NAME)
 	ln -nsf outdir/$(NAME) $(TMPDIR)
-	RUST_LOG=rustc::metadata::loader $(RUSTC) bar.rs
+	RUST_LOG=rustc_metadata::loader $(RUSTC) bar.rs
 endif