diff options
| author | bors <bors@rust-lang.org> | 2017-09-18 17:30:29 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-09-18 17:30:29 +0000 |
| commit | 0701b37d97d08da7074ece7a7dcb4449498f4bfa (patch) | |
| tree | 796f1ce756d1bce72a8462d6d74c28f11263895c /src/librustc_driver | |
| parent | 3a7b960731fd1cf86f1879b1a0d44196a0917c53 (diff) | |
| parent | 929215db7c598722410709022e69f71702f02e0b (diff) | |
| download | rust-0701b37d97d08da7074ece7a7dcb4449498f4bfa.tar.gz rust-0701b37d97d08da7074ece7a7dcb4449498f4bfa.zip | |
Auto merge of #44678 - alexcrichton:rollup, r=alexcrichton
Rollup of 11 pull requests - Successful merges: #44364, #44466, #44537, #44548, #44640, #44651, #44657, #44661, #44668, #44671, #44675 - Failed merges:
Diffstat (limited to 'src/librustc_driver')
| -rw-r--r-- | src/librustc_driver/driver.rs | 2 | ||||
| -rw-r--r-- | src/librustc_driver/test.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_driver/driver.rs b/src/librustc_driver/driver.rs index 32a160bcffc..d50d3deb673 100644 --- a/src/librustc_driver/driver.rs +++ b/src/librustc_driver/driver.rs @@ -175,7 +175,7 @@ pub fn compile_input(sess: &Session, // Construct the HIR map let hir_map = time(sess.time_passes(), "indexing hir", - || hir_map::map_crate(&mut hir_forest, defs)); + || hir_map::map_crate(&mut hir_forest, &defs)); { let _ignore = hir_map.dep_graph.in_ignore(); diff --git a/src/librustc_driver/test.rs b/src/librustc_driver/test.rs index 34f4e0e7b0c..daabf481e46 100644 --- a/src/librustc_driver/test.rs +++ b/src/librustc_driver/test.rs @@ -133,7 +133,7 @@ fn test_env<F>(source_string: &str, let arena = DroplessArena::new(); let arenas = ty::GlobalArenas::new(); - let hir_map = hir_map::map_crate(&mut hir_forest, defs); + let hir_map = hir_map::map_crate(&mut hir_forest, &defs); // run just enough stuff to build a tcx: let named_region_map = resolve_lifetime::krate(&sess, &*cstore, &hir_map); |
