'if-return' statement can be rewritten as 'return' statement

fluentassertions · Jun 13, 2023 · 477e139 · 477e139
1 parent b50e9dd
commit 477e139
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 108 deletions.
diff --git a/Src/FluentAssertions/Common/MethodInfoExtensions.cs b/Src/FluentAssertions/Common/MethodInfoExtensions.cs
@@ -55,11 +55,8 @@ private static (bool success, MethodImplAttribute attribute) RecreateMethodImplA
 
         MethodImplOptions implementationOptions = (MethodImplOptions)implementationFlagsMatchingImplementationOptions;
 
-        if (implementationOptions != 0)
-        {
-            return (true, new MethodImplAttribute(implementationOptions));
-        }
-
-        return (false, null);
+        return implementationOptions != 0 ?
+            (true, new MethodImplAttribute(implementationOptions)) :
+            (false, null);
     }
 }
diff --git a/Src/FluentAssertions/Equivalency/Comparands.cs b/Src/FluentAssertions/Equivalency/Comparands.cs
@@ -43,18 +43,8 @@ public Type CompileTimeType
     /// <summary>
     /// Gets the run-time type of the current expectation object.
     /// </summary>
-    public Type RuntimeType
-    {
-        get
-        {
-            if (Expectation is not null)
-            {
-                return Expectation.GetType();
-            }
-
-            return CompileTimeType;
-        }
-    }
+    public Type RuntimeType =>
+        Expectation is not null ? Expectation.GetType() : CompileTimeType;
 
     /// <summary>
     /// Returns either the run-time or compile-time type of the expectation based on the options provided by the caller.

diff --git a/Src/FluentAssertions/Equivalency/Tracing/Tracer.cs b/Src/FluentAssertions/Equivalency/Tracing/Tracer.cs
@@ -35,15 +35,8 @@ public void WriteLine(GetTraceMessage getTraceMessage)
     /// <remarks>
     /// If no tracer has been configured for the <see cref="IEquivalencyValidationContext"/>, the call will be ignored.
     /// </remarks>
-    public IDisposable WriteBlock(GetTraceMessage getTraceMessage)
-    {
-        if (traceWriter is not null)
-        {
-            return traceWriter.AddBlock(getTraceMessage(currentNode));
-        }
-
-        return new Disposable(() => { });
-    }
+    public IDisposable WriteBlock(GetTraceMessage getTraceMessage) =>
+        traceWriter is not null ? traceWriter.AddBlock(getTraceMessage(currentNode)) : new Disposable(() => { });
 
     public override string ToString() => traceWriter is not null ? traceWriter.ToString() : string.Empty;
 }
diff --git a/Src/FluentAssertions/Execution/ContinuedAssertionScope.cs b/Src/FluentAssertions/Execution/ContinuedAssertionScope.cs
@@ -21,81 +21,32 @@ internal ContinuedAssertionScope(AssertionScope predecessor, bool continueAssert
     }
 
     /// <inheritdoc/>
-    public GivenSelector<T> Given<T>(Func<T> selector)
-    {
-        if (continueAsserting)
-        {
-            return predecessor.Given(selector);
-        }
-
-        return new GivenSelector<T>(() => default, predecessor, continueAsserting: false);
-    }
+    public GivenSelector<T> Given<T>(Func<T> selector) =>
+        continueAsserting ? predecessor.Given(selector) : new GivenSelector<T>(() => default, predecessor, continueAsserting: false);
 
     /// <inheritdoc/>
-    public IAssertionScope ForCondition(bool condition)
-    {
-        if (continueAsserting)
-        {
-            return predecessor.ForCondition(condition);
-        }
-
-        return this;
-    }
+    public IAssertionScope ForCondition(bool condition) =>
+        continueAsserting ? predecessor.ForCondition(condition) : this;
 
     /// <inheritdoc/>
-    public Continuation FailWith(string message)
-    {
-        if (continueAsserting)
-        {
-            return predecessor.FailWith(message);
-        }
-
-        return new Continuation(predecessor, continueAsserting: false);
-    }
+    public Continuation FailWith(string message) =>
+        continueAsserting ? predecessor.FailWith(message) : new Continuation(predecessor, continueAsserting: false);
 
     /// <inheritdoc/>
-    public Continuation FailWith(string message, params Func<object>[] argProviders)
-    {
-        if (continueAsserting)
-        {
-            return predecessor.FailWith(message, argProviders);
-        }
-
-        return new Continuation(predecessor, continueAsserting: false);
-    }
+    public Continuation FailWith(string message, params Func<object>[] argProviders) =>
+        continueAsserting ? predecessor.FailWith(message, argProviders) : new Continuation(predecessor, continueAsserting: false);
 
     /// <inheritdoc/>
-    public Continuation FailWith(Func<FailReason> failReasonFunc)
-    {
-        if (continueAsserting)
-        {
-            return predecessor.FailWith(failReasonFunc);
-        }
-
-        return new Continuation(predecessor, continueAsserting: false);
-    }
+    public Continuation FailWith(Func<FailReason> failReasonFunc) =>
+        continueAsserting ? predecessor.FailWith(failReasonFunc) : new Continuation(predecessor, continueAsserting: false);
 
     /// <inheritdoc/>
-    public Continuation FailWith(string message, params object[] args)
-    {
-        if (continueAsserting)
-        {
-            return predecessor.FailWith(message, args);
-        }
-
-        return new Continuation(predecessor, continueAsserting: false);
-    }
+    public Continuation FailWith(string message, params object[] args) =>
+        continueAsserting ? predecessor.FailWith(message, args) : new Continuation(predecessor, continueAsserting: false);
 
     /// <inheritdoc/>
-    public IAssertionScope BecauseOf(string because, params object[] becauseArgs)
-    {
-        if (continueAsserting)
-        {
-            return predecessor.BecauseOf(because, becauseArgs);
-        }
-
-        return this;
-    }
+    public IAssertionScope BecauseOf(string because, params object[] becauseArgs) =>
+        continueAsserting ? predecessor.BecauseOf(because, becauseArgs) : this;
 
     /// <inheritdoc/>
     public Continuation ClearExpectation()
@@ -106,26 +57,12 @@ public Continuation ClearExpectation()
     }
 
     /// <inheritdoc/>
-    public IAssertionScope WithExpectation(string message, params object[] args)
-    {
-        if (continueAsserting)
-        {
-            return predecessor.WithExpectation(message, args);
-        }
-
-        return this;
-    }
+    public IAssertionScope WithExpectation(string message, params object[] args) =>
+        continueAsserting ? predecessor.WithExpectation(message, args) : this;
 
     /// <inheritdoc/>
-    public IAssertionScope WithDefaultIdentifier(string identifier)
-    {
-        if (continueAsserting)
-        {
-            return predecessor.WithDefaultIdentifier(identifier);
-        }
-
-        return this;
-    }
+    public IAssertionScope WithDefaultIdentifier(string identifier) =>
+        continueAsserting ? predecessor.WithDefaultIdentifier(identifier) : this;
 
     /// <inheritdoc/>
     public IAssertionScope UsingLineBreaks => predecessor.UsingLineBreaks;