Skip to content

Commit 9bf9ec6

Browse files
authored
Remove unneeded default cases in switch, move to switch expressions (#3753)
* also double timeout for dart2wasm tests
1 parent 81c309b commit 9bf9ec6

File tree

2 files changed

+40
-54
lines changed

2 files changed

+40
-54
lines changed

_test/test/dart2wasm_integration_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import 'common/utils.dart';
1818
const _testArgs = ['-c', 'dart2wasm'];
1919

2020
void main() {
21-
group('Can run tests using dart2wasm', () {
21+
group('Can run tests using dart2wasm', timeout: const Timeout.factor(2), () {
2222
test('via build.yaml config flag', () async {
2323
await expectTestsPass(
2424
usePrecompiled: true,

build_runner_core/lib/src/asset_graph/serialization.dart

Lines changed: 39 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -365,8 +365,6 @@ class _WrappedAssetNode extends Object with ListMixin implements List {
365365
.map((id) => serializer.findAssetIndex(id,
366366
from: node.id, field: 'deletedBy'))
367367
.toList(growable: false);
368-
default:
369-
throw RangeError.index(index, this);
370368
}
371369
}
372370

@@ -399,28 +397,23 @@ class _WrappedGeneratedAssetNode extends _WrappedAssetNode {
399397
Object? operator [](int index) {
400398
if (index < _serializedOffset) return super[index];
401399
var fieldId = _GeneratedField.values[index - _serializedOffset];
402-
switch (fieldId) {
403-
case _GeneratedField.primaryInput:
404-
return serializer.findAssetIndex(generatedNode.primaryInput,
405-
from: generatedNode.id, field: 'primaryInput');
406-
case _GeneratedField.wasOutput:
407-
return _serializeBool(generatedNode.wasOutput);
408-
case _GeneratedField.isFailure:
409-
return _serializeBool(generatedNode.isFailure);
410-
case _GeneratedField.phaseNumber:
411-
return generatedNode.phaseNumber;
412-
case _GeneratedField.state:
413-
return generatedNode.state.index;
414-
case _GeneratedField.previousInputsDigest:
415-
return _serializeDigest(generatedNode.previousInputsDigest);
416-
case _GeneratedField.builderOptions:
417-
return serializer.findAssetIndex(generatedNode.builderOptionsId,
418-
from: generatedNode.id, field: 'builderOptions');
419-
case _GeneratedField.isHidden:
420-
return _serializeBool(generatedNode.isHidden);
421-
default:
422-
throw RangeError.index(index, this);
423-
}
400+
return switch (fieldId) {
401+
_GeneratedField.primaryInput => serializer.findAssetIndex(
402+
generatedNode.primaryInput,
403+
from: generatedNode.id,
404+
field: 'primaryInput'),
405+
_GeneratedField.wasOutput => _serializeBool(generatedNode.wasOutput),
406+
_GeneratedField.isFailure => _serializeBool(generatedNode.isFailure),
407+
_GeneratedField.phaseNumber => generatedNode.phaseNumber,
408+
_GeneratedField.state => generatedNode.state.index,
409+
_GeneratedField.previousInputsDigest =>
410+
_serializeDigest(generatedNode.previousInputsDigest),
411+
_GeneratedField.builderOptions => serializer.findAssetIndex(
412+
generatedNode.builderOptionsId,
413+
from: generatedNode.id,
414+
field: 'builderOptions'),
415+
_GeneratedField.isHidden => _serializeBool(generatedNode.isHidden)
416+
};
424417
}
425418
}
426419

@@ -447,21 +440,15 @@ class _WrappedGlobAssetNode extends _WrappedAssetNode {
447440
Object? operator [](int index) {
448441
if (index < _serializedOffset) return super[index];
449442
var fieldId = _GlobField.values[index - _serializedOffset];
450-
switch (fieldId) {
451-
case _GlobField.phaseNumber:
452-
return globNode.phaseNumber;
453-
case _GlobField.state:
454-
return globNode.state.index;
455-
case _GlobField.glob:
456-
return globNode.glob.pattern;
457-
case _GlobField.results:
458-
return globNode.results!
459-
.map((id) => serializer.findAssetIndex(id,
460-
from: globNode.id, field: 'results'))
461-
.toList(growable: false);
462-
default:
463-
throw RangeError.index(index, this);
464-
}
443+
return switch (fieldId) {
444+
_GlobField.phaseNumber => globNode.phaseNumber,
445+
_GlobField.state => globNode.state.index,
446+
_GlobField.glob => globNode.glob.pattern,
447+
_GlobField.results => globNode.results!
448+
.map((id) => serializer.findAssetIndex(id,
449+
from: globNode.id, field: 'results'))
450+
.toList(growable: false)
451+
};
465452
}
466453
}
467454

@@ -489,20 +476,19 @@ class _WrappedPostProcessAnchorNode extends _WrappedAssetNode {
489476
Object? operator [](int index) {
490477
if (index < _serializedOffset) return super[index];
491478
var fieldId = _PostAnchorField.values[index - _serializedOffset];
492-
switch (fieldId) {
493-
case _PostAnchorField.actionNumber:
494-
return wrappedNode.actionNumber;
495-
case _PostAnchorField.builderOptions:
496-
return serializer.findAssetIndex(wrappedNode.builderOptionsId,
497-
from: wrappedNode.id, field: 'builderOptions');
498-
case _PostAnchorField.previousInputsDigest:
499-
return _serializeDigest(wrappedNode.previousInputsDigest);
500-
case _PostAnchorField.primaryInput:
501-
return serializer.findAssetIndex(wrappedNode.primaryInput,
502-
from: wrappedNode.id, field: 'primaryInput');
503-
default:
504-
throw RangeError.index(index, this);
505-
}
479+
return switch (fieldId) {
480+
_PostAnchorField.actionNumber => wrappedNode.actionNumber,
481+
_PostAnchorField.builderOptions => serializer.findAssetIndex(
482+
wrappedNode.builderOptionsId,
483+
from: wrappedNode.id,
484+
field: 'builderOptions'),
485+
_PostAnchorField.previousInputsDigest =>
486+
_serializeDigest(wrappedNode.previousInputsDigest),
487+
_PostAnchorField.primaryInput => serializer.findAssetIndex(
488+
wrappedNode.primaryInput,
489+
from: wrappedNode.id,
490+
field: 'primaryInput')
491+
};
506492
}
507493
}
508494

0 commit comments

Comments
 (0)