diff options
| author | bors <bors@rust-lang.org> | 2023-05-08 07:35:30 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-05-08 07:35:30 +0000 |
| commit | c86e7fb60f5343041fd0c27d4affaf3261115666 (patch) | |
| tree | 2cfdd22278891d6dc1b2ae35a4ff729a0c364648 /compiler/rustc_data_structures/src | |
| parent | ea0c22ea4f58f181d6739fbe624329e576ce7994 (diff) | |
| parent | 172ddccc5086b1b7fe1f2374c9f116974af75f6a (diff) | |
| download | rust-c86e7fb60f5343041fd0c27d4affaf3261115666.tar.gz rust-c86e7fb60f5343041fd0c27d4affaf3261115666.zip | |
Auto merge of #111342 - Dylan-DPC:rollup-b5p6wzy, r=Dylan-DPC
Rollup of 7 pull requests Successful merges: - #110297 (Make `(try_)subst_and_normalize_erasing_regions` take `EarlyBinder`) - #110827 (Fix lifetime suggestion for type aliases with objects in them) - #111022 (Use smaller ints for bitflags) - #111056 (Fix some suggestions where a `Box<T>` is expected.) - #111262 (Further normalize msvc-non-utf8-ouput) - #111265 (Make generics_of has_self on RPITITs delegate to the opaque) - #111323 (Give a more helpful error when running the rustc shim directly) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_data_structures/src')
| -rw-r--r-- | compiler/rustc_data_structures/src/profiling.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_data_structures/src/profiling.rs b/compiler/rustc_data_structures/src/profiling.rs index 572bd4ac21c..5e13e7c8aaf 100644 --- a/compiler/rustc_data_structures/src/profiling.rs +++ b/compiler/rustc_data_structures/src/profiling.rs @@ -101,7 +101,7 @@ use parking_lot::RwLock; use smallvec::SmallVec; bitflags::bitflags! { - struct EventFilter: u32 { + struct EventFilter: u16 { const GENERIC_ACTIVITIES = 1 << 0; const QUERY_PROVIDERS = 1 << 1; const QUERY_CACHE_HITS = 1 << 2; |