Drive-by refactor: instrument now does this!

Author: amandasystems

compiler/rustc_borrowck/src/region_infer/mod.rs

@@ -1791,20 +1791,15 @@ impl<'tcx> RegionInferenceContext<'tcx> {
     ///   that cannot be named by `fr1`; in that case, we will require
     ///   that `fr1: 'static` because it is the only way to `fr1: r` to
     ///   be satisfied. (See `add_incompatible_universe`.)
+    #[instrument(skip(self), ret)]
     pub(crate) fn provides_universal_region(
         &self,
         r: RegionVid,
         fr1: RegionVid,
         fr2: RegionVid,
     ) -> bool {
-        debug!("provides_universal_region(r={:?}, fr1={:?}, fr2={:?})", r, fr1, fr2);
-        let result = {
-            r == fr2 || {
-                fr2 == self.universal_regions.fr_static && self.cannot_name_placeholder(fr1, r)
-            }
-        };
-        debug!("provides_universal_region: result = {:?}", result);
-        result
+        let fr2_is_static = fr2 == self.universal_regions.fr_static;
+        r == fr2 || (fr2_is_static && self.cannot_name_placeholder(fr1, r))
     }
 
     /// If `r2` represents a placeholder region, then this returns