Skip to content

Commit 5573ce7

Browse files
lrhnlrhn
committed
Make Iterable be the default implementation of itself.
Makes `Iterable` a mixin class with a `const` constructor, and `IterableBase` and `IterableMixin` (to-be-deprecated) aliases for it. Combining everything in one place avoids (some) code duplication. Also gave the methods a quick overhaul for formatting, removing uses of `late` and unnecessary element accesses, and some general tweaks. CoreLibraryReviewExempt: Refactoring of redundant types. Tested: Refactoring. If existing tests work, it works. Change-Id: Ie49a88f713d386d2d118c53606a71bdd50e1eb11 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/287600 Reviewed-by: Brian Quinlan <[email protected]> Reviewed-by: Nate Bosch <[email protected]>
1 parent 23b73d7 commit 5573ce7

File tree

42 files changed

+396
-579
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+396
-579
lines changed

‎CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@
2121
- **Breaking Change**: Non-`mixin` classes in the platform libraries
2222
can no longer be mixed in, unless they are explicitly marked as `mixin class`.
2323
The following existing classes have been made mixin classes:
24-
* `IterableMixin`
24+
* `Iterable`
25+
* `IterableMixin` (now alias for `Iterable`)
26+
* `IterableBase` (now alias for `Iterable`)
2527
* `ListMixin`
2628
* `SetMixin`
2729
* `MapMixin`

‎pkg/front_end/testcases/general/constants/const_collections.dart.strong.expect

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -180,14 +180,14 @@ library /*isNonNullableByDefault*/;
180180
// ^
181181
//
182182
import self as self;
183-
import "dart:collection" as col;
184183
import "dart:core" as core;
184+
import "dart:collection" as col;
185185

186186
import "dart:collection";
187187

188-
class ConstIterable extends col::IterableBase<core::int> /*hasConstConstructor*/ {
188+
class ConstIterable extends core::Iterable<core::int> /*hasConstConstructor*/ {
189189
const constructor •() → self::ConstIterable
190-
: super col::IterableBase::•()
190+
: super core::Iterable::•()
191191
;
192192
get iterator() → core::Iterator<core::int>
193193
return <core::int>[].{core::Iterable::iterator}{core::Iterator<core::int>};
@@ -201,9 +201,9 @@ class WithEquals extends core::Object /*hasConstConstructor*/ {
201201
return o is{ForNonNullableByDefault} self::WithEquals && (o{self::WithEquals} as{ForNonNullableByDefault} self::WithEquals).{self::WithEquals::i}{core::int} =={core::num::==}{(core::Object) → core::bool} this.{self::WithEquals::i}{core::int};
202202
}
203203
}
204-
class CustomIterable extends col::IterableBase<core::String> /*hasConstConstructor*/ {
204+
class CustomIterable extends core::Iterable<core::String> /*hasConstConstructor*/ {
205205
const constructor •() → self::CustomIterable
206-
: super col::IterableBase::•()
206+
: super core::Iterable::•()
207207
;
208208
get iterator() → core::Iterator<core::String>
209209
return <core::String>[].{core::Iterable::iterator}{core::Iterator<core::String>};
@@ -383,7 +383,6 @@ constants {
383383
Constructor coverage from constants:
384384
org-dartlang-testcase:///const_collections.dart:
385385
- CustomIterable. (from org-dartlang-testcase:///const_collections.dart:79:9)
386-
- IterableBase. (from org-dartlang-sdk:///sdk/lib/collection/iterable.dart)
387386
- Iterable. (from org-dartlang-sdk:///sdk/lib/core/iterable.dart)
388387
- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
389388
- WithEquals. (from org-dartlang-testcase:///const_collections.dart:72:9)

‎pkg/front_end/testcases/general/constants/const_collections.dart.strong.transformed.expect

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -180,14 +180,14 @@ library /*isNonNullableByDefault*/;
180180
// ^
181181
//
182182
import self as self;
183-
import "dart:collection" as col;
184183
import "dart:core" as core;
184+
import "dart:collection" as col;
185185

186186
import "dart:collection";
187187

188-
class ConstIterable extends col::IterableBase<core::int> /*hasConstConstructor*/ {
188+
class ConstIterable extends core::Iterable<core::int> /*hasConstConstructor*/ {
189189
const constructor •() → self::ConstIterable
190-
: super col::IterableBase::•()
190+
: super core::Iterable::•()
191191
;
192192
get iterator() → core::Iterator<core::int>
193193
return core::_GrowableList::•<core::int>(0).{core::Iterable::iterator}{core::Iterator<core::int>};
@@ -201,9 +201,9 @@ class WithEquals extends core::Object /*hasConstConstructor*/ {
201201
return o is{ForNonNullableByDefault} self::WithEquals && o{self::WithEquals}.{self::WithEquals::i}{core::int} =={core::num::==}{(core::Object) → core::bool} this.{self::WithEquals::i}{core::int};
202202
}
203203
}
204-
class CustomIterable extends col::IterableBase<core::String> /*hasConstConstructor*/ {
204+
class CustomIterable extends core::Iterable<core::String> /*hasConstConstructor*/ {
205205
const constructor •() → self::CustomIterable
206-
: super col::IterableBase::•()
206+
: super core::Iterable::•()
207207
;
208208
get iterator() → core::Iterator<core::String>
209209
return core::_GrowableList::•<core::String>(0).{core::Iterable::iterator}{core::Iterator<core::String>};
@@ -383,7 +383,6 @@ constants {
383383
Constructor coverage from constants:
384384
org-dartlang-testcase:///const_collections.dart:
385385
- CustomIterable. (from org-dartlang-testcase:///const_collections.dart:79:9)
386-
- IterableBase. (from org-dartlang-sdk:///sdk/lib/collection/iterable.dart)
387386
- Iterable. (from org-dartlang-sdk:///sdk/lib/core/iterable.dart)
388387
- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
389388
- WithEquals. (from org-dartlang-testcase:///const_collections.dart:72:9)

‎pkg/front_end/testcases/general/constants/const_collections.dart.weak.expect

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -180,14 +180,14 @@ library /*isNonNullableByDefault*/;
180180
// ^
181181
//
182182
import self as self;
183-
import "dart:collection" as col;
184183
import "dart:core" as core;
184+
import "dart:collection" as col;
185185

186186
import "dart:collection";
187187

188-
class ConstIterable extends col::IterableBase<core::int> /*hasConstConstructor*/ {
188+
class ConstIterable extends core::Iterable<core::int> /*hasConstConstructor*/ {
189189
const constructor •() → self::ConstIterable
190-
: super col::IterableBase::•()
190+
: super core::Iterable::•()
191191
;
192192
get iterator() → core::Iterator<core::int>
193193
return <core::int>[].{core::Iterable::iterator}{core::Iterator<core::int>};
@@ -201,9 +201,9 @@ class WithEquals extends core::Object /*hasConstConstructor*/ {
201201
return o is{ForNonNullableByDefault} self::WithEquals && (o{self::WithEquals} as{ForNonNullableByDefault} self::WithEquals).{self::WithEquals::i}{core::int} =={core::num::==}{(core::Object) → core::bool} this.{self::WithEquals::i}{core::int};
202202
}
203203
}
204-
class CustomIterable extends col::IterableBase<core::String> /*hasConstConstructor*/ {
204+
class CustomIterable extends core::Iterable<core::String> /*hasConstConstructor*/ {
205205
const constructor •() → self::CustomIterable
206-
: super col::IterableBase::•()
206+
: super core::Iterable::•()
207207
;
208208
get iterator() → core::Iterator<core::String>
209209
return <core::String>[].{core::Iterable::iterator}{core::Iterator<core::String>};
@@ -383,7 +383,6 @@ constants {
383383
Constructor coverage from constants:
384384
org-dartlang-testcase:///const_collections.dart:
385385
- CustomIterable. (from org-dartlang-testcase:///const_collections.dart:79:9)
386-
- IterableBase. (from org-dartlang-sdk:///sdk/lib/collection/iterable.dart)
387386
- Iterable. (from org-dartlang-sdk:///sdk/lib/core/iterable.dart)
388387
- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
389388
- WithEquals. (from org-dartlang-testcase:///const_collections.dart:72:9)

‎pkg/front_end/testcases/general/constants/const_collections.dart.weak.modular.expect

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -180,14 +180,14 @@ library /*isNonNullableByDefault*/;
180180
// ^
181181
//
182182
import self as self;
183-
import "dart:collection" as col;
184183
import "dart:core" as core;
184+
import "dart:collection" as col;
185185

186186
import "dart:collection";
187187

188-
class ConstIterable extends col::IterableBase<core::int> /*hasConstConstructor*/ {
188+
class ConstIterable extends core::Iterable<core::int> /*hasConstConstructor*/ {
189189
const constructor •() → self::ConstIterable
190-
: super col::IterableBase::•()
190+
: super core::Iterable::•()
191191
;
192192
get iterator() → core::Iterator<core::int>
193193
return <core::int>[].{core::Iterable::iterator}{core::Iterator<core::int>};
@@ -201,9 +201,9 @@ class WithEquals extends core::Object /*hasConstConstructor*/ {
201201
return o is{ForNonNullableByDefault} self::WithEquals && (o{self::WithEquals} as{ForNonNullableByDefault} self::WithEquals).{self::WithEquals::i}{core::int} =={core::num::==}{(core::Object) → core::bool} this.{self::WithEquals::i}{core::int};
202202
}
203203
}
204-
class CustomIterable extends col::IterableBase<core::String> /*hasConstConstructor*/ {
204+
class CustomIterable extends core::Iterable<core::String> /*hasConstConstructor*/ {
205205
const constructor •() → self::CustomIterable
206-
: super col::IterableBase::•()
206+
: super core::Iterable::•()
207207
;
208208
get iterator() → core::Iterator<core::String>
209209
return <core::String>[].{core::Iterable::iterator}{core::Iterator<core::String>};
@@ -383,7 +383,6 @@ constants {
383383
Constructor coverage from constants:
384384
org-dartlang-testcase:///const_collections.dart:
385385
- CustomIterable. (from org-dartlang-testcase:///const_collections.dart:79:9)
386-
- IterableBase. (from org-dartlang-sdk:///sdk/lib/collection/iterable.dart)
387386
- Iterable. (from org-dartlang-sdk:///sdk/lib/core/iterable.dart)
388387
- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
389388
- WithEquals. (from org-dartlang-testcase:///const_collections.dart:72:9)

‎pkg/front_end/testcases/general/constants/const_collections.dart.weak.outline.expect

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,13 @@ library /*isNonNullableByDefault*/;
3737
// ^
3838
//
3939
import self as self;
40-
import "dart:collection" as col;
4140
import "dart:core" as core;
4241

4342
import "dart:collection";
4443

45-
class ConstIterable extends col::IterableBase<core::int> /*hasConstConstructor*/ {
44+
class ConstIterable extends core::Iterable<core::int> /*hasConstConstructor*/ {
4645
const constructor •() → self::ConstIterable
47-
: super col::IterableBase::•()
46+
: super core::Iterable::•()
4847
;
4948
get iterator() → core::Iterator<core::int>
5049
;
@@ -57,9 +56,9 @@ class WithEquals extends core::Object /*hasConstConstructor*/ {
5756
operator ==(core::Object o) → core::bool
5857
;
5958
}
60-
class CustomIterable extends col::IterableBase<core::String> /*hasConstConstructor*/ {
59+
class CustomIterable extends core::Iterable<core::String> /*hasConstConstructor*/ {
6160
const constructor •() → self::CustomIterable
62-
: super col::IterableBase::•()
61+
: super core::Iterable::•()
6362
;
6463
get iterator() → core::Iterator<core::String>
6564
;

‎pkg/front_end/testcases/general/constants/const_collections.dart.weak.transformed.expect

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -180,14 +180,14 @@ library /*isNonNullableByDefault*/;
180180
// ^
181181
//
182182
import self as self;
183-
import "dart:collection" as col;
184183
import "dart:core" as core;
184+
import "dart:collection" as col;
185185

186186
import "dart:collection";
187187

188-
class ConstIterable extends col::IterableBase<core::int> /*hasConstConstructor*/ {
188+
class ConstIterable extends core::Iterable<core::int> /*hasConstConstructor*/ {
189189
const constructor •() → self::ConstIterable
190-
: super col::IterableBase::•()
190+
: super core::Iterable::•()
191191
;
192192
get iterator() → core::Iterator<core::int>
193193
return core::_GrowableList::•<core::int>(0).{core::Iterable::iterator}{core::Iterator<core::int>};
@@ -201,9 +201,9 @@ class WithEquals extends core::Object /*hasConstConstructor*/ {
201201
return o is{ForNonNullableByDefault} self::WithEquals && o{self::WithEquals}.{self::WithEquals::i}{core::int} =={core::num::==}{(core::Object) → core::bool} this.{self::WithEquals::i}{core::int};
202202
}
203203
}
204-
class CustomIterable extends col::IterableBase<core::String> /*hasConstConstructor*/ {
204+
class CustomIterable extends core::Iterable<core::String> /*hasConstConstructor*/ {
205205
const constructor •() → self::CustomIterable
206-
: super col::IterableBase::•()
206+
: super core::Iterable::•()
207207
;
208208
get iterator() → core::Iterator<core::String>
209209
return core::_GrowableList::•<core::String>(0).{core::Iterable::iterator}{core::Iterator<core::String>};
@@ -383,7 +383,6 @@ constants {
383383
Constructor coverage from constants:
384384
org-dartlang-testcase:///const_collections.dart:
385385
- CustomIterable. (from org-dartlang-testcase:///const_collections.dart:79:9)
386-
- IterableBase. (from org-dartlang-sdk:///sdk/lib/collection/iterable.dart)
387386
- Iterable. (from org-dartlang-sdk:///sdk/lib/core/iterable.dart)
388387
- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
389388
- WithEquals. (from org-dartlang-testcase:///const_collections.dart:72:9)

‎pkg/front_end/testcases/general/sdk_diagnostic.dart.strong.expect

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ library /*isNonNullableByDefault*/;
1212
//
1313
// class C extends Iterable<Object> {
1414
// ^
15-
// sdk/lib/core/iterable.dart:148:19: Context: 'Iterable.iterator' is defined here.
15+
// sdk/lib/core/iterable.dart:169:19: Context: 'Iterable.iterator' is defined here.
1616
// Iterator<E> get iterator;
1717
// ^^^^^^^^
1818
//

‎pkg/front_end/testcases/general/sdk_diagnostic.dart.strong.transformed.expect

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ library /*isNonNullableByDefault*/;
1212
//
1313
// class C extends Iterable<Object> {
1414
// ^
15-
// sdk/lib/core/iterable.dart:148:19: Context: 'Iterable.iterator' is defined here.
15+
// sdk/lib/core/iterable.dart:169:19: Context: 'Iterable.iterator' is defined here.
1616
// Iterator<E> get iterator;
1717
// ^^^^^^^^
1818
//

‎pkg/front_end/testcases/general/sdk_diagnostic.dart.weak.expect

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ library /*isNonNullableByDefault*/;
1212
//
1313
// class C extends Iterable<Object> {
1414
// ^
15-
// sdk/lib/core/iterable.dart:148:19: Context: 'Iterable.iterator' is defined here.
15+
// sdk/lib/core/iterable.dart:169:19: Context: 'Iterable.iterator' is defined here.
1616
// Iterator<E> get iterator;
1717
// ^^^^^^^^
1818
//

‎pkg/front_end/testcases/general/sdk_diagnostic.dart.weak.modular.expect

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ library /*isNonNullableByDefault*/;
1212
//
1313
// class C extends Iterable<Object> {
1414
// ^
15-
// sdk/lib/core/iterable.dart:148:19: Context: 'Iterable.iterator' is defined here.
15+
// sdk/lib/core/iterable.dart:169:19: Context: 'Iterable.iterator' is defined here.
1616
// Iterator<E> get iterator;
1717
// ^^^^^^^^
1818
//

‎pkg/front_end/testcases/general/sdk_diagnostic.dart.weak.outline.expect

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ library /*isNonNullableByDefault*/;
1212
//
1313
// class C extends Iterable<Object> {
1414
// ^
15-
// sdk/lib/core/iterable.dart:148:19: Context: 'Iterable.iterator' is defined here.
15+
// sdk/lib/core/iterable.dart:169:19: Context: 'Iterable.iterator' is defined here.
1616
// Iterator<E> get iterator;
1717
// ^^^^^^^^
1818
//

‎pkg/front_end/testcases/general/sdk_diagnostic.dart.weak.transformed.expect

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ library /*isNonNullableByDefault*/;
1212
//
1313
// class C extends Iterable<Object> {
1414
// ^
15-
// sdk/lib/core/iterable.dart:148:19: Context: 'Iterable.iterator' is defined here.
15+
// sdk/lib/core/iterable.dart:169:19: Context: 'Iterable.iterator' is defined here.
1616
// Iterator<E> get iterator;
1717
// ^^^^^^^^
1818
//

‎pkg/front_end/testcases/incremental/no_outline_change_22.yaml.world.1.expect

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ library from "org-dartlang-test:///main.dart" as main {
514514
return dart.core::Comparable::compare(a as{ForNonNullableByDefault} dart.core::Comparable<dynamic>, b as{ForNonNullableByDefault} dart.core::Comparable<dynamic>);
515515
}
516516
static method /* from org-dartlang-sdk:///sdk/lib/collection/list.dart */ listToString(dart.core::List<dart.core::Object?> list) → dart.core::String
517-
return dart.collection::IterableBase::iterableToFullString(list, "[", "]");
517+
return dart.core::Iterable::iterableToFullString(list, "[", "]");
518518
}
519519
class WithListMixin extends main::_WithListMixin&Object&ListMixin {
520520
field dart.core::int length = 2;

‎pkg/front_end/testcases/incremental/no_outline_change_22.yaml.world.2.expect

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ library from "org-dartlang-test:///main.dart" as main {
514514
return dart.core::Comparable::compare(a as{ForNonNullableByDefault} dart.core::Comparable<dynamic>, b as{ForNonNullableByDefault} dart.core::Comparable<dynamic>);
515515
}
516516
static method /* from org-dartlang-sdk:///sdk/lib/collection/list.dart */ listToString(dart.core::List<dart.core::Object?> list) → dart.core::String
517-
return dart.collection::IterableBase::iterableToFullString(list, "[", "]");
517+
return dart.core::Iterable::iterableToFullString(list, "[", "]");
518518
}
519519
class WithListMixin extends main::_WithListMixin&Object&ListMixin {
520520
field dart.core::int length = 2;

‎pkg/front_end/testcases/patterns/cache_lookups.dart.strong.transformed.expect

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,7 @@ abstract class _CustomList&Object&ListMixin<E extends core::Object? = dynamic> e
589589
return core::Comparable::compare(a as{ForNonNullableByDefault} core::Comparable<dynamic>, b as{ForNonNullableByDefault} core::Comparable<dynamic>);
590590
}
591591
static method /* from org-dartlang-sdk:///sdk/lib/collection/list.dart */ listToString(core::List<core::Object?> list) → core::String
592-
return col::IterableBase::iterableToFullString(list, "[", "]");
592+
return core::Iterable::iterableToFullString(list, "[", "]");
593593
}
594594
class CustomList<E extends core::Object? = dynamic> extends cac::_CustomList&Object&ListMixin<cac::CustomList::E%> {
595595
final field core::List<cac::CustomList::E%> list;

‎pkg/front_end/testcases/patterns/cache_lookups.dart.weak.transformed.expect

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,7 @@ abstract class _CustomList&Object&ListMixin<E extends core::Object? = dynamic> e
589589
return core::Comparable::compare(a as{ForNonNullableByDefault} core::Comparable<dynamic>, b as{ForNonNullableByDefault} core::Comparable<dynamic>);
590590
}
591591
static method /* from org-dartlang-sdk:///sdk/lib/collection/list.dart */ listToString(core::List<core::Object?> list) → core::String
592-
return col::IterableBase::iterableToFullString(list, "[", "]");
592+
return core::Iterable::iterableToFullString(list, "[", "]");
593593
}
594594
class CustomList<E extends core::Object? = dynamic> extends cac::_CustomList&Object&ListMixin<cac::CustomList::E%> {
595595
final field core::List<cac::CustomList::E%> list;

‎pkg/front_end/testcases/patterns/caching_constants.dart.strong.transformed.expect

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ library /*isNonNullableByDefault*/;
22
import self as self;
33
import "dart:core" as core;
44
import "dart:collection" as col;
5+
import "dart:_internal" as _in;
56

67
import "dart:collection";
78

@@ -134,12 +135,12 @@ abstract class _MyMap&Object&MapMixin<K extends core::Object? = dynamic, V exten
134135
method /* from org-dartlang-sdk:///sdk/lib/collection/maps.dart */ toString() → core::String
135136
return col::MapBase::mapToString(this);
136137
static method /* from org-dartlang-sdk:///sdk/lib/collection/maps.dart */ mapToString(core::Map<core::Object?, core::Object?> m) → core::String {
137-
if(col::_isToStringVisiting(m)) {
138+
if(_in::isToStringVisiting(m)) {
138139
return "{...}";
139140
}
140141
core::StringBuffer result = new core::StringBuffer::•();
141142
try {
142-
col::_toStringVisiting.{core::List::add}(m){(core::Object) → void};
143+
_in::toStringVisiting.{core::List::add}(m){(core::Object) → void};
143144
result.{core::StringBuffer::write}("{"){(core::Object?) → void};
144145
core::bool first = true;
145146
m.{core::Map::forEach}((core::Object? k, core::Object? v) → void {
@@ -154,8 +155,8 @@ abstract class _MyMap&Object&MapMixin<K extends core::Object? = dynamic, V exten
154155
result.{core::StringBuffer::write}("}"){(core::Object?) → void};
155156
}
156157
finally {
157-
assert(core::identical(col::_toStringVisiting.{core::Iterable::last}{core::Object}, m));
158-
col::_toStringVisiting.{core::List::removeLast}(){() → core::Object};
158+
assert(core::identical(_in::toStringVisiting.{core::Iterable::last}{core::Object}, m));
159+
_in::toStringVisiting.{core::List::removeLast}(){() → core::Object};
159160
}
160161
return result.{core::StringBuffer::toString}(){() → core::String};
161162
}

‎pkg/front_end/testcases/patterns/caching_constants.dart.weak.transformed.expect

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ library /*isNonNullableByDefault*/;
22
import self as self;
33
import "dart:core" as core;
44
import "dart:collection" as col;
5+
import "dart:_internal" as _in;
56

67
import "dart:collection";
78

@@ -134,12 +135,12 @@ abstract class _MyMap&Object&MapMixin<K extends core::Object? = dynamic, V exten
134135
method /* from org-dartlang-sdk:///sdk/lib/collection/maps.dart */ toString() → core::String
135136
return col::MapBase::mapToString(this);
136137
static method /* from org-dartlang-sdk:///sdk/lib/collection/maps.dart */ mapToString(core::Map<core::Object?, core::Object?> m) → core::String {
137-
if(col::_isToStringVisiting(m)) {
138+
if(_in::isToStringVisiting(m)) {
138139
return "{...}";
139140
}
140141
core::StringBuffer result = new core::StringBuffer::•();
141142
try {
142-
col::_toStringVisiting.{core::List::add}(m){(core::Object) → void};
143+
_in::toStringVisiting.{core::List::add}(m){(core::Object) → void};
143144
result.{core::StringBuffer::write}("{"){(core::Object?) → void};
144145
core::bool first = true;
145146
m.{core::Map::forEach}((core::Object? k, core::Object? v) → void {
@@ -154,8 +155,8 @@ abstract class _MyMap&Object&MapMixin<K extends core::Object? = dynamic, V exten
154155
result.{core::StringBuffer::write}("}"){(core::Object?) → void};
155156
}
156157
finally {
157-
assert(core::identical(col::_toStringVisiting.{core::Iterable::last}{core::Object}, m));
158-
col::_toStringVisiting.{core::List::removeLast}(){() → core::Object};
158+
assert(core::identical(_in::toStringVisiting.{core::Iterable::last}{core::Object}, m));
159+
_in::toStringVisiting.{core::List::removeLast}(){() → core::Object};
159160
}
160161
return result.{core::StringBuffer::toString}(){() → core::String};
161162
}

‎pkg/front_end/testcases/patterns/matching_and_capturing_accesses_list_element_once.dart.strong.transformed.expect

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@ abstract class _A&Object&ListMixin extends core::Object implements col::ListBase
518518
return core::Comparable::compare(a as{ForNonNullableByDefault} core::Comparable<dynamic>, b as{ForNonNullableByDefault} core::Comparable<dynamic>);
519519
}
520520
static method /* from org-dartlang-sdk:///sdk/lib/collection/list.dart */ listToString(core::List<core::Object?> list) → core::String
521-
return col::IterableBase::iterableToFullString(list, "[", "]");
521+
return core::Iterable::iterableToFullString(list, "[", "]");
522522
}
523523
class A extends self::_A&Object&ListMixin {
524524
field core::int count = 0;

0 commit comments

Comments
 (0)