use rustc::util::nodemap::DefIdSet;
use rustc_trans::back::link;
use rustc_resolve as resolve;
-use rustc_front::lowering::lower_crate;
+use rustc_front::lowering::{lower_crate, LoweringContext};
use syntax::{ast, codemap, diagnostic};
use syntax::feature_gate::UnstableFeatures;
/// Are we generating documentation (`Typed`) or tests (`NotTyped`)?
pub enum MaybeTyped<'a, 'tcx: 'a> {
Typed(&'a ty::ctxt<'tcx>),
- NotTyped(session::Session)
+ NotTyped(&'a session::Session)
}
pub type ExternalPaths = RefCell<Option<HashMap<DefId,
let krate = driver::assign_node_ids(&sess, krate);
// Lower ast -> hir.
- let mut hir_forest = hir_map::Forest::new(lower_crate(&krate));
+ let foo = &42;
+ let lcx = LoweringContext::new(foo, &sess, &krate);
+ let mut hir_forest = hir_map::Forest::new(lower_crate(&lcx, &krate));
let arenas = ty::CtxtArenas::new();
let hir_map = driver::make_map(&sess, &mut hir_forest);
- driver::phase_3_run_analysis_passes(sess,
+ driver::phase_3_run_analysis_passes(&sess,
hir_map,
&arenas,
name,
*analysis.inlined.borrow_mut() = map;
analysis.deref_trait_did = ctxt.deref_trait_did.get();
(krate, analysis)
- }).1
+ })
}
use rustc::session::{self, config};
use rustc::session::config::{get_unstable_features_setting, OutputType};
use rustc::session::search_paths::{SearchPaths, PathKind};
-use rustc_front::lowering::lower_crate;
+use rustc_front::lowering::{lower_crate, LoweringContext};
use rustc_back::tempdir::TempDir;
use rustc_driver::{driver, Compilation};
use syntax::codemap::CodeMap;
"rustdoc-test", None)
.expect("phase_2_configure_and_expand aborted in rustdoc!");
let krate = driver::assign_node_ids(&sess, krate);
- let krate = lower_crate(&krate);
+ let foo = &42;
+ let lcx = LoweringContext::new(foo, &sess, &krate);
+ let krate = lower_crate(&lcx, &krate);
let opts = scrape_test_config(&krate);
let map = hir_map::map_crate(&mut forest);
let ctx = core::DocContext {
+<<<<<<< HEAD
map: &map,
maybe_typed: core::NotTyped(sess),
+=======
+ krate: &krate,
+ maybe_typed: core::NotTyped(&sess),
+>>>>>>> Fixes to rustdoc, etc.
input: input,
external_paths: RefCell::new(Some(HashMap::new())),
external_traits: RefCell::new(None),