nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-24 07:44:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename for clarity

Browse Source
This commit is contained in:
Shotaro Yamada 2020-02-14 14:07:06 +09:00
parent 06f0ab03ef
commit 1c5c054e4c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clippy_lints/src/redundant_clone.rs
View File

@ -452,7 +452,7 @@ impl<'a, 'tcx> PossibleBorrowerVisitor<'a, 'tcx> {
self, self,
cx: &LateContext<'a, 'tcx>, cx: &LateContext<'a, 'tcx>,
maybe_live: DataflowResults<'tcx, MaybeStorageLive<'a, 'tcx>>, maybe_live: DataflowResults<'tcx, MaybeStorageLive<'a, 'tcx>>,
) -> PossibleBorrower<'a, 'tcx> { ) -> PossibleBorrowerMap<'a, 'tcx> {
let mut map = FxHashMap::default(); let mut map = FxHashMap::default();
for row in (1..self.body.local_decls.len()).map(mir::Local::from_usize) { for row in (1..self.body.local_decls.len()).map(mir::Local::from_usize) {
if is_copy(cx, self.body.local_decls[row].ty) { if is_copy(cx, self.body.local_decls[row].ty) {
@ -475,7 +475,7 @@ impl<'a, 'tcx> PossibleBorrowerVisitor<'a, 'tcx> {
} }
let bs = BitSet::new_empty(self.body.local_decls.len()); let bs = BitSet::new_empty(self.body.local_decls.len());
PossibleBorrower { PossibleBorrowerMap {
map, map,
maybe_live: DataflowResultsCursor::new(maybe_live, self.body), maybe_live: DataflowResultsCursor::new(maybe_live, self.body),
bitset: (bs.clone(), bs), bitset: (bs.clone(), bs),
@ -557,7 +557,7 @@ fn rvalue_locals(rvalue: &mir::Rvalue<'_>, mut visit: impl FnMut(mir::Local)) {
} }
/// Result of `PossibleBorrowerVisitor`. /// Result of `PossibleBorrowerVisitor`.
struct PossibleBorrower<'a, 'tcx> { struct PossibleBorrowerMap<'a, 'tcx> {
/// Mapping `Local -> its possible borrowers` /// Mapping `Local -> its possible borrowers`
map: FxHashMap<mir::Local, HybridBitSet<mir::Local>>, map: FxHashMap<mir::Local, HybridBitSet<mir::Local>>,
maybe_live: DataflowResultsCursor<'a, 'tcx, MaybeStorageLive<'a, 'tcx>>, maybe_live: DataflowResultsCursor<'a, 'tcx, MaybeStorageLive<'a, 'tcx>>,
@ -565,7 +565,7 @@ struct PossibleBorrower<'a, 'tcx> {
bitset: (BitSet<mir::Local>, BitSet<mir::Local>), bitset: (BitSet<mir::Local>, BitSet<mir::Local>),
} }
impl PossibleBorrower<'_, '_> { impl PossibleBorrowerMap<'_, '_> {
/// Returns true if the set of borrowers of `borrowed` living at `at` matches with `borrowers`. /// Returns true if the set of borrowers of `borrowed` living at `at` matches with `borrowers`.
fn only_borrowers(&mut self, borrowers: &[mir::Local], borrowed: mir::Local, at: mir::Location) -> bool { fn only_borrowers(&mut self, borrowers: &[mir::Local], borrowed: mir::Local, at: mir::Location) -> bool {
self.maybe_live.seek(at); self.maybe_live.seek(at);