github/Discord.Net
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #488 from FiniteReality/issue/487

Browse Source 
Replace ConcurrentBag<T> with HashSet<T>
This commit is contained in:
RogueException
2017-01-26 10:52:12 -04:00
committed by GitHub
parent 7d617aebb2 0715cb6623
commit deb755dd3d
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Discord.Net.Commands/CommandService.cs
View File

@@ -18,7 +18,7 @@ namespace Discord.Commands
private readonly ConcurrentDictionary<Type, ConcurrentDictionary<Type, TypeReader>> _typeReaders;
private readonly ConcurrentDictionary<Type, TypeReader> _defaultTypeReaders;
private readonly ImmutableList<Tuple<Type, Type>> _entityTypeReaders; //TODO: Candidate for C#7 Tuple
private readonly ConcurrentBag<ModuleInfo> _moduleDefs;
private readonly HashSet<ModuleInfo> _moduleDefs;
private readonly CommandMap _map;
internal readonly bool _caseSensitive;
@@ -38,7 +38,7 @@ namespace Discord.Commands
_moduleLock = new SemaphoreSlim(1, 1);
_typedModuleDefs = new ConcurrentDictionary<Type, ModuleInfo>();
_moduleDefs = new ConcurrentBag<ModuleInfo>();
_moduleDefs = new HashSet<ModuleInfo>();
_map = new CommandMap(this);
_typeReaders = new ConcurrentDictionary<Type, ConcurrentDictionary<Type, TypeReader>>();
@@ -160,8 +160,7 @@ namespace Discord.Commands
}
private bool RemoveModuleInternal(ModuleInfo module)
{
var defsRemove = module;
if (!_moduleDefs.TryTake(out defsRemove))
if (!_moduleDefs.Remove(module))
return false;
foreach (var cmd in module.Commands)