Skip to content

Fix nullable annotation on IEnumerator.Current #37969

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stephentoub merged 1 commit into from
Jun 17, 2020
Merged

Fix nullable annotation on IEnumerator.Current #37969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
116 changes: 58 additions & 58 deletions src/libraries/System.Diagnostics.TraceSource/src/System/Diagnostics/TraceInternal.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ public override void OnIndentLevelChanged(int indentLevel)
{
lock (TraceInternal.critSec)
{
foreach (TraceListener? listener in Listeners) // TODO-NULLABLE https://github.com/dotnet/csharplang/issues/3214
foreach (TraceListener listener in Listeners)
{
listener!.IndentLevel = indentLevel;
listener.IndentLevel = indentLevel;
}
}
}
Expand All @@ -32,9 +32,9 @@ public override void OnIndentSizeChanged(int indentSize)
{
lock (TraceInternal.critSec)
{
foreach (TraceListener? listener in Listeners) // TODO-NULLABLE https://github.com/dotnet/csharplang/issues/3214
foreach (TraceListener listener in Listeners)
{
listener!.IndentSize = indentSize;
listener.IndentSize = indentSize;
}
}
}
Expand Down Expand Up @@ -164,17 +164,17 @@ public static void Flush()
{
lock (critSec)
{
foreach (TraceListener? listener in Listeners) // TODO-NULLABLE https://github.com/dotnet/csharplang/issues/3214
foreach (TraceListener listener in Listeners)
{
listener!.Flush();
listener.Flush();
}
}
}
else
{
foreach (TraceListener? listener in Listeners) // TODO-NULLABLE https://github.com/dotnet/csharplang/issues/3214
foreach (TraceListener listener in Listeners)
{
if (!listener!.IsThreadSafe)
if (!listener.IsThreadSafe)
{
lock (listener)
{
Expand All @@ -197,9 +197,9 @@ public static void Close()
// Use global lock
lock (critSec)
{
foreach (TraceListener? listener in Listeners) // TODO-NULLABLE https://github.com/dotnet/csharplang/issues/3214
foreach (TraceListener listener in Listeners)
{
listener!.Close();
listener.Close();
}
}
}
Expand Down Expand Up @@ -229,18 +229,18 @@ public static void Fail(string? message)
{
lock (critSec)
{
foreach (TraceListener? listener in Listeners) // TODO-NULLABLE https://github.com/dotnet/csharplang/issues/3214
foreach (TraceListener listener in Listeners)
{
listener!.Fail(message);
listener.Fail(message);
if (AutoFlush) listener.Flush();
}
}
}
else
{
foreach (TraceListener? listener in Listeners) // TODO-NULLABLE https://github.com/dotnet/csharplang/issues/3214
foreach (TraceListener listener in Listeners)
{
if (!listener!.IsThreadSafe)
if (!listener.IsThreadSafe)
{
lock (listener)
{
Expand All @@ -263,18 +263,18 @@ public static void Fail(string? message, string? detailMessage)
{
lock (critSec)
{
foreach (TraceListener? listener in Listeners) // TODO-NULLABLE https://github.com/dotnet/csharplang/issues/3214
foreach (TraceListener listener in Listeners)
{
listener!.Fail(message, detailMessage);
listener.Fail(message, detailMessage);
if (AutoFlush) listener.Flush();
}
}
}
else
{
foreach (TraceListener? listener in Listeners) // TODO-NULLABLE https://github.com/dotnet/csharplang/issues/3214
foreach (TraceListener listener in Listeners)
{
if (!listener!.IsThreadSafe)
if (!listener.IsThreadSafe)
{
lock (listener)
{
Expand Down Expand Up @@ -332,17 +332,17 @@ public static void TraceEvent(TraceEventType eventType, int id, string? format,
{
if (args == null)
{
foreach (TraceListener? listener in Listeners) // TODO-NULLABLE https://github.com/dotnet/csharplang/issues/3214
foreach (TraceListener listener in Listeners)
{
listener!.TraceEvent(EventCache, AppName, eventType, id, format);
listener.TraceEvent(EventCache, AppName, eventType, id, format);
if (AutoFlush) listener.Flush();
}
}
else
{
foreach (TraceListener? listener in Listeners) // TODO-NULLABLE https://github.com/dotnet/csharplang/issues/3214
foreach (TraceListener listener in Listeners)
{
listener!.TraceEvent(EventCache, AppName, eventType, id, format!, args);
listener.TraceEvent(EventCache, AppName, eventType, id, format!, args);
if (AutoFlush) listener.Flush();
}
}
Expand All @@ -352,9 +352,9 @@ public static void TraceEvent(TraceEventType eventType, int id, string? format,
{
if (args == null)
{
foreach (TraceListener? listener in Listeners) // TODO-NULLABLE https://github.com/dotnet/csharplang/issues/3214
foreach (TraceListener listener in Listeners)
{
if (!listener!.IsThreadSafe)
if (!listener.IsThreadSafe)
{
lock (listener)
{
Expand All @@ -371,9 +371,9 @@ public static void TraceEvent(TraceEventType eventType, int id, string? format,
}
else
{
foreach (TraceListener? listener in Listeners) // TODO-NULLABLE https://github.com/dotnet/csharplang/issues/3214
foreach (TraceListener listener in Listeners)
{
if (!listener!.IsThreadSafe)
if (!listener.IsThreadSafe)
{
lock (listener)
{
Expand All @@ -398,18 +398,18 @@ public static void Write(string? message)
{
lock (critSec)
{
foreach (TraceListener? listener in Listeners) // TODO-NULLABLE https://github.com/dotnet/csharplang/issues/3214
foreach (TraceListener listener in Listeners)
{
listener!.Write(message);
listener.Write(message);
if (AutoFlush) listener.Flush();
}
}
}
else
{
foreach (TraceListener? listener in Listeners) // TODO-NULLABLE https://github.com/dotnet/csharplang/issues/3214
foreach (TraceListener listener in Listeners)
{
if (!listener!.IsThreadSafe)
if (!listener.IsThreadSafe)
{
lock (listener)
{
Expand All @@ -432,18 +432,18 @@ public static void Write(object? value)
{
lock (critSec)
{
foreach (TraceListener? listener in Listeners) // TODO-NULLABLE https://github.com/dotnet/csharplang/issues/3214
foreach (TraceListener listener in Listeners)
{
listener!.Write(value);
listener.Write(value);
if (AutoFlush) listener.Flush();
}
}
}
else
{
foreach (TraceListener? listener in Listeners) // TODO-NULLABLE https://github.com/dotnet/csharplang/issues/3214
foreach (TraceListener listener in Listeners)
{
if (!listener!.IsThreadSafe)
if (!listener.IsThreadSafe)
{
lock (listener)
{
Expand All @@ -466,18 +466,18 @@ public static void Write(string? message, string? category)
{
lock (critSec)
{
foreach (TraceListener? listener in Listeners) // TODO-NULLABLE https://github.com/dotnet/csharplang/issues/3214
foreach (TraceListener listener in Listeners)
{
listener!.Write(message, category);
listener.Write(message, category);
if (AutoFlush) listener.Flush();
}
}
}
else
{
foreach (TraceListener? listener in Listeners) // TODO-NULLABLE https://github.com/dotnet/csharplang/issues/3214
foreach (TraceListener listener in Listeners)
{
if (!listener!.IsThreadSafe)
if (!listener.IsThreadSafe)
{
lock (listener)
{
Expand All @@ -500,18 +500,18 @@ public static void Write(object? value, string? category)
{
lock (critSec)
{
foreach (TraceListener? listener in Listeners) // TODO-NULLABLE https://github.com/dotnet/csharplang/issues/3214
foreach (TraceListener listener in Listeners)
{
listener!.Write(value, category);
listener.Write(value, category);
if (AutoFlush) listener.Flush();
}
}
}
else
{
foreach (TraceListener? listener in Listeners) // TODO-NULLABLE https://github.com/dotnet/csharplang/issues/3214
foreach (TraceListener listener in Listeners)
{
if (!listener!.IsThreadSafe)
if (!listener.IsThreadSafe)
{
lock (listener)
{
Expand All @@ -534,18 +534,18 @@ public static void WriteLine(string? message)
{
lock (critSec)
{
foreach (TraceListener? listener in Listeners) // TODO-NULLABLE https://github.com/dotnet/csharplang/issues/3214
foreach (TraceListener listener in Listeners)
{
listener!.WriteLine(message);
listener.WriteLine(message);
if (AutoFlush) listener.Flush();
}
}
}
else
{
foreach (TraceListener? listener in Listeners) // TODO-NULLABLE https://github.com/dotnet/csharplang/issues/3214
foreach (TraceListener listener in Listeners)
{
if (!listener!.IsThreadSafe)
if (!listener.IsThreadSafe)
{
lock (listener)
{
Expand All @@ -568,18 +568,18 @@ public static void WriteLine(object? value)
{
lock (critSec)
{
foreach (TraceListener? listener in Listeners) // TODO-NULLABLE https://github.com/dotnet/csharplang/issues/3214
foreach (TraceListener listener in Listeners)
{
listener!.WriteLine(value);
listener.WriteLine(value);
if (AutoFlush) listener.Flush();
}
}
}
else
{
foreach (TraceListener? listener in Listeners) // TODO-NULLABLE https://github.com/dotnet/csharplang/issues/3214
foreach (TraceListener listener in Listeners)
{
if (!listener!.IsThreadSafe)
if (!listener.IsThreadSafe)
{
lock (listener)
{
Expand All @@ -602,18 +602,18 @@ public static void WriteLine(string? message, string? category)
{
lock (critSec)
{
foreach (TraceListener? listener in Listeners) // TODO-NULLABLE https://github.com/dotnet/csharplang/issues/3214
foreach (TraceListener listener in Listeners)
{
listener!.WriteLine(message, category);
listener.WriteLine(message, category);
if (AutoFlush) listener.Flush();
}
}
}
else
{
foreach (TraceListener? listener in Listeners) // TODO-NULLABLE https://github.com/dotnet/csharplang/issues/3214
foreach (TraceListener listener in Listeners)
{
if (!listener!.IsThreadSafe)
if (!listener.IsThreadSafe)
{
lock (listener)
{
Expand All @@ -636,18 +636,18 @@ public static void WriteLine(object? value, string? category)
{
lock (critSec)
{
foreach (TraceListener? listener in Listeners) // TODO-NULLABLE https://github.com/dotnet/csharplang/issues/3214
foreach (TraceListener listener in Listeners)
{
listener!.WriteLine(value, category);
listener.WriteLine(value, category);
if (AutoFlush) listener.Flush();
}
}
}
else
{
foreach (TraceListener? listener in Listeners) // TODO-NULLABLE https://github.com/dotnet/csharplang/issues/3214
foreach (TraceListener listener in Listeners)
{
if (!listener!.IsThreadSafe)
if (!listener.IsThreadSafe)
{
lock (listener)
{
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.Diagnostics.TraceSource/src/System/Diagnostics/TraceListener.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ private void WriteFooter(TraceEventCache? eventCache)
Write("LogicalOperationStack=");
Stack operationStack = eventCache.LogicalOperationStack;
bool first = true;
foreach (object? obj in operationStack)
foreach (object obj in operationStack)
{
if (!first)
{
Expand All @@ -440,7 +440,7 @@ private void WriteFooter(TraceEventCache? eventCache)
first = false;
}

Write(obj!.ToString());
Write(obj.ToString());
}

WriteLine(string.Empty);
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.Linq/src/System/Linq/Cast.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ public static IEnumerable<TResult> Cast<TResult>(this IEnumerable source)

private static IEnumerable<TResult> CastIterator<TResult>(IEnumerable source)
{
foreach (object? obj in source)
foreach (object obj in source)
{
yield return (TResult)obj!;
yield return (TResult)obj;
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.Net.Mail/src/System/Net/Mail/MailWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ internal override void WriteHeaders(NameValueCollection headers, bool allowUnico
if (headers == null)
throw new ArgumentNullException(nameof(headers));

foreach (string? key in headers) // TODO-NULLABLE: https://github.com/dotnet/csharplang/issues/3214
foreach (string key in headers)
{
string[] values = headers!.GetValues(key)!;
foreach (string value in values)
WriteHeader(key!, value, allowUnicode);
WriteHeader(key, value, allowUnicode);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Net.Mail/src/System/Net/Mail/SmtpClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -740,7 +740,7 @@ e is AuthenticationException ||
private bool IsSystemNetworkCredentialInCache(CredentialCache cache)
{
// Check if SystemNetworkCredential is in given cache.
foreach (NetworkCredential? credential in cache) // TODO-NULLABLE: https://github.com/dotnet/csharplang/issues/3214
foreach (NetworkCredential credential in cache)
{
if (ReferenceEquals(credential, CredentialCache.DefaultNetworkCredentials))
{
Expand Down
Loading