(c2rust-analyze) Refactor out AnalysisCtxt::check_const_ref_perms.

Author: kkysen

c2rust-analyze/src/context.rs

@@ -121,10 +121,23 @@ pub struct AnalysisCtxt<'a, 'tcx> {
     next_ptr_id: NextLocalPointerId,
 }
 
-impl<'a, 'tcx> AnalysisCtxt<'a, 'tcx> {
+impl<'a, 'tcx> AnalysisCtxt<'_, 'tcx> {
     pub fn const_ref_tys(&'a self) -> impl Iterator<Item = LTy<'tcx>> + 'a {
         self.const_ref_locs.iter().map(|loc| self.rvalue_tys[loc])
     }
+
+    pub fn check_const_ref_perms(&self, asn: &Assignment) {
+        for const_ref_lty in self.const_ref_tys() {
+            let ptr_id = const_ref_lty.label;
+            let expected_perms = PermissionSet::for_const_ref_ty(const_ref_lty.ty);
+            let mut actual_perms = asn.perms()[ptr_id];
+            // Ignore `UNIQUE` as it gets automatically added to all permissions
+            // and then removed later if it can't apply.
+            // We don't care about `UNIQUE` for const refs, so just unset it here.
+            actual_perms.set(PermissionSet::UNIQUE, false);
+            assert_eq!(expected_perms, actual_perms);
+        }
+    }
 }
 
 pub struct AnalysisCtxtData<'tcx> {

c2rust-analyze/src/main.rs

@@ -620,16 +620,7 @@ fn run(tcx: TyCtxt) {
         let mut asn = gasn.and(&mut info.lasn);
         info.dataflow.propagate_cell(&mut asn);
 
-        for const_ref_lty in acx.const_ref_tys() {
-            let ptr_id = const_ref_lty.label;
-            let expected_perms = PermissionSet::for_const_ref_ty(const_ref_lty.ty);
-            let mut actual_perms = asn.perms()[ptr_id];
-            // Ignore `UNIQUE` as it gets automatically added to all permissions
-            // and then removed later if it can't apply.
-            // We don't care about `UNIQUE` for const refs, so just unset it here.
-            actual_perms.set(PermissionSet::UNIQUE, false);
-            assert_eq!(expected_perms, actual_perms);
-        }
+        acx.check_const_ref_perms(&asn);
 
         // Print labeling and rewrites for the current function.