Skip to content

Code performance fixes follow-up #14207

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
anmenaga merged 2 commits into from
Nov 20, 2020
Merged

Code performance fixes follow-up #14207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8147a2
Fix RCS1080: Use 'Count/Length' property instead of 'Any' method
xtqqczze Nov 20, 2020
a62f5d3
Fix RCS1235: Optimize method call
xtqqczze Nov 20, 2020
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
4 changes: 2 additions & 2 deletions src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ internal bool LoadUsingModulePath(PSModuleInfo parentModule, bool found, IEnumer
foreach (string folder in Directory.EnumerateDirectories(path))
{
string moduleName = Path.GetFileName(folder);
if (string.Compare(moduleName, fileBaseName, StringComparison.OrdinalIgnoreCase) == 0)
if (string.Equals(moduleName, fileBaseName, StringComparison.OrdinalIgnoreCase))
{
fileBaseName = moduleName;
#endif
Expand Down Expand Up @@ -3531,7 +3531,7 @@ private static void PropagateExportedTypesFromNestedModulesToRootModuleScope(Imp
if (nestedModule != null)
{
var exportedTypes = nestedModule.GetExportedTypeDefinitions();
if (exportedTypes != null && exportedTypes.Count != 0)
if (exportedTypes != null && exportedTypes.Count > 0)
{
foreach (var t in exportedTypes)
{
Expand Down
4 changes: 2 additions & 2 deletions src/System.Management.Automation/engine/Subsystem/SubsystemManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ private static void RegisterSubsystem(SubsystemInfo subsystemInfo, ISubsystem pr
nameof(proxy));
}

if (subsystemInfo.RequiredCmdlets.Any() || subsystemInfo.RequiredFunctions.Any())
if (subsystemInfo.RequiredCmdlets.Count > 0 || subsystemInfo.RequiredFunctions.Count > 0)
{
// Process 'proxy.CmdletImplementationAssembly' and 'proxy.FunctionsToDefine'
// Functions are added to global scope.
Expand Down Expand Up @@ -265,7 +265,7 @@ public static void UnregisterSubsystem(SubsystemKind kind, Guid id)

private static void UnregisterSubsystem(SubsystemInfo subsystemInfo, Guid id)
{
if (subsystemInfo.RequiredCmdlets.Any() || subsystemInfo.RequiredFunctions.Any())
if (subsystemInfo.RequiredCmdlets.Count > 0 || subsystemInfo.RequiredFunctions.Count > 0)
{
throw new NotSupportedException("NotSupported yet: unregister subsystem that introduced new cmdlets/functions.");
}
Expand Down
2 changes: 1 addition & 1 deletion src/System.Management.Automation/engine/parser/AstVisitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ internal static bool Contains(Ast ast, Func<Ast, bool> predicate, bool searchNes

var searcher = new AstSearcher(predicate, stopOnFirst: true, searchNestedScriptBlocks: searchNestedScriptBlocks);
ast.InternalVisit(searcher);
return searcher.Results.Any();
return searcher.Results.Count > 0;
}

internal static bool IsUsingDollarInput(Ast ast)
Expand Down
2 changes: 1 addition & 1 deletion src/System.Management.Automation/utils/EncodingUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ internal static Encoding Convert(Cmdlet cmdlet, string encoding)
if (encodingMap.TryGetValue(encoding, out foundEncoding))
{
// Write a warning if using utf7 as it is obsolete in .NET5
if (string.Compare(encoding, Utf7, StringComparison.OrdinalIgnoreCase) == 0)
if (string.Equals(encoding, Utf7, StringComparison.OrdinalIgnoreCase))
{
cmdlet.WriteWarning(PathUtilsStrings.Utf7EncodingObsolete);
}
Expand Down