huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added `#nullable enable` with `StackTraceHelper` (#22419) 

* Added `#nullable enable` with `StackTraceHelper`
This commit is contained in:
Huei Feng 2020-06-04 00:54:10 +08:00 committed by GitHub
parent 77ef004db4
commit 544afc0078
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Shared/StackTrace/StackFrame/StackTraceHelper.cs
View File

@ -10,12 +10,13 @@ using System.Reflection;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
using System.Runtime.ExceptionServices; using System.Runtime.ExceptionServices;
using Microsoft.Extensions.Internal; using Microsoft.Extensions.Internal;
#nullable enable
namespace Microsoft.Extensions.StackTrace.Sources namespace Microsoft.Extensions.StackTrace.Sources
{ {
internal class StackTraceHelper internal class StackTraceHelper
{ {
public static IList<StackFrameInfo> GetFrames(Exception exception, out AggregateException error) public static IList<StackFrameInfo> GetFrames(Exception exception, out AggregateException? error)
{ {
var frames = new List<StackFrameInfo>(); var frames = new List<StackFrameInfo>();
@ -35,7 +36,7 @@ namespace Microsoft.Extensions.StackTrace.Sources
return frames; return frames;
} }
List<Exception> exceptions = null; List<Exception>? exceptions = null;
for (var i = 0; i < stackFrames.Length; i++) for (var i = 0; i < stackFrames.Length; i++)
{ {
@ -69,7 +70,7 @@ namespace Microsoft.Extensions.StackTrace.Sources
return frames; return frames;
} }
internal static MethodDisplayInfo GetMethodDisplayString(MethodBase method) internal static MethodDisplayInfo? GetMethodDisplayString(MethodBase? method)
{ {
// Special case: no method available // Special case: no method available
if (method == null) if (method == null)
@ -145,7 +146,7 @@ namespace Microsoft.Extensions.StackTrace.Sources
return methodDisplayInfo; return methodDisplayInfo;
} }
private static bool ShowInStackTrace(MethodBase method) private static bool ShowInStackTrace(MethodBase? method)
{ {
Debug.Assert(method != null); Debug.Assert(method != null);
@ -191,7 +192,7 @@ namespace Microsoft.Extensions.StackTrace.Sources
return true; return true;
} }
private static bool TryResolveStateMachineMethod(ref MethodBase method, out Type declaringType) private static bool TryResolveStateMachineMethod(ref MethodBase method, out Type? declaringType)
{ {
Debug.Assert(method != null); Debug.Assert(method != null);
Debug.Assert(method.DeclaringType != null); Debug.Assert(method.DeclaringType != null);