clippy: Fix equatable_if_let

rr_frontend/.cargo/config.toml

@@ -28,7 +28,6 @@ rustflags = [
 
     # clippy::nursery
     "-Aclippy::empty_line_after_doc_comments",
-    "-Aclippy::equatable_if_let",
     "-Aclippy::iter_on_single_items",
     "-Aclippy::missing_const_for_fn",
     "-Aclippy::needless_collect",

rr_frontend/translation/src/environment/polonius_info.rs

@@ -700,11 +700,11 @@ impl<'a, 'tcx: 'a> PoloniusInfo<'a, 'tcx> {
     ) -> Vec<AtomicRegion> {
         // get set of superset regions
         let a = self.superset.get(&loc);
-        if let None = a {
+        if a.is_none() {
             return Vec::new();
         }
         let b = a.unwrap().get(&r);
-        if let None = b {
+        if b.is_none() {
             return Vec::new();
         }
         let b: &BTreeSet<facts::Region> = b.unwrap();
@@ -753,11 +753,11 @@ impl<'a, 'tcx: 'a> PoloniusInfo<'a, 'tcx> {
     ) -> Vec<AtomicRegion> {
         // get set of superset regions
         let a = self.superset.get(&loc);
-        if let None = a {
+        if a.is_none() {
             return Vec::new();
         }
         let b = a.unwrap().get(&r);
-        if let None = b {
+        if b.is_none() {
             return Vec::new();
         }
         let b: &BTreeSet<facts::Region> = b.unwrap();

rr_frontend/translation/src/function_body.rs

@@ -1803,12 +1803,12 @@ impl<'a, 'def: 'a, 'tcx: 'def> BodyTranslator<'a, 'def, 'tcx> {
         let mut new_regions = HashSet::new();
         let mut relevant_constraints = Vec::new();
         for (r1, r2) in new_constraints.iter() {
-            if let info::RegionKind::Unknown = self.info.get_region_kind(*r1) {
+            if matches!(self.info.get_region_kind(*r1), info::RegionKind::Unknown) {
                 // this is probably a inference variable for the call
                 new_regions.insert(*r1);
                 relevant_constraints.push((*r1, *r2));
             }
-            if let info::RegionKind::Unknown = self.info.get_region_kind(*r2) {
+            if matches!(self.info.get_region_kind(*r2), info::RegionKind::Unknown) {
                 new_regions.insert(*r2);
                 relevant_constraints.push((*r1, *r2));
             }

rr_frontend/translation/src/spec_parsers/struct_spec_parser.rs

@@ -420,7 +420,7 @@ where
 
                         if expect_ty {
                             let ty = LiteralType::parse(&buffer, &meta).map_err(str_err)?;
-                            if let None = field_type {
+                            if field_type.is_none() {
                                 field_type = Some(self.make_type(ty, self.field_type));
                             } else {
                                 return Err(format!(

rr_frontend/translation/src/type_translator.rs

@@ -560,7 +560,7 @@ impl<'def, 'tcx: 'def> TypeTranslator<'def, 'tcx> {
     {
         info!("generating struct use for {:?}", variant_id);
 
-        if let Some(true) = self.is_struct_definitely_zero_sized(variant_id) {
+        if self.is_struct_definitely_zero_sized(variant_id) == Some(true) {
             info!("replacing zero-sized struct with unit");
             return Ok(radium::AbstractStructUse::new_unit());
         }
@@ -673,7 +673,7 @@ impl<'def, 'tcx: 'def> TypeTranslator<'def, 'tcx> {
             Err(TranslationError::Unimplemented {
                 description: "union ADTs are not yet supported".to_string(),
             })
-        } else if let Some(true) = self.is_struct_definitely_zero_sized(def.did()) {
+        } else if self.is_struct_definitely_zero_sized(def.did()) == Some(true) {
             Ok(())
         } else if def.is_enum() {
             self.register_enum(def)
@@ -1361,7 +1361,7 @@ impl<'def, 'tcx: 'def> TypeTranslator<'def, 'tcx> {
                     let ty = substs[0].expect_ty();
                     let translated_ty = self.translate_type_with_deps(&ty, &mut *state)?;
                     Ok(radium::Type::BoxType(Box::new(translated_ty)))
-                } else if let Some(true) = self.is_struct_definitely_zero_sized(adt.did()) {
+                } else if self.is_struct_definitely_zero_sized(adt.did()) == Some(true) {
                     // make this unit
                     Ok(radium::Type::Unit)
                 } else {
@@ -1699,7 +1699,7 @@ impl<'def, 'tcx> TypeTranslator<'def, 'tcx> {
     {
         info!("generating struct use for {:?}", variant_id);
 
-        if let Some(true) = self.is_struct_definitely_zero_sized(variant_id) {
+        if self.is_struct_definitely_zero_sized(variant_id) == Some(true) {
             info!("replacing zero-sized struct with unit");
             return Ok(None);
         }

rr_frontend/translation/src/utils.rs

@@ -573,7 +573,7 @@ pub fn try_pop_one_level<'tcx>(
 /// Pop the last element from the place if it is a dereference.
 pub fn try_pop_deref<'tcx>(tcx: TyCtxt<'tcx>, place: mir::Place<'tcx>) -> Option<mir::Place<'tcx>> {
     try_pop_one_level(tcx, place)
-        .and_then(|(elem, base)| if let mir::ProjectionElem::Deref = elem { Some(base) } else { None })
+        .and_then(|(elem, base)| if elem == mir::ProjectionElem::Deref { Some(base) } else { None })
 }
 
 /// Subtract the `subtrahend` place from the `minuend` place. The