diff options
| author | bors <bors@rust-lang.org> | 2022-06-05 09:30:53 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-06-05 09:30:53 +0000 |
| commit | 4322a785cc99ea5fc81dd7f5fc8ba7f7a64b08ef (patch) | |
| tree | 4a4a195907d0e90c345e280060c116038fa572a3 /compiler/rustc_mir_transform/src/coverage/debug.rs | |
| parent | a2da4af33c5e6a22fff0a223f99d53cba4a5aa52 (diff) | |
| parent | cae3c78664a2ed901e5e962707960e45e7cea33d (diff) | |
| download | rust-4322a785cc99ea5fc81dd7f5fc8ba7f7a64b08ef.tar.gz rust-4322a785cc99ea5fc81dd7f5fc8ba7f7a64b08ef.zip | |
Auto merge of #97697 - WaffleLapkin:no_ref_vec, r=WaffleLapkin
Replace `&Vec<_>`s with `&[_]`s It's generally preferable to use `&[_]` since it's one less indirection and it can be created from types other that `Vec`. I've left `&Vec` in some locals where it doesn't really matter, in cases where `TypeFoldable` is expected (`TypeFoldable: Clone` so slice can't implement it) and in cases where it's `&TypeAliasThatIsActiallyVec`. Nothing important, really, I was just a little annoyed by `visit_generic_param_vec` :D r? `@compiler-errors`
Diffstat (limited to 'compiler/rustc_mir_transform/src/coverage/debug.rs')
| -rw-r--r-- | compiler/rustc_mir_transform/src/coverage/debug.rs | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/compiler/rustc_mir_transform/src/coverage/debug.rs b/compiler/rustc_mir_transform/src/coverage/debug.rs index 434bf9d849e..d31ac04274c 100644 --- a/compiler/rustc_mir_transform/src/coverage/debug.rs +++ b/compiler/rustc_mir_transform/src/coverage/debug.rs @@ -124,6 +124,7 @@ use rustc_span::Span; use std::iter; use std::lazy::SyncOnceCell; +use std::ops::Deref; pub const NESTED_INDENT: &str = " "; @@ -434,11 +435,11 @@ impl GraphvizData { pub fn get_bcb_coverage_spans_with_counters( &self, bcb: BasicCoverageBlock, - ) -> Option<&Vec<(CoverageSpan, CoverageKind)>> { + ) -> Option<&[(CoverageSpan, CoverageKind)]> { if let Some(bcb_to_coverage_spans_with_counters) = self.some_bcb_to_coverage_spans_with_counters.as_ref() { - bcb_to_coverage_spans_with_counters.get(&bcb) + bcb_to_coverage_spans_with_counters.get(&bcb).map(Deref::deref) } else { None } @@ -457,12 +458,9 @@ impl GraphvizData { } } - pub fn get_bcb_dependency_counters( - &self, - bcb: BasicCoverageBlock, - ) -> Option<&Vec<CoverageKind>> { + pub fn get_bcb_dependency_counters(&self, bcb: BasicCoverageBlock) -> Option<&[CoverageKind]> { if let Some(bcb_to_dependency_counters) = self.some_bcb_to_dependency_counters.as_ref() { - bcb_to_dependency_counters.get(&bcb) + bcb_to_dependency_counters.get(&bcb).map(Deref::deref) } else { None } @@ -571,11 +569,11 @@ impl UsedExpressions { /// associated with a coverage span). pub fn validate( &mut self, - bcb_counters_without_direct_coverage_spans: &Vec<( + bcb_counters_without_direct_coverage_spans: &[( Option<BasicCoverageBlock>, BasicCoverageBlock, CoverageKind, - )>, + )], ) { if self.is_enabled() { let mut not_validated = bcb_counters_without_direct_coverage_spans @@ -634,7 +632,7 @@ pub(super) fn dump_coverage_spanview<'tcx>( basic_coverage_blocks: &CoverageGraph, pass_name: &str, body_span: Span, - coverage_spans: &Vec<CoverageSpan>, + coverage_spans: &[CoverageSpan], ) { let mir_source = mir_body.source; let def_id = mir_source.def_id(); @@ -654,7 +652,7 @@ fn span_viewables<'tcx>( tcx: TyCtxt<'tcx>, mir_body: &mir::Body<'tcx>, basic_coverage_blocks: &CoverageGraph, - coverage_spans: &Vec<CoverageSpan>, + coverage_spans: &[CoverageSpan], ) -> Vec<SpanViewable> { let mut span_viewables = Vec::new(); for coverage_span in coverage_spans { @@ -676,7 +674,7 @@ pub(super) fn dump_coverage_graphviz<'tcx>( basic_coverage_blocks: &CoverageGraph, debug_counters: &DebugCounters, graphviz_data: &GraphvizData, - intermediate_expressions: &Vec<CoverageKind>, + intermediate_expressions: &[CoverageKind], debug_used_expressions: &UsedExpressions, ) { let mir_source = mir_body.source; @@ -753,9 +751,9 @@ fn bcb_to_string_sections<'tcx>( mir_body: &mir::Body<'tcx>, debug_counters: &DebugCounters, bcb_data: &BasicCoverageBlockData, - some_coverage_spans_with_counters: Option<&Vec<(CoverageSpan, CoverageKind)>>, - some_dependency_counters: Option<&Vec<CoverageKind>>, - some_intermediate_expressions: Option<&Vec<CoverageKind>>, + some_coverage_spans_with_counters: Option<&[(CoverageSpan, CoverageKind)]>, + some_dependency_counters: Option<&[CoverageKind]>, + some_intermediate_expressions: Option<&[CoverageKind]>, ) -> Vec<String> { let len = bcb_data.basic_blocks.len(); let mut sections = Vec::new(); |
