diff options
| author | bors <bors@rust-lang.org> | 2021-01-15 09:27:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-01-15 09:27:21 +0000 |
| commit | 4e208f6a3afb42528878b0f3464e337c4bf3bbc8 (patch) | |
| tree | 21529ff86f6f364980511a8cb4cb7a0001ae29c0 /compiler/rustc_data_structures/src | |
| parent | dcf622eb70aebe16d40c5f88fa2a41fa7019541c (diff) | |
| parent | 7286be15fa3f18ea4bd5b6ce481426f7d78e4a57 (diff) | |
| download | rust-4e208f6a3afb42528878b0f3464e337c4bf3bbc8.tar.gz rust-4e208f6a3afb42528878b0f3464e337c4bf3bbc8.zip | |
Auto merge of #81035 - JohnTitor:rollup-9m03awf, r=JohnTitor
Rollup of 5 pull requests
Successful merges:
- #80254 (Don't try to add nested predicate to Rustdoc auto-trait `ParamEnv`)
- #80834 (Remove unreachable panics from VecDeque::{front/back}[_mut])
- #80944 (Use Option::map_or instead of `.map(..).unwrap_or(..)`)
- #81008 (Don't ICE when computing a layout of a generator tainted by errors)
- #81023 (Remove doctree::Variant)
Failed merges:
- #81033 (Remove useless `clean::Variant` struct)
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 5d13b7f27c7..b16d5a9e2b4 100644 --- a/compiler/rustc_data_structures/src/profiling.rs +++ b/compiler/rustc_data_structures/src/profiling.rs @@ -166,7 +166,7 @@ impl SelfProfilerRef { // If there is no SelfProfiler then the filter mask is set to NONE, // ensuring that nothing ever tries to actually access it. let event_filter_mask = - profiler.as_ref().map(|p| p.event_filter_mask).unwrap_or(EventFilter::empty()); + profiler.as_ref().map_or(EventFilter::empty(), |p| p.event_filter_mask); SelfProfilerRef { profiler, |