From f5a1fa4744ded71978714bcfe1b6d2a8252da677 Mon Sep 17 00:00:00 2001 From: Stephen Toub Date: Wed, 21 Aug 2019 13:06:37 -0400 Subject: [PATCH] Fix IDE0034 (simplify default expression) Signed-off-by: dotnet-bot --- .../shared/System/Collections/ObjectModel/Collection.cs | 6 +++--- netcore/System.Private.CoreLib/shared/System/DateTime.cs | 2 +- .../shared/System/Security/PermissionSet.cs | 14 +++++++------- .../shared/System/Security/SecurityElement.cs | 2 +- .../shared/System/TimeZoneInfo.Unix.cs | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/netcore/System.Private.CoreLib/shared/System/Collections/ObjectModel/Collection.cs b/netcore/System.Private.CoreLib/shared/System/Collections/ObjectModel/Collection.cs index 1541cfeb659..e8e9b19e8d6 100644 --- a/netcore/System.Private.CoreLib/shared/System/Collections/ObjectModel/Collection.cs +++ b/netcore/System.Private.CoreLib/shared/System/Collections/ObjectModel/Collection.cs @@ -245,7 +245,7 @@ namespace System.Collections.ObjectModel { ThrowHelper.IfNullAndNullsAreIllegalThenThrow(value, ExceptionArgument.value); - T item = default(T)!; + T item = default!; try { @@ -286,7 +286,7 @@ namespace System.Collections.ObjectModel } ThrowHelper.IfNullAndNullsAreIllegalThenThrow(value, ExceptionArgument.value); - T item = default(T)!; + T item = default!; try { @@ -328,7 +328,7 @@ namespace System.Collections.ObjectModel } ThrowHelper.IfNullAndNullsAreIllegalThenThrow(value, ExceptionArgument.value); - T item = default(T)!; + T item = default!; try { diff --git a/netcore/System.Private.CoreLib/shared/System/DateTime.cs b/netcore/System.Private.CoreLib/shared/System/DateTime.cs index 9829fab767b..08b518764fe 100644 --- a/netcore/System.Private.CoreLib/shared/System/DateTime.cs +++ b/netcore/System.Private.CoreLib/shared/System/DateTime.cs @@ -562,7 +562,7 @@ namespace System long ticks = InternalTicks; if (value > MaxTicks - ticks || value < MinTicks - ticks) { - result = default(DateTime); + result = default; return false; } result = new DateTime((ulong)(ticks + value) | InternalKind); diff --git a/netcore/System.Private.CoreLib/shared/System/Security/PermissionSet.cs b/netcore/System.Private.CoreLib/shared/System/Security/PermissionSet.cs index 206f9d1f4bc..9f242985235 100644 --- a/netcore/System.Private.CoreLib/shared/System/Security/PermissionSet.cs +++ b/netcore/System.Private.CoreLib/shared/System/Security/PermissionSet.cs @@ -18,7 +18,7 @@ namespace System.Security public virtual bool IsSynchronized => false; public virtual object SyncRoot => this; public IPermission? AddPermission(IPermission? perm) { return AddPermissionImpl(perm); } - protected virtual IPermission? AddPermissionImpl(IPermission? perm) { return default(IPermission); } + protected virtual IPermission? AddPermissionImpl(IPermission? perm) { return default; } public void Assert() { } public bool ContainsNonCodeAccessPermissions() { return false; } [Obsolete] @@ -34,20 +34,20 @@ namespace System.Security protected virtual IEnumerator GetEnumeratorImpl() { return Array.Empty().GetEnumerator(); } public override int GetHashCode() => base.GetHashCode(); public IPermission? GetPermission(Type? permClass) { return GetPermissionImpl(permClass); } - protected virtual IPermission? GetPermissionImpl(Type? permClass) { return default(IPermission); } - public PermissionSet? Intersect(PermissionSet? other) { return default(PermissionSet); } + protected virtual IPermission? GetPermissionImpl(Type? permClass) { return default; } + public PermissionSet? Intersect(PermissionSet? other) { return default; } public bool IsEmpty() { return false; } public bool IsSubsetOf(PermissionSet? target) { return false; } public bool IsUnrestricted() { return false; } public void PermitOnly() { throw new PlatformNotSupportedException(SR.PlatformNotSupported_CAS); } public IPermission? RemovePermission(Type? permClass) { return RemovePermissionImpl(permClass); } - protected virtual IPermission? RemovePermissionImpl(Type? permClass) { return default(IPermission); } + protected virtual IPermission? RemovePermissionImpl(Type? permClass) { return default; } public static void RevertAssert() { } public IPermission? SetPermission(IPermission? perm) { return SetPermissionImpl(perm); } - protected virtual IPermission? SetPermissionImpl(IPermission? perm) { return default(IPermission); } + protected virtual IPermission? SetPermissionImpl(IPermission? perm) { return default; } void IDeserializationCallback.OnDeserialization(object? sender) { } public override string ToString() => base.ToString()!; - public virtual SecurityElement? ToXml() { return default(SecurityElement); } - public PermissionSet? Union(PermissionSet? other) { return default(PermissionSet); } + public virtual SecurityElement? ToXml() { return default; } + public PermissionSet? Union(PermissionSet? other) { return default; } } } diff --git a/netcore/System.Private.CoreLib/shared/System/Security/SecurityElement.cs b/netcore/System.Private.CoreLib/shared/System/Security/SecurityElement.cs index 231815ecd2d..bb2566931e4 100644 --- a/netcore/System.Private.CoreLib/shared/System/Security/SecurityElement.cs +++ b/netcore/System.Private.CoreLib/shared/System/Security/SecurityElement.cs @@ -642,7 +642,7 @@ namespace System.Security if (xml == null) throw new ArgumentNullException(nameof(xml)); - return default(SecurityElement); + return default; } //--------------- ISecurityElementFactory implementation ----------------- diff --git a/netcore/System.Private.CoreLib/shared/System/TimeZoneInfo.Unix.cs b/netcore/System.Private.CoreLib/shared/System/TimeZoneInfo.Unix.cs index ba62a677f59..1321fe768ec 100644 --- a/netcore/System.Private.CoreLib/shared/System/TimeZoneInfo.Unix.cs +++ b/netcore/System.Private.CoreLib/shared/System/TimeZoneInfo.Unix.cs @@ -1218,7 +1218,7 @@ namespace System { if (date.IsEmpty) { - return default(TransitionTime); + return default; } if (date[0] == 'M') -- 2.11.4.GIT