From: bors <bors@rust-lang.org>
Date: Thu, 6 Aug 2020 20:22:20 +0000 (+0000)
Subject: Auto merge of #75228 - tmiasko:keep-stdout-open, r=ecstatic-morse
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=71f8d0c8f1060bbe74100f29cc6f2da63d697c28;hp=888bc07c6bee3ed96b6f94f83e13a66828858ad4;p=rust.git

Auto merge of #75228 - tmiasko:keep-stdout-open, r=ecstatic-morse

Keep stdout open in limit_vector_count test
---

diff --git a/src/librustc_metadata/rmeta/decoder/cstore_impl.rs b/src/librustc_metadata/rmeta/decoder/cstore_impl.rs
index e51862be9a8..2897480c32b 100644
--- a/src/librustc_metadata/rmeta/decoder/cstore_impl.rs
+++ b/src/librustc_metadata/rmeta/decoder/cstore_impl.rs
@@ -37,7 +37,7 @@ pub fn provide_extern(providers: &mut Providers) {
                 def_id_arg: ty::query::query_keys::$name<$lt>,
             ) -> ty::query::query_values::$name<$lt> {
                 let _prof_timer =
-                    $tcx.prof.generic_activity("metadata_decode_entry");
+                    $tcx.prof.generic_activity(concat!("metadata_decode_entry_", stringify!($name)));
 
                 #[allow(unused_variables)]
                 let ($def_id, $other) = def_id_arg.into_args();