Add use RegionNameSource::*; to streamline three methods.

Author: nnethercote

compiler/rustc_borrowck/src/diagnostics/region_name.rs

@@ -75,83 +75,73 @@ pub(crate) enum RegionNameHighlight {
 
 impl RegionName {
     pub(crate) fn was_named(&self) -> bool {
+        use RegionNameSource::*;
         match self.source {
-            RegionNameSource::NamedEarlyParamRegion(..)
-            | RegionNameSource::NamedLateParamRegion(..)
-            | RegionNameSource::Static => true,
-            RegionNameSource::SynthesizedFreeEnvRegion(..)
-            | RegionNameSource::AnonRegionFromArgument(..)
-            | RegionNameSource::AnonRegionFromUpvar(..)
-            | RegionNameSource::AnonRegionFromOutput(..)
-            | RegionNameSource::AnonRegionFromYieldTy(..)
-            | RegionNameSource::AnonRegionFromAsyncFn(..)
-            | RegionNameSource::AnonRegionFromImplSignature(..) => false,
+            NamedEarlyParamRegion(..) | NamedLateParamRegion(..) | Static => true,
+            SynthesizedFreeEnvRegion(..)
+            | AnonRegionFromArgument(..)
+            | AnonRegionFromUpvar(..)
+            | AnonRegionFromOutput(..)
+            | AnonRegionFromYieldTy(..)
+            | AnonRegionFromAsyncFn(..)
+            | AnonRegionFromImplSignature(..) => false,
         }
     }
 
     pub(crate) fn span(&self) -> Option<Span> {
+        use RegionNameSource::*;
         match self.source {
-            RegionNameSource::Static => None,
-            RegionNameSource::NamedEarlyParamRegion(span)
-            | RegionNameSource::NamedLateParamRegion(span)
-            | RegionNameSource::SynthesizedFreeEnvRegion(span, _)
-            | RegionNameSource::AnonRegionFromUpvar(span, _)
-            | RegionNameSource::AnonRegionFromYieldTy(span, _)
-            | RegionNameSource::AnonRegionFromAsyncFn(span)
-            | RegionNameSource::AnonRegionFromImplSignature(span, _) => Some(span),
-            RegionNameSource::AnonRegionFromArgument(ref highlight)
-            | RegionNameSource::AnonRegionFromOutput(ref highlight, _) => match *highlight {
-                RegionNameHighlight::MatchedHirTy(span)
-                | RegionNameHighlight::MatchedAdtAndSegment(span)
-                | RegionNameHighlight::CannotMatchHirTy(span, _)
-                | RegionNameHighlight::Occluded(span, _) => Some(span),
-            },
+            Static => None,
+            NamedEarlyParamRegion(span)
+            | NamedLateParamRegion(span)
+            | SynthesizedFreeEnvRegion(span, _)
+            | AnonRegionFromUpvar(span, _)
+            | AnonRegionFromYieldTy(span, _)
+            | AnonRegionFromAsyncFn(span)
+            | AnonRegionFromImplSignature(span, _) => Some(span),
+            AnonRegionFromArgument(ref highlight) | AnonRegionFromOutput(ref highlight, _) => {
+                match *highlight {
+                    RegionNameHighlight::MatchedHirTy(span)
+                    | RegionNameHighlight::MatchedAdtAndSegment(span)
+                    | RegionNameHighlight::CannotMatchHirTy(span, _)
+                    | RegionNameHighlight::Occluded(span, _) => Some(span),
+                }
+            }
         }
     }
 
     pub(crate) fn highlight_region_name(&self, diag: &mut Diag<'_>) {
+        use RegionNameSource::*;
         match &self.source {
-            RegionNameSource::NamedLateParamRegion(span)
-            | RegionNameSource::NamedEarlyParamRegion(span) => {
+            NamedLateParamRegion(span) | NamedEarlyParamRegion(span) => {
                 diag.span_label(*span, format!("lifetime `{self}` defined here"));
             }
-            RegionNameSource::SynthesizedFreeEnvRegion(span, note) => {
+            SynthesizedFreeEnvRegion(span, note) => {
                 diag.span_label(*span, format!("lifetime `{self}` represents this closure's body"));
                 diag.note(*note);
             }
-            RegionNameSource::AnonRegionFromArgument(RegionNameHighlight::CannotMatchHirTy(
-                span,
-                type_name,
-            )) => {
+            AnonRegionFromArgument(RegionNameHighlight::CannotMatchHirTy(span, type_name)) => {
                 diag.span_label(*span, format!("has type `{type_name}`"));
             }
-            RegionNameSource::AnonRegionFromArgument(RegionNameHighlight::MatchedHirTy(span))
-            | RegionNameSource::AnonRegionFromOutput(RegionNameHighlight::MatchedHirTy(span), _)
-            | RegionNameSource::AnonRegionFromAsyncFn(span) => {
+            AnonRegionFromArgument(RegionNameHighlight::MatchedHirTy(span))
+            | AnonRegionFromOutput(RegionNameHighlight::MatchedHirTy(span), _)
+            | AnonRegionFromAsyncFn(span) => {
                 diag.span_label(
                     *span,
                     format!("let's call the lifetime of this reference `{self}`"),
                 );
             }
-            RegionNameSource::AnonRegionFromArgument(
-                RegionNameHighlight::MatchedAdtAndSegment(span),
-            )
-            | RegionNameSource::AnonRegionFromOutput(
-                RegionNameHighlight::MatchedAdtAndSegment(span),
-                _,
-            ) => {
+            AnonRegionFromArgument(RegionNameHighlight::MatchedAdtAndSegment(span))
+            | AnonRegionFromOutput(RegionNameHighlight::MatchedAdtAndSegment(span), _) => {
                 diag.span_label(*span, format!("let's call this `{self}`"));
             }
-            RegionNameSource::AnonRegionFromArgument(RegionNameHighlight::Occluded(
-                span,
-                type_name,
-            )) => {
+            AnonRegionFromArgument(RegionNameHighlight::Occluded(span, type_name)) => {
                 diag.span_label(
                     *span,
                     format!("lifetime `{self}` appears in the type {type_name}"),
                 );
             }
-            RegionNameSource::AnonRegionFromOutput(
+            AnonRegionFromOutput(
                 RegionNameHighlight::Occluded(span, type_name),
                 mir_description,
             ) => {
@@ -162,28 +152,28 @@ impl RegionName {
                     ),
                 );
             }
-            RegionNameSource::AnonRegionFromUpvar(span, upvar_name) => {
+            AnonRegionFromUpvar(span, upvar_name) => {
                 diag.span_label(
                     *span,
                     format!("lifetime `{self}` appears in the type of `{upvar_name}`"),
                 );
             }
-            RegionNameSource::AnonRegionFromOutput(
+            AnonRegionFromOutput(
                 RegionNameHighlight::CannotMatchHirTy(span, type_name),
                 mir_description,
             ) => {
                 diag.span_label(*span, format!("return type{mir_description} is {type_name}"));
             }
-            RegionNameSource::AnonRegionFromYieldTy(span, type_name) => {
+            AnonRegionFromYieldTy(span, type_name) => {
                 diag.span_label(*span, format!("yield type is {type_name}"));
             }
-            RegionNameSource::AnonRegionFromImplSignature(span, location) => {
+            AnonRegionFromImplSignature(span, location) => {
                 diag.span_label(
                     *span,
                     format!("lifetime `{self}` appears in the `impl`'s {location}"),
                 );
             }
-            RegionNameSource::Static => {}
+            Static => {}
         }
     }
 }