diff options
| author | bors <bors@rust-lang.org> | 2013-12-15 01:01:43 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-12-15 01:01:43 -0800 |
| commit | 386b455b1b00f418f1e19255023593e724036cb4 (patch) | |
| tree | 6e031f23d9e40e4ebd3b94fe5716155f729dcf8e /src | |
| parent | 7f5787ac26e66f42323fa417cb4b0356b22e7da5 (diff) | |
| parent | b20aa5b77d0184810aa6f5287aab34f65f6bde77 (diff) | |
| download | rust-386b455b1b00f418f1e19255023593e724036cb4.tar.gz rust-386b455b1b00f418f1e19255023593e724036cb4.zip | |
auto merge of #10948 : cmr/rust/update_pkgid, r=metajack
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustdoc/clean.rs | 11 | ||||
| -rw-r--r-- | src/librustpkg/util.rs | 2 |
2 files changed, 5 insertions, 8 deletions
diff --git a/src/librustdoc/clean.rs b/src/librustdoc/clean.rs index 54323ddeb32..e4f0b8ceb81 100644 --- a/src/librustdoc/clean.rs +++ b/src/librustdoc/clean.rs @@ -73,9 +73,7 @@ pub struct Crate { impl Clean<Crate> 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<Crate> 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.name, + None => fail!("rustdoc requires a `pkgid` crate attribute"), }, module: Some(self.module.clean()), externs: externs, diff --git a/src/librustpkg/util.rs b/src/librustpkg/util.rs index 4b0de74a90f..296021204bf 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 = {}, |