about summary refs log tree commit diff
diff options
context:
space:
mode:
authorGuillaume Gomez <guillaume1.gomez@gmail.com>2018-11-29 13:10:40 +0100
committerGitHub <noreply@github.com>2018-11-29 13:10:40 +0100
commit5bc98a731dcc0e37afdd68c70de83e870d26349f (patch)
tree72ef93090fca35fc12b3fe5787ec7c9328a3ca28
parent796892e0ef6b57c6497244e7618d2e1ecde0e29a (diff)
parent2d2b7c01ebee3f2926af58b9461284e271955855 (diff)
downloadrust-5bc98a731dcc0e37afdd68c70de83e870d26349f.tar.gz
rust-5bc98a731dcc0e37afdd68c70de83e870d26349f.zip
Rollup merge of #56223 - Mark-Simulacrum:self-profile-json, r=wesleywiser
Make JSON output from -Zprofile-json valid

r? @wesleywiser

cc https://github.com/rust-lang-nursery/rustc-perf/issues/299
-rw-r--r--src/librustc/util/profiling.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc/util/profiling.rs b/src/librustc/util/profiling.rs
index 6540a09d877..bea3453b31a 100644
--- a/src/librustc/util/profiling.rs
+++ b/src/librustc/util/profiling.rs
@@ -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,