about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRemy Rakic <remy.rakic@gmail.com>2019-12-09 18:59:49 +0100
committerRemy Rakic <remy.rakic@gmail.com>2019-12-10 11:44:44 +0100
commit72579c944446465f0f6042725f112485d04b9f6d (patch)
tree54824eaa64a88e3da374f46099dd529c6fcc1774
parentd18bfd647e0e4c81f9e37c7e2f510e297cc85236 (diff)
downloadrust-72579c944446465f0f6042725f112485d04b9f6d.tar.gz
rust-72579c944446465f0f6042725f112485d04b9f6d.zip
cleanup polonius liveness fact generation: refactor some type names
- singular instead of plurals for a relation
- terminology: use "Path"s instead of "MovePath"s
-rw-r--r--src/librustc_mir/borrow_check/nll/type_check/liveness/polonius.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/librustc_mir/borrow_check/nll/type_check/liveness/polonius.rs b/src/librustc_mir/borrow_check/nll/type_check/liveness/polonius.rs
index af7a23629e6..49b39c01daa 100644
--- a/src/librustc_mir/borrow_check/nll/type_check/liveness/polonius.rs
+++ b/src/librustc_mir/borrow_check/nll/type_check/liveness/polonius.rs
@@ -8,16 +8,16 @@ use rustc::ty::subst::GenericArg;
 
 use super::TypeChecker;
 
-type VarPointRelations = Vec<(Local, LocationIndex)>;
-type MovePathPointRelations = Vec<(MovePathIndex, LocationIndex)>;
+type VarPointRelation = Vec<(Local, LocationIndex)>;
+type PathPointRelation = Vec<(MovePathIndex, LocationIndex)>;
 
 struct UseFactsExtractor<'me> {
-    var_defined: &'me mut VarPointRelations,
-    var_used: &'me mut VarPointRelations,
+    var_defined: &'me mut VarPointRelation,
+    var_used: &'me mut VarPointRelation,
     location_table: &'me LocationTable,
     var_drop_used: &'me mut Vec<(Local, Location)>,
     move_data: &'me MoveData<'me>,
-    path_accessed_at: &'me mut MovePathPointRelations,
+    path_accessed_at: &'me mut PathPointRelation,
 }
 
 // A Visitor to walk through the MIR and extract point-wise facts