---

yaml
---
r: 151357
b: refs/heads/try2
c: 50fb77f
h: refs/heads/master
i:
  151355: f201e4c
v: v3

Author: alexcrichton

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 5d145c1c18abb1a6b81238dd1b73178635c12f0a
+refs/heads/try2: 50fb77f8baed29bb1014893c8a1f3e66cbd8e3e1
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustdoc/clean.rs

@@ -20,6 +20,8 @@ use syntax::codemap::Pos;
 use syntax::parse::token::InternedString;
 use syntax::parse::token;
 
+use rustc::back::link;
+use rustc::driver::driver;
 use rustc::metadata::cstore;
 use rustc::metadata::csearch;
 use rustc::metadata::decoder;
@@ -75,19 +77,23 @@ pub struct Crate {
 
 impl<'a> Clean<Crate> for visit_ast::RustdocVisitor<'a> {
     fn clean(&self) -> Crate {
-        use syntax::attr::find_crateid;
         let cx = local_data::get(super::ctxtkey, |x| *x.unwrap());
 
         let mut externs = Vec::new();
         cx.sess().cstore.iter_crate_data(|n, meta| {
             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 {
-            name: match find_crateid(self.attrs.as_slice()) {
-                Some(n) => n.name,
-                None => fail!("rustdoc requires a `crate_id` crate attribute"),
-            },
+            name: id.name,
             module: Some(self.module.clean()),
             externs: externs,
         }

branches/try2/src/librustdoc/core.rs

@@ -34,7 +34,8 @@ pub enum MaybeTyped {
 
 pub struct DocContext {
     pub krate: ast::Crate,
-    pub maybe_typed: MaybeTyped
+    pub maybe_typed: MaybeTyped,
+    pub src: Path,
 }
 
 impl DocContext {
@@ -96,7 +97,8 @@ fn get_ast_and_resolve(cpath: &Path, libs: HashSet<Path>, cfgs: Vec<~str>)
     debug!("crate: {:?}", krate);
     (DocContext {
         krate: krate,
-        maybe_typed: Typed(ty_cx)
+        maybe_typed: Typed(ty_cx),
+        src: cpath.clone(),
     }, CrateAnalysis {
         exported_items: exported_items,
         public_items: public_items,

branches/try2/src/librustdoc/test.rs

@@ -55,7 +55,7 @@ pub fn run(input: &str, cfgs: Vec<~str>,
     diagnostic::mk_span_handler(diagnostic_handler, codemap);
 
     let sess = driver::build_session_(sessopts,
-                                      Some(input_path),
+                                      Some(input_path.clone()),
                                       span_diagnostic_handler);
 
     let mut cfg = driver::build_configuration(&sess);
@@ -70,6 +70,7 @@ pub fn run(input: &str, cfgs: Vec<~str>,
     let ctx = @core::DocContext {
         krate: krate,
         maybe_typed: core::NotTyped(sess),
+        src: input_path,
     };
     local_data::set(super::ctxtkey, ctx);