Skip to content

Remove redundant checkNotNull calls from pre-null-safe days #958

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 11, 2025
Merged

Remove redundant checkNotNull calls from pre-null-safe days #958

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
edfe97a
Remove redundant checkNotNull calls from pre-null-safe days
osa1 Feb 10, 2025
dc6e8fb
Fix warnings
osa1 Feb 10, 2025
4e61fe4
Also fix tighten_type_of_initializing_formals (required by g3)
osa1 Feb 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion protobuf/lib/src/protobuf/coded_buffer.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ void _writeToCodedBufferWriter(_FieldSet fs, CodedBufferWriter out) {

void _mergeFromCodedBufferReader(BuilderInfo meta, _FieldSet fs,
CodedBufferReader input, ExtensionRegistry registry) {
ArgumentError.checkNotNull(registry);
fs._ensureWritable();
while (true) {
final tag = input.readTag();
Expand Down
2 changes: 1 addition & 1 deletion protobuf/lib/src/protobuf/extension.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class Extension<T> extends FieldInfo<T> {
protoName: protoName);

Extension.repeated(this.extendee, String name, int tagNumber, int fieldType,
{CheckFunc<T>? check,
{required CheckFunc<T> check,
CreateBuilderFunc? subBuilder,
ValueOfFunc? valueOf,
List<ProtobufEnum>? enumValues,
Expand Down
20 changes: 7 additions & 13 deletions protobuf/lib/src/protobuf/field_info.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,16 +128,12 @@ class FieldInfo<T> {
subBuilder = null;

FieldInfo.repeated(this.name, this.tagNumber, this.index, this.type,
this.check, this.subBuilder,
CheckFunc<T> this.check, this.subBuilder,
{this.valueOf, this.enumValues, this.defaultEnumValue, String? protoName})
: makeDefault = (() => PbList<T>(check: check!)),
_protoName = protoName {
ArgumentError.checkNotNull(name, 'name');
ArgumentError.checkNotNull(tagNumber, 'tagNumber');
assert(_isRepeated(type));
assert(check != null);
assert(!_isEnum(type) || valueOf != null);
}
: makeDefault = (() => PbList<T>(check: check)),
_protoName = protoName,
assert(_isRepeated(type)),
assert(!_isEnum(type) || valueOf != null);

static MakeDefaultFunc? findMakeDefault(int type, dynamic defaultOrMaker) {
if (defaultOrMaker == null) return PbFieldType._defaultForType(type);
Expand Down Expand Up @@ -276,13 +272,11 @@ class MapFieldInfo<K, V> extends FieldInfo<PbMap<K, V>?> {
this.valueCreator,
{ProtobufEnum? defaultEnumValue,
String? protoName})
: super(name, tagNumber, index, type,
: assert(_isMapField(type)),
super(name, tagNumber, index, type,
defaultOrMaker: () => PbMap<K, V>(keyFieldType, valueFieldType),
defaultEnumValue: defaultEnumValue,
protoName: protoName) {
ArgumentError.checkNotNull(name, 'name');
ArgumentError.checkNotNull(tagNumber, 'tagNumber');
assert(_isMapField(type));
assert(!_isEnum(type) || valueOf != null);
}

Expand Down
3 changes: 0 additions & 3 deletions protobuf/lib/src/protobuf/field_set.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,8 +258,6 @@ class _FieldSet {
/// Works for both extended and non-extended fields.
/// Suitable for public API.
void _setField(int tagNumber, Object value) {
ArgumentError.checkNotNull(value, 'value');

final meta = _meta;
final fi = _nonExtensionInfo(meta, tagNumber);
if (fi == null) {
Expand All @@ -284,7 +282,6 @@ class _FieldSet {
/// Works for both extended and non-extended fields.
/// Suitable for decoders that do their own validation.
void _setFieldUnchecked(BuilderInfo meta, FieldInfo fi, value) {
ArgumentError.checkNotNull(fi, 'fi');
assert(!fi.isRepeated);
if (fi.index == null) {
_ensureExtensions()
Expand Down
4 changes: 0 additions & 4 deletions protobuf/lib/src/protobuf/generated_message.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,6 @@ abstract class GeneratedMessage {

/// Sets the value of a non-repeated extension field to [value].
void setExtension(Extension extension, Object value) {
ArgumentError.checkNotNull(value, 'value');
if (_isRepeated(extension.type)) {
throw ArgumentError(_fieldSet._setFieldFailedMessage(
extension, value, 'repeating field (use get + .add())'));
Expand Down Expand Up @@ -489,7 +488,6 @@ abstract class GeneratedMessage {
/// For generated code only.
/// @nodoc
void $_setFloat(int index, double value) {
ArgumentError.checkNotNull(value, 'value');
if (!_isFloat32(value)) {
_fieldSet._$check(index, value);
}
Expand All @@ -503,7 +501,6 @@ abstract class GeneratedMessage {
/// For generated code only.
/// @nodoc
void $_setSignedInt32(int index, int value) {
ArgumentError.checkNotNull(value, 'value');
if (!_isSigned32(value)) {
_fieldSet._$check(index, value);
}
Expand All @@ -513,7 +510,6 @@ abstract class GeneratedMessage {
/// For generated code only.
/// @nodoc
void $_setUnsignedInt32(int index, int value) {
ArgumentError.checkNotNull(value, 'value');
if (!_isUnsigned32(value)) {
_fieldSet._$check(index, value);
}
Expand Down