Skip to content

Commit 7734308

Browse files
committed
ignore dep-graph in resolve and lower_crate
This got removed at some point, it seems.
1 parent b711734 commit 7734308

File tree

4 files changed

+13
-3
lines changed

4 files changed

+13
-3
lines changed

src/librustc/hir/lowering.rs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ use hir::map::Definitions;
4545
use hir::map::definitions::DefPathData;
4646
use hir::def_id::{DefIndex, DefId};
4747
use hir::def::{Def, PathResolution};
48+
use session::Session;
4849

4950
use std::collections::BTreeMap;
5051
use std::iter;
@@ -97,8 +98,16 @@ impl Resolver for DummyResolver {
9798
}
9899
}
99100

100-
pub fn lower_crate(krate: &Crate, id_assigner: &NodeIdAssigner, resolver: &mut Resolver)
101+
pub fn lower_crate(sess: &Session,
102+
krate: &Crate,
103+
id_assigner: &NodeIdAssigner,
104+
resolver: &mut Resolver)
101105
-> hir::Crate {
106+
// We're constructing the HIR here; we don't care what we will
107+
// read, since we haven't even constructed the *input* to
108+
// incr. comp. yet.
109+
let _ignore = sess.dep_graph.in_ignore();
110+
102111
LoweringContext {
103112
crate_root: if std_inject::no_core(krate) {
104113
None

src/librustc_driver/driver.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -814,7 +814,7 @@ pub fn lower_and_resolve<'a>(sess: &Session,
814814

815815
// Lower ast -> hir.
816816
let hir_forest = time(sess.time_passes(), "lowering ast -> hir", || {
817-
hir_map::Forest::new(lower_crate(krate, sess, &mut resolver), dep_graph)
817+
hir_map::Forest::new(lower_crate(sess, krate, sess, &mut resolver), dep_graph)
818818
});
819819

820820
(ty::CrateAnalysis {

src/librustc_resolve/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3624,6 +3624,7 @@ pub fn resolve_crate<'a, 'b>(resolver: &'b mut Resolver<'a>, krate: &'b Crate) {
36243624
// reflects not just its contents but the results of name
36253625
// resolution on those contents. Hopefully we'll push this back at
36263626
// some point.
3627+
let _ignore = resolver.session.dep_graph.in_ignore();
36273628

36283629
resolver.build_reduced_graph(krate);
36293630
resolve_imports::resolve_imports(resolver);

src/librustdoc/test.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ pub fn run(input: &str,
101101
let defs = hir_map::collect_definitions(&krate);
102102

103103
let mut dummy_resolver = DummyResolver;
104-
let krate = lower_crate(&krate, &sess, &mut dummy_resolver);
104+
let krate = lower_crate(&sess, &krate, &sess, &mut dummy_resolver);
105105

106106
let opts = scrape_test_config(&krate);
107107

0 commit comments

Comments
 (0)