Tiny cleanup (#26904)

After #26806
dotnet · Dec 6, 2021 · c5612d6 · c5612d6
1 parent 57d1ec9
commit c5612d6
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 52 deletions.
diff --git a/src/EFCore/DbContextOptionsBuilder.cs b/src/EFCore/DbContextOptionsBuilder.cs
@@ -155,35 +155,13 @@ public virtual DbContextOptionsBuilder LogTo(
 
         var eventsArray = events.ToArray();
 
-        switch (eventsArray.Length)
+        return eventsArray.Length switch
         {
-            case 0:
-                return this;
-            case 1:
-            {
-                var firstEvent = eventsArray[0];
-                return LogTo(
-                    action,
-                    (eventId, level) => level >= minimumLevel
-                        && eventId == firstEvent,
-                    options);
-            }
-            case < 6:
-                return LogTo(
-                    action,
-                    (eventId, level) => level >= minimumLevel
-                        && eventsArray.Contains(eventId),
-                    options);
-            default:
-            {
-                var eventsHash = eventsArray.ToHashSet();
-                return LogTo(
-                    action,
-                    (eventId, level) => level >= minimumLevel
-                        && eventsHash.Contains(eventId),
-                    options);
-            }
-        }
+            0 => this,
+            1 => LogTo(action, (eventId, level) => level >= minimumLevel && eventId == eventsArray[0], options),
+            < 6 => LogTo(action, (eventId, level) => level >= minimumLevel && eventsArray.Contains(eventId), options),
+            _ => LogTo(action, (eventId, level) => level >= minimumLevel && eventsArray.ToHashSet().Contains(eventId), options)
+        };
     }
 
     /// <summary>

diff --git a/src/EFCore/Metadata/Internal/InternalForeignKeyBuilder.cs b/src/EFCore/Metadata/Internal/InternalForeignKeyBuilder.cs
@@ -1906,12 +1906,7 @@ private bool CanSetForeignKey(
             Metadata.PrincipalEntityType.Builder.GetOrCreateProperties(members, configurationSource),
             configurationSource);
 
-        if (relationship == null)
-        {
-            return null;
-        }
-
-        return (InternalForeignKeyBuilder?)batch.Run(relationship.Metadata)?.Builder;
+        return relationship is null ? null : (InternalForeignKeyBuilder?)batch.Run(relationship.Metadata)?.Builder;
     }
 
     /// <summary>
@@ -1930,12 +1925,7 @@ private bool CanSetForeignKey(
             Metadata.PrincipalEntityType.Builder.GetOrCreateProperties(propertyNames, configurationSource),
             configurationSource);
 
-        if (relationship == null)
-        {
-            return null;
-        }
-
-        return (InternalForeignKeyBuilder?)batch.Run(relationship.Metadata)?.Builder;
+        return relationship is null ? null : (InternalForeignKeyBuilder?)batch.Run(relationship.Metadata)?.Builder;
     }
 
     /// <summary>

diff --git a/src/EFCore/Metadata/Internal/InternalSkipNavigationBuilder.cs b/src/EFCore/Metadata/Internal/InternalSkipNavigationBuilder.cs
@@ -146,20 +146,19 @@ public virtual bool CanSetForeignKey(ForeignKey? foreignKey, ConfigurationSource
             inverse.UpdateConfigurationSource(configurationSource);
         }
 
-        using (Metadata.DeclaringEntityType.Model.DelayConventions())
+        using var _ = Metadata.DeclaringEntityType.Model.DelayConventions();
+
+        if (Metadata.Inverse != null
+            && Metadata.Inverse != inverse)
         {
-            if (Metadata.Inverse != null
-                && Metadata.Inverse != inverse)
-            {
-                Metadata.Inverse.SetInverse(null, configurationSource);
-            }
+            Metadata.Inverse.SetInverse(null, configurationSource);
+        }
 
-            Metadata.SetInverse(inverse, configurationSource);
+        Metadata.SetInverse(inverse, configurationSource);
 
-            if (inverse != null)
-            {
-                inverse.SetInverse(Metadata, configurationSource);
-            }
+        if (inverse != null)
+        {
+            inverse.SetInverse(Metadata, configurationSource);
         }
 
         return this;

diff --git a/src/EFCore/Query/ExpressionPrinter.cs b/src/EFCore/Query/ExpressionPrinter.cs
@@ -191,7 +191,7 @@ private string PrintCore(
             && characterLimit.Value > 0)
         {
             queryPlan = queryPlan.Length > characterLimit
-                ? string.Concat(queryPlan.AsSpan(0, characterLimit.Value), "...")
+                ? queryPlan[..characterLimit.Value] + "..."
                 : queryPlan;
         }