bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Remove CrateReader, use CrateLoader instead.

Browse source
This commit is contained in:
Jeffrey Seyfried 2016-10-19 09:34:19 +00:00
parent b5f6d7ec2d
commit 2b43fac2b9
4 changed files with 21 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/librustc_driver/driver.rs
View file

@ -645,7 +645,8 @@ pub fn phase_2_configure_and_expand<'a, F>(sess: &Session,
// its contents but the results of name resolution on those contents. Hopefully we'll push
// this back at some point.
let _ignore = sess.dep_graph.in_ignore();
let mut crate_loader = CrateLoader::new(sess, &cstore, &krate, crate_name);
let mut crate_loader = CrateLoader::new(sess, &cstore, crate_name, krate.config.clone());
crate_loader.preprocess(&krate);
let resolver_arenas = Resolver::arenas();
let mut resolver =
Resolver::new(sess, &krate, make_glob_map, &mut crate_loader, &resolver_arenas);

48
src/librustc_metadata/creader.rs
View file

@ -42,12 +42,6 @@ use log;
pub struct CrateLoader<'a> {
pub sess: &'a Session,
pub creader: CrateReader<'a>,
cstore: &'a CStore,
}
pub struct CrateReader<'a> {
sess: &'a Session,
cstore: &'a CStore,
next_crate_num: CrateNum,
foreign_item_map: FnvHashMap<String, Vec<ast::NodeId>>,
@ -159,13 +153,13 @@ pub struct Macros {
pub dylib: Option<PathBuf>,
}
impl<'a> CrateReader<'a> {
impl<'a> CrateLoader<'a> {
pub fn new(sess: &'a Session,
cstore: &'a CStore,
local_crate_name: &str,
local_crate_config: ast::CrateConfig)
-> CrateReader<'a> {
CrateReader {
-> Self {
CrateLoader {
sess: sess,
cstore: cstore,
next_crate_num: cstore.next_crate_num(),
@ -890,7 +884,7 @@ impl<'a> CrateReader<'a> {
}
impl ExtensionCrate {
fn register(self, creader: &mut CrateReader) {
fn register(self, loader: &mut CrateLoader) {
if !self.should_link {
return
}
@ -901,31 +895,17 @@ impl ExtensionCrate {
};
// Register crate now to avoid double-reading metadata
creader.register_crate(&None,
&self.ident,
&self.name,
self.span,
library,
true);
loader.register_crate(&None, &self.ident, &self.name, self.span, library, true);
}
}
impl<'a> CrateLoader<'a> {
pub fn new(sess: &'a Session, cstore: &'a CStore, krate: &ast::Crate, crate_name: &str)
-> Self {
let loader = CrateLoader {
sess: sess,
cstore: cstore,
creader: CrateReader::new(sess, cstore, crate_name, krate.config.clone()),
};
pub fn preprocess(&mut self, krate: &ast::Crate) {
for attr in krate.attrs.iter().filter(|m| m.name() == "link_args") {
if let Some(ref linkarg) = attr.value_str() {
loader.cstore.add_used_link_args(&linkarg);
self.cstore.add_used_link_args(&linkarg);
}
}
loader
}
fn process_foreign_mod(&mut self, i: &ast::Item, fm: &ast::ForeignMod) {
@ -982,7 +962,7 @@ impl<'a> CrateLoader<'a> {
Some(name) => name,
None => continue,
};
let list = self.creader.foreign_item_map.entry(lib_name.to_string())
let list = self.foreign_item_map.entry(lib_name.to_string())
.or_insert(Vec::new());
list.extend(fm.items.iter().map(|it| it.id));
}
@ -991,8 +971,8 @@ impl<'a> CrateLoader<'a> {
impl<'a> middle::cstore::CrateLoader for CrateLoader<'a> {
fn postprocess(&mut self, krate: &ast::Crate) {
self.creader.inject_allocator_crate();
self.creader.inject_panic_runtime(krate);
self.inject_allocator_crate();
self.inject_panic_runtime(krate);
if log_enabled!(log::INFO) {
dump_crates(&self.cstore);
@ -1001,7 +981,7 @@ impl<'a> middle::cstore::CrateLoader for CrateLoader<'a> {
for &(ref name, kind) in &self.sess.opts.libs {
register_native_lib(self.sess, self.cstore, None, name.clone(), kind);
}
self.creader.register_statically_included_foreign_items();
self.register_statically_included_foreign_items();
}
fn process_item(&mut self, item: &ast::Item, definitions: &hir_map::Definitions) {
@ -1024,12 +1004,12 @@ impl<'a> middle::cstore::CrateLoader for CrateLoader<'a> {
}
}
if let Some(info) = self.creader.extract_crate_info(item) {
if let Some(info) = self.extract_crate_info(item) {
if !info.should_link {
return;
}
let (cnum, ..) = self.creader.resolve_crate(
let (cnum, ..) = self.resolve_crate(
&None, &info.ident, &info.name, None, item.span, PathKind::Crate, true,
);
@ -1038,7 +1018,7 @@ impl<'a> middle::cstore::CrateLoader for CrateLoader<'a> {
let extern_crate =
ExternCrate { def_id: def_id, span: item.span, direct: true, path_len: len };
self.creader.update_extern_crate(cnum, extern_crate, &mut FnvHashSet());
self.update_extern_crate(cnum, extern_crate, &mut FnvHashSet());
self.cstore.add_extern_mod_stmt_cnum(info.id, cnum);
}

4
src/librustc_metadata/macro_import.rs
View file

@ -110,7 +110,7 @@ impl<'a> CrateLoader<'a> {
if sel.is_empty() && reexport.is_empty() {
// Make sure we can read macros from `#[no_link]` crates.
if no_link {
self.creader.read_macros(vi);
self.read_macros(vi);
}
return Vec::new();
}
@ -122,7 +122,7 @@ impl<'a> CrateLoader<'a> {
return Vec::new();
}
let mut macros = self.creader.read_macros(vi);
let mut macros = self.read_macros(vi);
let mut ret = Vec::new();
let mut seen = HashSet::new();

6
src/librustc_plugin/load.rs
View file

@ -11,7 +11,7 @@
//! Used by `rustc` when loading a plugin.
use rustc::session::Session;
use rustc_metadata::creader::CrateReader;
use rustc_metadata::creader::CrateLoader;
use rustc_metadata::cstore::CStore;
use registry::Registry;
@ -33,7 +33,7 @@ pub struct PluginRegistrar {
struct PluginLoader<'a> {
sess: &'a Session,
reader: CrateReader<'a>,
reader: CrateLoader<'a>,
plugins: Vec<PluginRegistrar>,
}
@ -96,7 +96,7 @@ impl<'a> PluginLoader<'a> {
-> PluginLoader<'a> {
PluginLoader {
sess: sess,
reader: CrateReader::new(sess, cstore, crate_name, crate_config),
reader: CrateLoader::new(sess, cstore, crate_name, crate_config),
plugins: vec![],
}
}