diff options
| author | Nick Cameron <ncameron@mozilla.com> | 2016-02-01 08:43:43 +1300 |
|---|---|---|
| committer | Nick Cameron <ncameron@mozilla.com> | 2016-02-02 09:00:35 +1300 |
| commit | 185a0e51bf3d08963440d240862daeb927f113e8 (patch) | |
| tree | 1f0e424144c1ed2e74b5a7d8c156b076804bbe4d | |
| parent | 4f97338a3aec3f05e2f2b148ff79903875ea2a9f (diff) | |
| download | rust-185a0e51bf3d08963440d240862daeb927f113e8.tar.gz rust-185a0e51bf3d08963440d240862daeb927f113e8.zip | |
Reviewer requested changes and test fixes
| -rw-r--r-- | src/librustc/session/mod.rs | 8 | ||||
| -rw-r--r-- | src/librustc_driver/test.rs | 2 | ||||
| -rw-r--r-- | src/librustdoc/core.rs | 2 | ||||
| -rw-r--r-- | src/test/run-make/execution-engine/test.rs | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/librustc/session/mod.rs b/src/librustc/session/mod.rs index 2185d22d34e..3cb4597e2dd 100644 --- a/src/librustc/session/mod.rs +++ b/src/librustc/session/mod.rs @@ -179,13 +179,13 @@ impl Session { pub fn track_errors<F, T>(&self, f: F) -> Result<T, usize> where F: FnOnce() -> T { - let count = self.err_count(); + let old_count = self.err_count(); let result = f(); - let count = self.err_count() - count; - if count == 0 { + let errors = self.err_count() - old_count; + if errors == 0 { Ok(result) } else { - Err(count) + Err(errors) } } pub fn span_warn<S: Into<MultiSpan>>(&self, sp: S, msg: &str) { diff --git a/src/librustc_driver/test.rs b/src/librustc_driver/test.rs index a662081ac21..3389992ebb8 100644 --- a/src/librustc_driver/test.rs +++ b/src/librustc_driver/test.rs @@ -132,7 +132,7 @@ fn test_env<F>(source_string: &str, ty::ctxt::create_and_enter(&sess, &arenas, def_map, - named_region_map, + named_region_map.unwrap(), ast_map, freevars, region_map, diff --git a/src/librustdoc/core.rs b/src/librustdoc/core.rs index 5eac358f1bf..3e8457069d2 100644 --- a/src/librustdoc/core.rs +++ b/src/librustdoc/core.rs @@ -153,7 +153,7 @@ pub fn run_core(search_paths: SearchPaths, cfgs: Vec<String>, externs: Externs, &arenas, &name, resolve::MakeGlobMap::No, - |tcx, _, analysis| { + |tcx, _, analysis, _| { let _ignore = tcx.dep_graph.in_ignore(); let ty::CrateAnalysis { access_levels, .. } = analysis; diff --git a/src/test/run-make/execution-engine/test.rs b/src/test/run-make/execution-engine/test.rs index c4d28223c1a..3f9c81eac0b 100644 --- a/src/test/run-make/execution-engine/test.rs +++ b/src/test/run-make/execution-engine/test.rs @@ -242,9 +242,9 @@ fn compile_program(input: &str, sysroot: PathBuf) abort_on_err(driver::phase_3_run_analysis_passes( &sess, &cstore, ast_map, &arenas, &id, - MakeGlobMap::No, |tcx, mir_map, analysis| { + MakeGlobMap::No, |tcx, mir_map, analysis, _| { - let trans = driver::phase_4_translate_to_llvm(tcx, mir_map, analysis); + let trans = driver::phase_4_translate_to_llvm(tcx, mir_map.unwrap(), analysis); let crates = tcx.sess.cstore.used_crates(LinkagePreference::RequireDynamic); |