From cecc13a704c3250e50b085c1433014a9bdf916df Mon Sep 17 00:00:00 2001 From: Corey Richardson Date: Fri, 13 Dec 2013 02:13:18 -0500 Subject: [PATCH 1/2] librustdoc: use pkgid instead of link meta --- src/librustdoc/clean.rs | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/librustdoc/clean.rs b/src/librustdoc/clean.rs index 54323ddeb3253..8aab405517895 100644 --- a/src/librustdoc/clean.rs +++ b/src/librustdoc/clean.rs @@ -73,9 +73,7 @@ pub struct Crate { impl Clean for visit_ast::RustdocVisitor { fn clean(&self) -> Crate { - use syntax::attr::{find_linkage_metas, last_meta_item_value_str_by_name}; - let maybe_meta = last_meta_item_value_str_by_name( - find_linkage_metas(self.attrs), "name"); + use syntax::attr::find_pkgid; let cx = local_data::get(super::ctxtkey, |x| *x.unwrap()); let mut externs = HashMap::new(); @@ -84,10 +82,9 @@ impl Clean for visit_ast::RustdocVisitor { }); Crate { - name: match maybe_meta { - Some(x) => x.to_owned(), - None => fail!("rustdoc requires a \\#[link(name=\"foo\")] \ - crate attribute"), + name: match find_pkgid(self.attrs) { + Some(n) => n, + None => fail!("rustdoc requires a `pkgid` crate attribute"), }, module: Some(self.module.clean()), externs: externs, From b20aa5b77d0184810aa6f5287aab34f65f6bde77 Mon Sep 17 00:00:00 2001 From: Corey Richardson Date: Fri, 13 Dec 2013 02:14:06 -0500 Subject: [PATCH 2/2] librustpkg: don't clobber the crate attributes for the pkgid --- src/librustdoc/clean.rs | 2 +- src/librustpkg/util.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/librustdoc/clean.rs b/src/librustdoc/clean.rs index 8aab405517895..e4f0b8ceb8109 100644 --- a/src/librustdoc/clean.rs +++ b/src/librustdoc/clean.rs @@ -83,7 +83,7 @@ impl Clean for visit_ast::RustdocVisitor { Crate { name: match find_pkgid(self.attrs) { - Some(n) => n, + Some(n) => n.name, None => fail!("rustdoc requires a `pkgid` crate attribute"), }, module: Some(self.module.clean()), diff --git a/src/librustpkg/util.rs b/src/librustpkg/util.rs index ae490dc1f8a36..383e7324cd15b 100644 --- a/src/librustpkg/util.rs +++ b/src/librustpkg/util.rs @@ -300,7 +300,7 @@ pub fn compile_input(context: &BuildContext, pkg_id.version.to_str()).to_managed()); debug!("pkgid attr: {:?}", pkgid_attr); - crate.attrs = ~[attr::mk_attr(pkgid_attr)]; + crate.attrs.push(attr::mk_attr(pkgid_attr)); } debug!("calling compile_crate_from_input, workspace = {},