Skip to content

Commit 7a87766

Browse files
scheglovcommit-bot@chromium.org
scheglov
authored and
[email protected]
committed
Remove bogus features from analyzer.
[email protected], [email protected] Bug: #40860 Change-Id: I9ce962b43cc9d0d865a54d0b31a30245e5f7c001 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/153707 Commit-Queue: Konstantin Shcheglov <[email protected]> Reviewed-by: Brian Wilkerson <[email protected]>
1 parent 897706e commit 7a87766

3 files changed

Lines changed: 1 addition & 124 deletions

File tree

‎pkg/analyzer/CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
* Added `TypeVisitor` and `DartType.accept(TypeVisitor)`.
55
* Changed `ConstructorElement.returnType` to `InterfaceType`.
66
* Added `InterfaceType.asInstanceOf(ClassElement)`.
7+
* Removed deprecated internal `bogus-disabled` and `bogus-enabled`.
78

89
## 0.39.12
910
* Deprecated `canUseSummaries` in `DartSdkManager` constructor.

‎pkg/analyzer/lib/src/dart/analysis/experiments.g.dart‎

Lines changed: 0 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,6 @@ const _knownFeatures = <String, ExperimentalFeature>{
2323
EnableString.spread_collections: ExperimentalFeatures.spread_collections,
2424
EnableString.triple_shift: ExperimentalFeatures.triple_shift,
2525
EnableString.variance: ExperimentalFeatures.variance,
26-
27-
// ignore: deprecated_member_use_from_same_package
28-
EnableString.bogus_disabled: ExperimentalFeatures.bogus_disabled,
29-
// ignore: deprecated_member_use_from_same_package
30-
EnableString.bogus_enabled: ExperimentalFeatures.bogus_enabled,
3126
};
3227

3328
List<bool> _buildExperimentalFlagsArray() => <bool>[
@@ -40,8 +35,6 @@ List<bool> _buildExperimentalFlagsArray() => <bool>[
4035
true, // spread-collections
4136
IsEnabledByDefault.triple_shift,
4237
IsEnabledByDefault.variance,
43-
false, // bogus-disabled
44-
true, // bogus-enabled
4538
];
4639

4740
/// Constant strings for enabling each of the currently known experimental
@@ -73,14 +66,6 @@ class EnableString {
7366

7467
/// String to enable the experiment "variance"
7568
static const String variance = 'variance';
76-
77-
/// String to enable the experiment "bogus-disabled"
78-
@deprecated
79-
static const String bogus_disabled = 'bogus-disabled';
80-
81-
/// String to enable the experiment "bogus-enabled"
82-
@deprecated
83-
static const String bogus_enabled = 'bogus-enabled';
8469
}
8570

8671
class ExperimentalFeatures {
@@ -164,28 +149,6 @@ class ExperimentalFeatures {
164149
documentation: 'Sound variance',
165150
firstSupportedVersion: null,
166151
);
167-
168-
@deprecated
169-
static const bogus_disabled = ExperimentalFeature(
170-
index: 9,
171-
// ignore: deprecated_member_use_from_same_package
172-
enableString: EnableString.bogus_disabled,
173-
isEnabledByDefault: IsEnabledByDefault.bogus_disabled,
174-
isExpired: IsExpired.bogus_disabled,
175-
documentation: null,
176-
firstSupportedVersion: null,
177-
);
178-
179-
@deprecated
180-
static const bogus_enabled = ExperimentalFeature(
181-
index: 10,
182-
// ignore: deprecated_member_use_from_same_package
183-
enableString: EnableString.bogus_enabled,
184-
isEnabledByDefault: IsEnabledByDefault.bogus_enabled,
185-
isExpired: IsExpired.bogus_enabled,
186-
documentation: null,
187-
firstSupportedVersion: '1.0.0',
188-
);
189152
}
190153

191154
/// Constant bools indicating whether each experimental flag is currently
@@ -217,14 +180,6 @@ class IsEnabledByDefault {
217180

218181
/// Default state of the experiment "variance"
219182
static const bool variance = false;
220-
221-
/// Default state of the experiment "bogus-disabled"
222-
@deprecated
223-
static const bool bogus_disabled = false;
224-
225-
/// Default state of the experiment "bogus-enabled"
226-
@deprecated
227-
static const bool bogus_enabled = true;
228183
}
229184

230185
/// Constant bools indicating whether each experimental flag is currently
@@ -257,23 +212,9 @@ class IsExpired {
257212

258213
/// Expiration status of the experiment "variance"
259214
static const bool variance = false;
260-
261-
/// Expiration status of the experiment "bogus-disabled"
262-
static const bool bogus_disabled = true;
263-
264-
/// Expiration status of the experiment "bogus-enabled"
265-
static const bool bogus_enabled = true;
266215
}
267216

268217
mixin _CurrentState {
269-
/// Current state for the flag "bogus-disabled"
270-
@deprecated
271-
bool get bogus_disabled => isEnabled(ExperimentalFeatures.bogus_disabled);
272-
273-
/// Current state for the flag "bogus-enabled"
274-
@deprecated
275-
bool get bogus_enabled => isEnabled(ExperimentalFeatures.bogus_enabled);
276-
277218
/// Current state for the flag "constant-update-2018"
278219
bool get constant_update_2018 =>
279220
isEnabled(ExperimentalFeatures.constant_update_2018);

‎pkg/analyzer/tool/experiments/generate.dart‎

Lines changed: 0 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -107,26 +107,15 @@ List<bool> _buildExperimentalFlagsArray() => <bool>[
107107
out.writeln('IsEnabledByDefault.$id,');
108108
}
109109
}
110-
// TODO(danrubel): Remove bogus entries
111110
out.write('''
112-
false, // bogus-disabled
113-
true, // bogus-enabled
114111
];
115112
''');
116113
}
117114

118115
void generateSection_CurrentState() {
119-
// TODO(danrubel): Remove bogus entries
120116
out.write('''
121117
122118
mixin _CurrentState {
123-
/// Current state for the flag "bogus-disabled"
124-
@deprecated
125-
bool get bogus_disabled => isEnabled(ExperimentalFeatures.bogus_disabled);
126-
127-
/// Current state for the flag "bogus-enabled"
128-
@deprecated
129-
bool get bogus_enabled => isEnabled(ExperimentalFeatures.bogus_enabled);
130119
''');
131120
for (var key in keysSorted) {
132121
var id = keyToIdentifier(key);
@@ -164,16 +153,7 @@ class EnableString {
164153
static const String ${keyToIdentifier(key)} = '$key';
165154
''');
166155
}
167-
// TODO(danrubel): Remove bogus entries
168156
out.write('''
169-
170-
/// String to enable the experiment "bogus-disabled"
171-
@deprecated
172-
static const String bogus_disabled = 'bogus-disabled';
173-
174-
/// String to enable the experiment "bogus-enabled"
175-
@deprecated
176-
static const String bogus_enabled = 'bogus-enabled';
177157
}''');
178158
}
179159

@@ -205,30 +185,7 @@ class ExperimentalFeatures {
205185
out.writeln(');');
206186
++index;
207187
}
208-
// TODO(danrubel): Remove bogus entries
209188
out.write('''
210-
211-
@deprecated
212-
static const bogus_disabled = ExperimentalFeature(
213-
index: $index,
214-
// ignore: deprecated_member_use_from_same_package
215-
enableString: EnableString.bogus_disabled,
216-
isEnabledByDefault: IsEnabledByDefault.bogus_disabled,
217-
isExpired: IsExpired.bogus_disabled,
218-
documentation: null,
219-
firstSupportedVersion: null,
220-
);
221-
222-
@deprecated
223-
static const bogus_enabled = ExperimentalFeature(
224-
index: ${index + 1},
225-
// ignore: deprecated_member_use_from_same_package
226-
enableString: EnableString.bogus_enabled,
227-
isEnabledByDefault: IsEnabledByDefault.bogus_enabled,
228-
isExpired: IsExpired.bogus_enabled,
229-
documentation: null,
230-
firstSupportedVersion: '1.0.0',
231-
);
232189
}''');
233190
}
234191

@@ -247,16 +204,7 @@ class IsEnabledByDefault {
247204
static const bool ${keyToIdentifier(key)} = $shipped;
248205
''');
249206
}
250-
// TODO(danrubel): Remove bogus entries
251207
out.write('''
252-
253-
/// Default state of the experiment "bogus-disabled"
254-
@deprecated
255-
static const bool bogus_disabled = false;
256-
257-
/// Default state of the experiment "bogus-enabled"
258-
@deprecated
259-
static const bool bogus_enabled = true;
260208
}''');
261209
}
262210

@@ -280,14 +228,7 @@ class IsExpired {
280228
throw 'Cannot mark shipped feature as "expired: false"';
281229
}
282230
}
283-
// TODO(danrubel): Remove bogus entries
284231
out.write('''
285-
286-
/// Expiration status of the experiment "bogus-disabled"
287-
static const bool bogus_disabled = true;
288-
289-
/// Expiration status of the experiment "bogus-enabled"
290-
static const bool bogus_enabled = true;
291232
}''');
292233
}
293234

@@ -303,13 +244,7 @@ const _knownFeatures = <String, ExperimentalFeature>{
303244
EnableString.$id: ExperimentalFeatures.$id,
304245
''');
305246
}
306-
// TODO(danrubel): Remove bogus entries
307247
out.write('''
308-
309-
// ignore: deprecated_member_use_from_same_package
310-
EnableString.bogus_disabled: ExperimentalFeatures.bogus_disabled,
311-
// ignore: deprecated_member_use_from_same_package
312-
EnableString.bogus_enabled: ExperimentalFeatures.bogus_enabled,
313248
};
314249
''');
315250
}

0 commit comments

Comments
 (0)