From 055f0015e78b69e10e4919b0758d9b2e03bd5653 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 24 Sep 2019 17:28:06 -0500 Subject: [PATCH] Update.naggle pr edit: 'TryPop' is an innappropriate name (just use 'Remove') --- src/client/spark_api/api/Update.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/client/spark_api/api/Update.cs b/src/client/spark_api/api/Update.cs index 004e81dec..8522a6430 100644 --- a/src/client/spark_api/api/Update.cs +++ b/src/client/spark_api/api/Update.cs @@ -100,7 +100,7 @@ namespace bts.api.core { // Add foreach (var v in next.added) { var k = _key(v); - if (removed.TryPop(k, out var oldval)) { + if (removed.Remove(k, out var oldval)) { changes.AddOrMerge(new Change(oldval, v)); } else { added[k] = v; @@ -110,7 +110,7 @@ namespace bts.api.core { // Change foreach (var c in next.changes) { var k = _key(c.Old); - if (!added.TryReplace(k, c.New)) + if (!added.Replace(k, c.New)) changes.AddOrMerge(c); } @@ -162,10 +162,10 @@ namespace bts.api.core { public bool Remove(TKey key) => _cache.Remove(key); - public bool TryPop(TKey key, out TValue value) => + public bool Remove(TKey key, out TValue value) => _cache.TryGetValue(key, out value) && _cache.Remove(key); - public bool TryReplace(TKey key, TValue value) { + public bool Replace(TKey key, TValue value) { if (_cache.ContainsKey(key)) { _cache[key] = value; return true;