rustdoc: Stop requiring a crate ID attribute
This is mostly just an artificial requirement as it can use similar logic to the compiler to infer the crate id.
This commit is contained in:
parent
5d145c1c18
commit
50fb77f8ba
|
@ -20,6 +20,8 @@ use syntax::codemap::Pos;
|
||||||
use syntax::parse::token::InternedString;
|
use syntax::parse::token::InternedString;
|
||||||
use syntax::parse::token;
|
use syntax::parse::token;
|
||||||
|
|
||||||
|
use rustc::back::link;
|
||||||
|
use rustc::driver::driver;
|
||||||
use rustc::metadata::cstore;
|
use rustc::metadata::cstore;
|
||||||
use rustc::metadata::csearch;
|
use rustc::metadata::csearch;
|
||||||
use rustc::metadata::decoder;
|
use rustc::metadata::decoder;
|
||||||
|
@ -75,7 +77,6 @@ pub struct Crate {
|
||||||
|
|
||||||
impl<'a> Clean<Crate> for visit_ast::RustdocVisitor<'a> {
|
impl<'a> Clean<Crate> for visit_ast::RustdocVisitor<'a> {
|
||||||
fn clean(&self) -> Crate {
|
fn clean(&self) -> Crate {
|
||||||
use syntax::attr::find_crateid;
|
|
||||||
let cx = local_data::get(super::ctxtkey, |x| *x.unwrap());
|
let cx = local_data::get(super::ctxtkey, |x| *x.unwrap());
|
||||||
|
|
||||||
let mut externs = Vec::new();
|
let mut externs = Vec::new();
|
||||||
|
@ -83,11 +84,16 @@ impl<'a> Clean<Crate> for visit_ast::RustdocVisitor<'a> {
|
||||||
externs.push((n, meta.clean()));
|
externs.push((n, meta.clean()));
|
||||||
});
|
});
|
||||||
|
|
||||||
|
let input = driver::FileInput(cx.src.clone());
|
||||||
|
let t_outputs = driver::build_output_filenames(&input,
|
||||||
|
&None,
|
||||||
|
&None,
|
||||||
|
self.attrs.as_slice(),
|
||||||
|
cx.sess());
|
||||||
|
let id = link::find_crate_id(self.attrs.as_slice(),
|
||||||
|
t_outputs.out_filestem);
|
||||||
Crate {
|
Crate {
|
||||||
name: match find_crateid(self.attrs.as_slice()) {
|
name: id.name,
|
||||||
Some(n) => n.name,
|
|
||||||
None => fail!("rustdoc requires a `crate_id` crate attribute"),
|
|
||||||
},
|
|
||||||
module: Some(self.module.clean()),
|
module: Some(self.module.clean()),
|
||||||
externs: externs,
|
externs: externs,
|
||||||
}
|
}
|
||||||
|
|
|
@ -34,7 +34,8 @@ pub enum MaybeTyped {
|
||||||
|
|
||||||
pub struct DocContext {
|
pub struct DocContext {
|
||||||
pub krate: ast::Crate,
|
pub krate: ast::Crate,
|
||||||
pub maybe_typed: MaybeTyped
|
pub maybe_typed: MaybeTyped,
|
||||||
|
pub src: Path,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl DocContext {
|
impl DocContext {
|
||||||
|
@ -96,7 +97,8 @@ fn get_ast_and_resolve(cpath: &Path, libs: HashSet<Path>, cfgs: Vec<~str>)
|
||||||
debug!("crate: {:?}", krate);
|
debug!("crate: {:?}", krate);
|
||||||
(DocContext {
|
(DocContext {
|
||||||
krate: krate,
|
krate: krate,
|
||||||
maybe_typed: Typed(ty_cx)
|
maybe_typed: Typed(ty_cx),
|
||||||
|
src: cpath.clone(),
|
||||||
}, CrateAnalysis {
|
}, CrateAnalysis {
|
||||||
exported_items: exported_items,
|
exported_items: exported_items,
|
||||||
public_items: public_items,
|
public_items: public_items,
|
||||||
|
|
|
@ -55,7 +55,7 @@ pub fn run(input: &str, cfgs: Vec<~str>,
|
||||||
diagnostic::mk_span_handler(diagnostic_handler, codemap);
|
diagnostic::mk_span_handler(diagnostic_handler, codemap);
|
||||||
|
|
||||||
let sess = driver::build_session_(sessopts,
|
let sess = driver::build_session_(sessopts,
|
||||||
Some(input_path),
|
Some(input_path.clone()),
|
||||||
span_diagnostic_handler);
|
span_diagnostic_handler);
|
||||||
|
|
||||||
let mut cfg = driver::build_configuration(&sess);
|
let mut cfg = driver::build_configuration(&sess);
|
||||||
|
@ -70,6 +70,7 @@ pub fn run(input: &str, cfgs: Vec<~str>,
|
||||||
let ctx = @core::DocContext {
|
let ctx = @core::DocContext {
|
||||||
krate: krate,
|
krate: krate,
|
||||||
maybe_typed: core::NotTyped(sess),
|
maybe_typed: core::NotTyped(sess),
|
||||||
|
src: input_path,
|
||||||
};
|
};
|
||||||
local_data::set(super::ctxtkey, ctx);
|
local_data::set(super::ctxtkey, ctx);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue