Mark `NativeFieldWrapperClass1` extensions as `base`
diff --git a/shell/platform/fuchsia/dart-pkg/zircon/lib/src/handle.dart b/shell/platform/fuchsia/dart-pkg/zircon/lib/src/handle.dart index adfac80..eea9727 100644 --- a/shell/platform/fuchsia/dart-pkg/zircon/lib/src/handle.dart +++ b/shell/platform/fuchsia/dart-pkg/zircon/lib/src/handle.dart
@@ -8,7 +8,7 @@ // ignore_for_file: public_member_api_docs @pragma('vm:entry-point') -class Handle extends NativeFieldWrapperClass1 { +base class Handle extends NativeFieldWrapperClass1 { // No public constructor - this can only be created from native code. @pragma('vm:entry-point') Handle._(); @@ -31,8 +31,7 @@ @override bool operator ==(Object other) { - return other is Handle - && other.handle == handle; + return other is Handle && other.handle == handle; } @override
diff --git a/shell/platform/fuchsia/dart-pkg/zircon/lib/src/handle_disposition.dart b/shell/platform/fuchsia/dart-pkg/zircon/lib/src/handle_disposition.dart index bd3fa03..77b48ce 100644 --- a/shell/platform/fuchsia/dart-pkg/zircon/lib/src/handle_disposition.dart +++ b/shell/platform/fuchsia/dart-pkg/zircon/lib/src/handle_disposition.dart
@@ -8,14 +8,15 @@ // ignore_for_file: public_member_api_docs @pragma('vm:entry-point') -class HandleDisposition extends NativeFieldWrapperClass1 { +base class HandleDisposition extends NativeFieldWrapperClass1 { @pragma('vm:entry-point') HandleDisposition(int operation, Handle handle, int type, int rights) { _constructor(operation, handle, type, rights); } @pragma('vm:external-name', 'HandleDisposition_constructor') - external void _constructor(int operation, Handle handle, int type, int rights); + external void _constructor( + int operation, Handle handle, int type, int rights); @pragma('vm:external-name', 'HandleDisposition_operation') external int get operation;
diff --git a/shell/platform/fuchsia/dart-pkg/zircon/lib/src/handle_waiter.dart b/shell/platform/fuchsia/dart-pkg/zircon/lib/src/handle_waiter.dart index dba823a..49bc437 100644 --- a/shell/platform/fuchsia/dart-pkg/zircon/lib/src/handle_waiter.dart +++ b/shell/platform/fuchsia/dart-pkg/zircon/lib/src/handle_waiter.dart
@@ -10,7 +10,7 @@ typedef AsyncWaitCallback = void Function(int status, int pending); @pragma('vm:entry-point') -class HandleWaiter extends NativeFieldWrapperClass1 { +base class HandleWaiter extends NativeFieldWrapperClass1 { // Private constructor. @pragma('vm:entry-point') HandleWaiter._();
diff --git a/shell/platform/fuchsia/dart-pkg/zircon/lib/src/system.dart b/shell/platform/fuchsia/dart-pkg/zircon/lib/src/system.dart index 9f6cec0..2b3a450 100644 --- a/shell/platform/fuchsia/dart-pkg/zircon/lib/src/system.dart +++ b/shell/platform/fuchsia/dart-pkg/zircon/lib/src/system.dart
@@ -80,7 +80,8 @@ List<Handle> get handles => _handles!; @pragma('vm:entry-point') - const ReadResult(final int status, [this._bytes, this._numBytes, this._handles]) + const ReadResult(final int status, + [this._bytes, this._numBytes, this._handles]) : super(status); /// Returns the bytes as a Uint8List. If status != OK this will throw @@ -109,8 +110,7 @@ const HandleInfo(this.handle, this.type, this.rights); @override - String toString() => - 'HandleInfo(handle=$handle, type=$type, rights=$rights)'; + String toString() => 'HandleInfo(handle=$handle, type=$type, rights=$rights)'; } @pragma('vm:entry-point') @@ -124,7 +124,8 @@ List<HandleInfo> get handleInfos => _handleInfos!; @pragma('vm:entry-point') - const ReadEtcResult(final int status, [this._bytes, this._numBytes, this._handleInfos]) + const ReadEtcResult(final int status, + [this._bytes, this._numBytes, this._handleInfos]) : super(status); /// Returns the bytes as a Uint8List. If status != OK this will throw @@ -193,7 +194,7 @@ } @pragma('vm:entry-point') -class System extends NativeFieldWrapperClass1 { +base class System extends NativeFieldWrapperClass1 { // No public constructor - this only has static methods. System._(); @@ -205,9 +206,11 @@ @pragma('vm:external-name', 'System_ConnectToService') external static int connectToService(String path, Handle channel); @pragma('vm:external-name', 'System_ChannelWrite') - external static int channelWrite(Handle channel, ByteData data, List<Handle> handles); + external static int channelWrite( + Handle channel, ByteData data, List<Handle> handles); @pragma('vm:external-name', 'System_ChannelWriteEtc') - external static int channelWriteEtc(Handle channel, ByteData data, List<HandleDisposition> handleDispositions); + external static int channelWriteEtc(Handle channel, ByteData data, + List<HandleDisposition> handleDispositions); @pragma('vm:external-name', 'System_ChannelQueryAndRead') external static ReadResult channelQueryAndRead(Handle channel); @pragma('vm:external-name', 'System_ChannelQueryAndReadEtc') @@ -221,7 +224,8 @@ @pragma('vm:external-name', 'System_SocketCreate') external static HandlePairResult socketCreate([int options = 0]); @pragma('vm:external-name', 'System_SocketWrite') - external static WriteResult socketWrite(Handle socket, ByteData data, int options); + external static WriteResult socketWrite( + Handle socket, ByteData data, int options); @pragma('vm:external-name', 'System_SocketRead') external static ReadResult socketRead(Handle socket, int size); @@ -254,5 +258,7 @@ external static int _nativeClockGetMonotonic(); // TODO(edcoyne): Remove this, it is required to safely do an API transition across repos. - static int reboot() { return -2; /*ZX_ERR_NOT_SUPPORTED*/ } + static int reboot() { + return -2; /*ZX_ERR_NOT_SUPPORTED*/ + } }