Merge pull request #15898 from maxscott/master

Remove custom implementations of Map/MapWithDefault/OrderedSet
emberjs · Dec 19, 2018 · 25c9945 · 25c9945
2 parents 9bebe19 + c661a45
commit 25c9945
Show file tree

Hide file tree

Showing 10 changed files with 0 additions and 1,141 deletions.
diff --git a/packages/@ember/-internals/metal/tests/is_empty_test.js b/packages/@ember/-internals/metal/tests/is_empty_test.js
@@ -1,6 +1,4 @@
 import { isEmpty } from '..';
-import Map from '@ember/map';
-import OrderedSet from '@ember/map/lib/ordered-set';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 moduleFor(
@@ -25,31 +23,5 @@ moduleFor(
       assert.equal(false, isEmpty({}), 'for an empty Object');
       assert.equal(true, isEmpty(object), "for an Object that has zero 'length'");
     }
-
-    ['@test isEmpty Map'](assert) {
-      expectDeprecation(
-        () => {
-          let map = new Map();
-          assert.equal(true, isEmpty(map), 'Empty map is empty');
-          map.set('foo', 'bar');
-          assert.equal(false, isEmpty(map), 'Map is not empty');
-        },
-        'Use of @ember/Map is deprecated. Please use native `Map` instead',
-        { id: 'ember-map-deprecation', until: '3.5.0' }
-      );
-    }
-
-    ['@test isEmpty Ember.OrderedSet'](assert) {
-      expectDeprecation(
-        () => {
-          let orderedSet = new OrderedSet();
-          assert.equal(true, isEmpty(orderedSet), 'Empty ordered set is empty');
-          orderedSet.add('foo');
-          assert.equal(false, isEmpty(orderedSet), 'Ordered set is not empty');
-        },
-        'Use of @ember/OrderedSet is deprecated. Please use native `Map` instead',
-        { id: 'ember-map-deprecation', until: '3.5.0' }
-      );
-    }
   }
 );
diff --git a/packages/@ember/deprecated-features/index.ts b/packages/@ember/deprecated-features/index.ts
@@ -3,8 +3,6 @@ export const EMBER_EXTEND_PROTOTYPES = !!'3.2.0-beta.5';
 export const RUN_SYNC = !!'3.0.0-beta.4';
 export const LOGGER = !!'3.2.0-beta.1';
 export const ARRAY_AT_EACH = !!'3.1.0-beta.1';
-export const MAP = !!'3.3.0-beta.1';
-export const ORDERED_SET = !!'3.3.0-beta.1';
 export const MERGE = !!'3.6.0-beta.1';
 export const HANDLER_INFOS = !!'3.9.0';
 export const ROUTER_EVENTS = !!'3.9.0';

diff --git a/packages/@ember/map/index.js b/packages/@ember/map/index.js