diff options
| author | bors <bors@rust-lang.org> | 2021-12-08 11:22:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-12-08 11:22:02 +0000 |
| commit | 4459e720bee5a741b962cfcd6f0593b32dc19009 (patch) | |
| tree | 8f971851dcee5e588231ca5d7af66e223af47b08 /compiler/rustc_mir_transform/src/coverage/debug.rs | |
| parent | ce0f7baf5651606c706b7014b5abdaa930cf2600 (diff) | |
| parent | 90690dae69b5213fb04b88408ad4d18a7130f40c (diff) | |
| download | rust-4459e720bee5a741b962cfcd6f0593b32dc19009.tar.gz rust-4459e720bee5a741b962cfcd6f0593b32dc19009.zip | |
Auto merge of #91656 - matthiaskrgr:rollup-lk96y6d, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #83744 (Deprecate crate_type and crate_name nested inside #![cfg_attr]) - #90550 (Update certificates in some Ubuntu 16 images.) - #91272 (Print a suggestion when comparing references to primitive types in `const fn`) - #91467 (Emphasise that an OsStr[ing] is not necessarily a platform string) - #91531 (Do not add `;` to expected tokens list when it's wrong) - #91577 (Address some FIXMEs left over from #91475) - #91638 (Remove `in_band_lifetimes` from `rustc_mir_transform`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_mir_transform/src/coverage/debug.rs')
| -rw-r--r-- | compiler/rustc_mir_transform/src/coverage/debug.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/compiler/rustc_mir_transform/src/coverage/debug.rs b/compiler/rustc_mir_transform/src/coverage/debug.rs index 513a85b5913..588103ca43d 100644 --- a/compiler/rustc_mir_transform/src/coverage/debug.rs +++ b/compiler/rustc_mir_transform/src/coverage/debug.rs @@ -629,7 +629,7 @@ impl UsedExpressions { } /// Generates the MIR pass `CoverageSpan`-specific spanview dump file. -pub(super) fn dump_coverage_spanview( +pub(super) fn dump_coverage_spanview<'tcx>( tcx: TyCtxt<'tcx>, mir_body: &mir::Body<'tcx>, basic_coverage_blocks: &CoverageGraph, @@ -651,7 +651,7 @@ pub(super) fn dump_coverage_spanview( } /// Converts the computed `BasicCoverageBlockData`s into `SpanViewable`s. -fn span_viewables( +fn span_viewables<'tcx>( tcx: TyCtxt<'tcx>, mir_body: &mir::Body<'tcx>, basic_coverage_blocks: &CoverageGraph, @@ -670,7 +670,7 @@ fn span_viewables( } /// Generates the MIR pass coverage-specific graphviz dump file. -pub(super) fn dump_coverage_graphviz( +pub(super) fn dump_coverage_graphviz<'tcx>( tcx: TyCtxt<'tcx>, mir_body: &mir::Body<'tcx>, pass_name: &str, @@ -750,7 +750,7 @@ pub(super) fn dump_coverage_graphviz( .expect("Unexpected error writing BasicCoverageBlock graphviz DOT file"); } -fn bcb_to_string_sections( +fn bcb_to_string_sections<'tcx>( tcx: TyCtxt<'tcx>, mir_body: &mir::Body<'tcx>, debug_counters: &DebugCounters, @@ -817,7 +817,7 @@ fn bcb_to_string_sections( /// Returns a simple string representation of a `TerminatorKind` variant, independent of any /// values it might hold. -pub(super) fn term_type(kind: &TerminatorKind<'tcx>) -> &'static str { +pub(super) fn term_type(kind: &TerminatorKind<'_>) -> &'static str { match kind { TerminatorKind::Goto { .. } => "Goto", TerminatorKind::SwitchInt { .. } => "SwitchInt", |