Skip to content

Commit

Permalink
Rollup merge of rust-lang#56223 - Mark-Simulacrum:self-profile-json, …
Browse files Browse the repository at this point in the history
…r=wesleywiser

Make JSON output from -Zprofile-json valid

r? @wesleywiser

cc rust-lang/rustc-perf#299
  • Loading branch information
pietroalbini committed Nov 28, 2018
2 parents 2a07404 + 2d2b7c0 commit 26bc763
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/librustc/util/profiling.rs
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ macro_rules! define_categories {
};

json.push_str(&format!(
"{{ \"category\": {}, \"time_ms\": {},
"{{ \"category\": \"{}\", \"time_ms\": {},\
\"query_count\": {}, \"query_hits\": {} }},",
stringify!($name),
self.times.$name / 1_000_000,
Expand Down

0 comments on commit 26bc763

Please sign in to comment.