From dc4a4ada5822bf90ca271afbbdfb26079eb66d9c Mon Sep 17 00:00:00 2001
From: Niko Matsakis <niko@alum.mit.edu>
Date: Tue, 1 Sep 2015 12:35:05 -0400
Subject: move LOCAL_CRATE to cstore

---
 src/librustdoc/clean/mod.rs   | 3 ++-
 src/librustdoc/html/format.rs | 3 ++-
 src/librustdoc/html/render.rs | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/librustdoc')

diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs
index 89020b011a9..4ecaa46fb45 100644
--- a/src/librustdoc/clean/mod.rs
+++ b/src/librustdoc/clean/mod.rs
@@ -36,10 +36,11 @@ use syntax::ptr::P;
 
 use rustc_trans::back::link;
 use rustc::metadata::cstore;
+use rustc::metadata::cstore::LOCAL_CRATE;
 use rustc::metadata::csearch;
 use rustc::metadata::decoder;
 use rustc::middle::def;
-use rustc::middle::def_id::{DefId, LOCAL_CRATE};
+use rustc::middle::def_id::DefId;
 use rustc::middle::subst::{self, ParamSpace, VecPerParamSpace};
 use rustc::middle::ty;
 use rustc::middle::stability;
diff --git a/src/librustdoc/html/format.rs b/src/librustdoc/html/format.rs
index 947ae3abd8d..f1c3e97a900 100644
--- a/src/librustdoc/html/format.rs
+++ b/src/librustdoc/html/format.rs
@@ -18,7 +18,8 @@
 use std::fmt;
 use std::iter::repeat;
 
-use rustc::middle::def_id::{DefId, LOCAL_CRATE};
+use rustc::metadata::cstore::LOCAL_CRATE;
+use rustc::middle::def_id::DefId;
 use syntax::abi::Abi;
 use syntax::ast;
 use rustc_front::hir;
diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs
index b34f1a01a2b..509e6c7df77 100644
--- a/src/librustdoc/html/render.rs
+++ b/src/librustdoc/html/render.rs
@@ -53,6 +53,7 @@ use externalfiles::ExternalHtml;
 
 use serialize::json::{self, ToJson};
 use syntax::{abi, ast, attr};
+use rustc::metadata::cstore::LOCAL_CRATE;
 use rustc::middle::def_id::{DefId, LOCAL_CRATE};
 use rustc::util::nodemap::NodeSet;
 use rustc_front::hir;
-- 
cgit 1.4.1-3-g733a5