diff options
| author | bors <bors@rust-lang.org> | 2022-12-24 01:42:00 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-12-24 01:42:00 +0000 |
| commit | 6c0c6d6eb3b38931f9dd4f5466185591e91d51c9 (patch) | |
| tree | f9bbd98ac8ddf794826fd4ba2f70c5efc2c0021e /compiler/rustc_mir_transform/src/coverage/query.rs | |
| parent | 2c3f284003d4bbedb9f0212c8f37c726124fa0ab (diff) | |
| parent | da4be75b535979666d9b34902edc6d89ebfece85 (diff) | |
| download | rust-6c0c6d6eb3b38931f9dd4f5466185591e91d51c9.tar.gz rust-6c0c6d6eb3b38931f9dd4f5466185591e91d51c9.zip | |
Auto merge of #106103 - matthiaskrgr:rollup-8xe9ddz, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #105970 (docs/test: add UI test and long-form error docs for E0462) - #105975 (rustc: Remove needless lifetimes) - #106069 (rustdoc: use a more evocative name for CSS/JS `#titles`) - #106084 (fix vec::IntoIter::drop on high-alignment ZST) - #106091 (Use correct CSS pseudo-element selector) - #106093 (rustdoc: remove no-op CSS from `.docblock-short`) - #106102 (Fix `triagebot.toml`) Failed merges: - #106028 (docs/test: add UI test and long-form error docs for `E0461`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_mir_transform/src/coverage/query.rs')
| -rw-r--r-- | compiler/rustc_mir_transform/src/coverage/query.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_mir_transform/src/coverage/query.rs b/compiler/rustc_mir_transform/src/coverage/query.rs index dc1e68b253e..3bd7f31b45d 100644 --- a/compiler/rustc_mir_transform/src/coverage/query.rs +++ b/compiler/rustc_mir_transform/src/coverage/query.rs @@ -136,7 +136,7 @@ fn coverageinfo<'tcx>(tcx: TyCtxt<'tcx>, instance_def: ty::InstanceDef<'tcx>) -> coverage_visitor.info } -fn covered_code_regions<'tcx>(tcx: TyCtxt<'tcx>, def_id: DefId) -> Vec<&'tcx CodeRegion> { +fn covered_code_regions(tcx: TyCtxt<'_>, def_id: DefId) -> Vec<&CodeRegion> { let body = mir_body(tcx, def_id); body.basic_blocks .iter() @@ -163,7 +163,7 @@ fn is_inlined(body: &Body<'_>, statement: &Statement<'_>) -> bool { /// This function ensures we obtain the correct MIR for the given item irrespective of /// whether that means const mir or runtime mir. For `const fn` this opts for runtime /// mir. -fn mir_body<'tcx>(tcx: TyCtxt<'tcx>, def_id: DefId) -> &'tcx mir::Body<'tcx> { +fn mir_body(tcx: TyCtxt<'_>, def_id: DefId) -> &mir::Body<'_> { let id = ty::WithOptConstParam::unknown(def_id); let def = ty::InstanceDef::Item(id); tcx.instance_mir(def) |
