truncated_hash_result(symbol_hasher).to_managed()
}
- let pkgid = match attr::find_pkgid(attrs) {
+ let crateid = match attr::find_crateid(attrs) {
None => {
let stem = session::expect(
sess,
str_input(_) => @"rust_out"
};
- // If a pkgid is present, we use it as the link name
- let pkgid = attr::find_pkgid(attrs);
- match pkgid {
+ // If a crateid is present, we use it as the link name
+ let crateid = attr::find_crateid(attrs);
+ match crateid {
None => {}
- Some(pkgid) => {
- stem = pkgid.name.to_managed()
+ Some(crateid) => {
+ stem = crateid.name.to_managed()
}
}
}
fn is_extra(crate: &ast::Crate) -> bool {
- match attr::find_pkgid(crate.attrs) {
+ match attr::find_crateid(crate.attrs) {
Some(ref s) if "extra" == s.name => true,
_ => false
}
let t_outputs = d::build_output_filenames(&input, &odir, &ofile,
attrs, sess);
if crate_id || crate_name {
- let pkgid = match attr::find_pkgid(attrs) {
- Some(pkgid) => pkgid,
+ let crateid = match attr::find_crateid(attrs) {
+ Some(crateid) => crateid,
None => {
sess.fatal("No crate_id and --crate-id or \
--crate-name requested")
}
};
if crate_id {
- println(pkgid.to_str());
+ println(crateid.to_str());
}
if crate_name {
- println(pkgid.name);
+ println(crateid.name);
}
}
ident, path_opt);
let (name, version) = match path_opt {
Some((path_str, _)) => {
- let pkgid: Option<PkgId> = from_str(path_str);
- match pkgid {
+ let crateid: Option<PkgId> = from_str(path_str);
+ match crateid {
None => (@"", @""),
- Some(pkgid) => {
- let version = match pkgid.version {
+ Some(crateid) => {
+ let version = match crateid.version {
None => @"",
Some(ref ver) => ver.to_managed(),
};
- (pkgid.name.to_managed(), version)
+ (crateid.name.to_managed(), version)
}
}
}
} = load_ctxt.load_library_crate();
let attrs = decoder::get_crate_attributes(metadata.as_slice());
- let pkgid = attr::find_pkgid(attrs).unwrap();
+ let crateid = attr::find_crateid(attrs).unwrap();
let hash = decoder::get_crate_hash(metadata.as_slice());
// Claim this crate number and cache it
pub fn get_crate_vers(data: &[u8]) -> @str {
let attrs = decoder::get_crate_attributes(data);
- match attr::find_pkgid(attrs) {
+ match attr::find_crateid(attrs) {
None => @"0.0",
Some(pkgid) => pkgid.version_or_default().to_managed(),
}
}
let data = lib.metadata.as_slice();
let attrs = decoder::get_crate_attributes(data);
- match attr::find_pkgid(attrs) {
+ match attr::find_crateid(attrs) {
None => {}
Some(pkgid) => {
note_pkgid_attr(self.sess.diagnostic(), &pkgid);
version: @str,
hash: @str) -> bool {
let attrs = decoder::get_crate_attributes(crate_data);
- match attr::find_pkgid(attrs) {
+ match attr::find_crateid(attrs) {
None => false,
Some(pkgid) => {
if !hash.is_empty() {
impl Clean<Crate> for visit_ast::RustdocVisitor {
fn clean(&self) -> Crate {
- use syntax::attr::find_pkgid;
+ use syntax::attr::find_crateid;
let cx = local_data::get(super::ctxtkey, |x| *x.unwrap());
let mut externs = HashMap::new();
});
Crate {
- name: match find_pkgid(self.attrs) {
+ name: match find_crateid(self.attrs) {
Some(n) => n.name,
None => fail!("rustdoc requires a `crate_id` crate attribute"),
},
result
}
-pub fn find_pkgid(attrs: &[Attribute]) -> Option<PkgId> {
+pub fn find_crateid(attrs: &[Attribute]) -> Option<CrateId> {
match first_attr_value_str_by_name(attrs, "crate_id") {
None => None,
- Some(id) => from_str::<PkgId>(id),
+ Some(id) => from_str::<CrateId>(id),
}
}