pub use self::code_stats::{CodeStats, DataTypeKind, FieldInfo};
pub use self::code_stats::{SizeKind, TypeSizeInfo, VariantInfo};
-use hir::def_id::{CrateNum, DefIndex};
+use hir::def_id::CrateNum;
use ich::Fingerprint;
use lint;
/// Returns the symbol name for the registrar function,
/// given the crate Svh and the function DefIndex.
- pub fn generate_plugin_registrar_symbol(&self, disambiguator: CrateDisambiguator,
- index: DefIndex)
+ pub fn generate_plugin_registrar_symbol(&self,
+ disambiguator: CrateDisambiguator)
-> String {
- format!("__rustc_plugin_registrar__{}_{}", disambiguator.to_fingerprint().to_hex(),
- index.to_proc_macro_index())
+ format!("__rustc_plugin_registrar_{}__", disambiguator.to_fingerprint().to_hex())
}
- pub fn generate_derive_registrar_symbol(&self, disambiguator: CrateDisambiguator,
- index: DefIndex)
+ pub fn generate_derive_registrar_symbol(&self,
+ disambiguator: CrateDisambiguator)
-> String {
- format!("__rustc_derive_registrar__{}_{}", disambiguator.to_fingerprint().to_hex(),
- index.to_proc_macro_index())
+ format!("__rustc_derive_registrar_{}__", disambiguator.to_fingerprint().to_hex())
}
pub fn sysroot<'a>(&'a self) -> &'a Path {
use native_libs::relevant_lib;
use schema::CrateRoot;
-use rustc::hir::def_id::{CrateNum, DefIndex, CRATE_DEF_INDEX};
+use rustc::hir::def_id::{CrateNum, CRATE_DEF_INDEX};
use rustc::hir::svh::Svh;
use rustc::middle::allocator::AllocatorKind;
use rustc::middle::cstore::DepKind;
Err(err) => self.sess.span_fatal(span, &err),
};
- let sym = self.sess.generate_derive_registrar_symbol(root.disambiguator,
- root.macro_derive_registrar.unwrap());
+ let sym = self.sess.generate_derive_registrar_symbol(root.disambiguator);
let registrar = unsafe {
let sym = match lib.symbol(&sym) {
Ok(f) => f,
pub fn find_plugin_registrar(&mut self,
span: Span,
name: &str)
- -> Option<(PathBuf, CrateDisambiguator, DefIndex)> {
+ -> Option<(PathBuf, CrateDisambiguator)> {
let name = Symbol::intern(name);
let ekrate = self.read_extension_crate(span, name, name);
}
let root = ekrate.metadata.get_root();
- match (ekrate.dylib.as_ref(), root.plugin_registrar_fn) {
- (Some(dylib), Some(reg)) => {
- Some((dylib.to_path_buf(), root.disambiguator, reg))
+ match ekrate.dylib.as_ref() {
+ Some(dylib) => {
+ Some((dylib.to_path_buf(), root.disambiguator))
}
- (None, Some(_)) => {
+ None => {
span_err!(self.sess, span, E0457,
"plugin `{}` only found in rlib format, but must be available \
in dylib format",
// empty dylib.
None
}
- _ => None,
}
}
fn load_plugin(&mut self, span: Span, name: &str, args: Vec<ast::NestedMetaItem>) {
let registrar = self.reader.find_plugin_registrar(span, name);
- if let Some((lib, disambiguator, index)) = registrar {
- let symbol = self.sess.generate_plugin_registrar_symbol(disambiguator, index);
+ if let Some((lib, disambiguator)) = registrar {
+ let symbol = self.sess.generate_plugin_registrar_symbol(disambiguator);
let fun = self.dylink_registrar(span, lib, symbol);
self.plugins.push(PluginRegistrar {
fun,
if let Some(id) = tcx.sess.derive_registrar_fn.get() {
let def_id = tcx.hir.local_def_id(id);
- let idx = def_id.index;
let disambiguator = tcx.sess.local_crate_disambiguator();
- let registrar = tcx.sess.generate_derive_registrar_symbol(disambiguator, idx);
+ let registrar = tcx.sess.generate_derive_registrar_symbol(disambiguator);
local_crate.push((registrar, Some(def_id), SymbolExportLevel::C));
}
if let Some(id) = node_id {
if tcx.sess.plugin_registrar_fn.get() == Some(id) {
- let idx = def_id.index;
let disambiguator = tcx.sess.local_crate_disambiguator();
- return tcx.sess.generate_plugin_registrar_symbol(disambiguator, idx);
+ return tcx.sess.generate_plugin_registrar_symbol(disambiguator);
}
if tcx.sess.derive_registrar_fn.get() == Some(id) {
- let idx = def_id.index;
let disambiguator = tcx.sess.local_crate_disambiguator();
- return tcx.sess.generate_derive_registrar_symbol(disambiguator, idx);
+ return tcx.sess.generate_derive_registrar_symbol(disambiguator);
}
}