Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-05-04 09:53:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #56553 - wesleywiser:silence_profiler_output, r=Mark-Simulacrum

Browse Source 
Don't print the profiling summary to stdout when -Zprofile-json is set

cc rust-lang-nursery/rustc-perf#299
This commit is contained in:
Pietro Albini
2018-12-06 07:49:02 +01:00
committed by GitHub
parent e9e92d53ad 3858aff9d3
commit cd1ee5edbd
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/librustc/session/mod.rs
+1 -1
View File
@@ -826,7 +826,7 @@ pub fn incr_comp_session_dir_opt(&self) -> Option<cell::Ref<'_, PathBuf>> {
}
pub fn profiler<F: FnOnce(&mut SelfProfiler) -> ()>(&self, f: F) {
if self.opts.debugging_opts.self_profile {
if self.opts.debugging_opts.self_profile || self.opts.debugging_opts.profile_json {
let mut profiler = self.self_profiling.borrow_mut();
f(&mut profiler);
}
src/librustc_driver/driver.rs
+3 -3
View File
@@ -356,10 +356,10 @@ macro_rules! controller_entry_point {
if sess.opts.debugging_opts.self_profile {
sess.print_profiler_results();
}
if sess.opts.debugging_opts.profile_json {
sess.save_json_results();
}
if sess.opts.debugging_opts.profile_json {
sess.save_json_results();
}
controller_entry_point!(