Version 2.17.0-194.0.dev
Merge commit '9872e9d4c4eaf38d32410673974a1694c754dc6a' into 'dev'
diff --git a/runtime/tests/vm/dart/hello_fuchsia_test.dart b/runtime/tests/vm/dart/hello_fuchsia_test.dart
index cbe0ceb..9b25910 100644
--- a/runtime/tests/vm/dart/hello_fuchsia_test.dart
+++ b/runtime/tests/vm/dart/hello_fuchsia_test.dart
@@ -21,13 +21,13 @@
}
testSimpleBind() async {
- var s = await RawServerSocket.bind(InternetAddress.LOOPBACK_IP_V4, 0);
+ var s = await RawServerSocket.bind(InternetAddress.loopbackIPv4, 0);
print("port = ${s.port}");
await s.close();
}
testSimpleConnect() async {
- var server = await RawServerSocket.bind(InternetAddress.LOOPBACK_IP_V4, 0);
+ var server = await RawServerSocket.bind(InternetAddress.loopbackIPv4, 0);
print("server port = ${server.port}");
server.listen((socket) {
print("listen socket port = ${socket.port}");
@@ -36,7 +36,7 @@
var socket = await RawSocket.connect("127.0.0.1", server.port);
print("socket port = ${socket.port}");
if (socket.remoteAddress.address != "127.0.0.1" ||
- socket.remoteAddress.type != InternetAddressType.IP_V4) {
+ socket.remoteAddress.type != InternetAddressType.IPv4) {
throw "Bad remote address ${socket.remoteAddress}";
}
if (socket.remotePort is! int) {
@@ -68,7 +68,7 @@
}
}
- var server = await RawServerSocket.bind(InternetAddress.LOOPBACK_IP_V4, 0);
+ var server = await RawServerSocket.bind(InternetAddress.loopbackIPv4, 0);
server.listen((client) {
int bytesRead = 0;
int bytesWritten = 0;
@@ -79,7 +79,7 @@
client.writeEventsEnabled = false;
client.listen((event) {
switch (event) {
- case RawSocketEvent.READ:
+ case RawSocketEvent.read:
if (doneReading) {
break;
}
@@ -97,7 +97,7 @@
doneReading = true;
}
break;
- case RawSocketEvent.WRITE:
+ case RawSocketEvent.write:
assert(!client.writeEventsEnabled);
bytesWritten +=
client.write(data, bytesWritten, data.length - bytesWritten);
@@ -109,12 +109,12 @@
print("client WRITE event: done writing.");
}
break;
- case RawSocketEvent.READ_CLOSED:
+ case RawSocketEvent.readClosed:
print("client READ_CLOSED event");
client.close();
server.close();
break;
- case RawSocketEvent.CLOSED:
+ case RawSocketEvent.closed:
assert(!closedEventReceived);
print("client CLOSED event");
closedEventReceived = true;
@@ -139,7 +139,7 @@
socket.listen((event) {
switch (event) {
- case RawSocketEvent.READ:
+ case RawSocketEvent.read:
assert(socket.available() > 0);
print("server READ event: ${bytesRead} read");
var buffer = socket.read()!;
@@ -151,7 +151,7 @@
socket.close();
}
break;
- case RawSocketEvent.WRITE:
+ case RawSocketEvent.write:
assert(bytesRead == 0);
assert(!socket.writeEventsEnabled);
bytesWritten +=
@@ -164,12 +164,12 @@
data = new List<int>.filled(messageSize, -1);
}
break;
- case RawSocketEvent.READ_CLOSED:
+ case RawSocketEvent.readClosed:
print("server READ_CLOSED event");
verifyTestData(data);
socket.close();
break;
- case RawSocketEvent.CLOSED:
+ case RawSocketEvent.closed:
assert(!closedEventReceived);
print("server CLOSED event");
closedEventReceived = true;
@@ -210,7 +210,7 @@
}
}
- var server = await RawServerSocket.bind(InternetAddress.LOOPBACK_IP_V4, 0);
+ var server = await RawServerSocket.bind(InternetAddress.loopbackIPv4, 0);
server.listen((client) {
int bytesRead = 0;
int bytesWritten = 0;
@@ -221,7 +221,7 @@
client.writeEventsEnabled = false;
client.listen((event) {
switch (event) {
- case RawSocketEvent.READ:
+ case RawSocketEvent.read:
if (doneReading) {
break;
}
@@ -247,7 +247,7 @@
doneReading = true;
}
break;
- case RawSocketEvent.WRITE:
+ case RawSocketEvent.write:
assert(!client.writeEventsEnabled);
bytesWritten +=
client.write(data, bytesWritten, data.length - bytesWritten);
@@ -257,14 +257,14 @@
}
if (bytesWritten == data.length) {
print("client WRITE event: done writing.");
- client.shutdown(SocketDirection.SEND);
+ client.shutdown(SocketDirection.send);
}
break;
- case RawSocketEvent.READ_CLOSED:
+ case RawSocketEvent.readClosed:
print("client READ_CLOSED event");
server.close();
break;
- case RawSocketEvent.CLOSED:
+ case RawSocketEvent.closed:
assert(!closedEventReceived);
print("client CLOSED event");
closedEventReceived = true;
@@ -287,7 +287,7 @@
socket.listen((event) {
switch (event) {
- case RawSocketEvent.READ:
+ case RawSocketEvent.read:
assert(socket.available() > 0);
if (dropReads) {
if (clientReadCount != 10) {
@@ -303,7 +303,7 @@
data.setRange(bytesRead, bytesRead + buffer.length, buffer);
bytesRead += buffer.length;
break;
- case RawSocketEvent.WRITE:
+ case RawSocketEvent.write:
assert(bytesRead == 0);
assert(!socket.writeEventsEnabled);
bytesWritten +=
@@ -316,12 +316,12 @@
data = new List<int>.filled(messageSize, -1);
}
break;
- case RawSocketEvent.READ_CLOSED:
+ case RawSocketEvent.readClosed:
print("server READ_CLOSED event");
verifyTestData(data);
socket.close();
break;
- case RawSocketEvent.CLOSED:
+ case RawSocketEvent.closed:
assert(!closedEventReceived);
print("server CLOSED event");
closedEventReceived = true;
diff --git a/runtime/tests/vm/dart/regress38654_test.dart b/runtime/tests/vm/dart/regress38654_test.dart
index e053804..8b82207 100644
--- a/runtime/tests/vm/dart/regress38654_test.dart
+++ b/runtime/tests/vm/dart/regress38654_test.dart
@@ -60,7 +60,7 @@
((var3
? Float32x4.wyyy
: var7[
- (false ? var4 : ZLibOption.DEFAULT_WINDOW_BITS)]) <<
+ (false ? var4 : ZLibOption.defaultWindowBits)]) <<
var7[var7[-32769]]),
(var3 ? 8 : var7[-9223372036854775680]),
(Int32x4.xxww ^ Int32x4.zzyy)
@@ -183,7 +183,7 @@
(~(((!(true))
? (false
? (++var2)
- : var7[ZLibOption.STRATEGY_FILTERED])
+ : var7[ZLibOption.strategyFiltered])
: Float32x4.xxyz))),
(var3
? (true
diff --git a/runtime/tests/vm/dart_2/hello_fuchsia_test.dart b/runtime/tests/vm/dart_2/hello_fuchsia_test.dart
index 028a293..b75d2c0 100644
--- a/runtime/tests/vm/dart_2/hello_fuchsia_test.dart
+++ b/runtime/tests/vm/dart_2/hello_fuchsia_test.dart
@@ -23,13 +23,13 @@
}
testSimpleBind() async {
- var s = await RawServerSocket.bind(InternetAddress.LOOPBACK_IP_V4, 0);
+ var s = await RawServerSocket.bind(InternetAddress.loopbackIPv4, 0);
print("port = ${s.port}");
await s.close();
}
testSimpleConnect() async {
- var server = await RawServerSocket.bind(InternetAddress.LOOPBACK_IP_V4, 0);
+ var server = await RawServerSocket.bind(InternetAddress.loopbackIPv4, 0);
print("server port = ${server.port}");
server.listen((socket) {
print("listen socket port = ${socket.port}");
@@ -38,7 +38,7 @@
var socket = await RawSocket.connect("127.0.0.1", server.port);
print("socket port = ${socket.port}");
if (socket.remoteAddress.address != "127.0.0.1" ||
- socket.remoteAddress.type != InternetAddressType.IP_V4) {
+ socket.remoteAddress.type != InternetAddressType.IPv4) {
throw "Bad remote address ${socket.remoteAddress}";
}
if (socket.remotePort is! int) {
@@ -70,7 +70,7 @@
}
}
- var server = await RawServerSocket.bind(InternetAddress.LOOPBACK_IP_V4, 0);
+ var server = await RawServerSocket.bind(InternetAddress.loopbackIPv4, 0);
server.listen((client) {
int bytesRead = 0;
int bytesWritten = 0;
@@ -81,7 +81,7 @@
client.writeEventsEnabled = false;
client.listen((event) {
switch (event) {
- case RawSocketEvent.READ:
+ case RawSocketEvent.read:
if (doneReading) {
break;
}
@@ -99,7 +99,7 @@
doneReading = true;
}
break;
- case RawSocketEvent.WRITE:
+ case RawSocketEvent.write:
assert(!client.writeEventsEnabled);
bytesWritten +=
client.write(data, bytesWritten, data.length - bytesWritten);
@@ -111,12 +111,12 @@
print("client WRITE event: done writing.");
}
break;
- case RawSocketEvent.READ_CLOSED:
+ case RawSocketEvent.readClosed:
print("client READ_CLOSED event");
client.close();
server.close();
break;
- case RawSocketEvent.CLOSED:
+ case RawSocketEvent.closed:
assert(!closedEventReceived);
print("client CLOSED event");
closedEventReceived = true;
@@ -141,7 +141,7 @@
socket.listen((event) {
switch (event) {
- case RawSocketEvent.READ:
+ case RawSocketEvent.read:
assert(socket.available() > 0);
print("server READ event: ${bytesRead} read");
var buffer = socket.read();
@@ -153,7 +153,7 @@
socket.close();
}
break;
- case RawSocketEvent.WRITE:
+ case RawSocketEvent.write:
assert(bytesRead == 0);
assert(!socket.writeEventsEnabled);
bytesWritten +=
@@ -166,12 +166,12 @@
data = new List<int>(messageSize);
}
break;
- case RawSocketEvent.READ_CLOSED:
+ case RawSocketEvent.readClosed:
print("server READ_CLOSED event");
verifyTestData(data);
socket.close();
break;
- case RawSocketEvent.CLOSED:
+ case RawSocketEvent.closed:
assert(!closedEventReceived);
print("server CLOSED event");
closedEventReceived = true;
@@ -212,7 +212,7 @@
}
}
- var server = await RawServerSocket.bind(InternetAddress.LOOPBACK_IP_V4, 0);
+ var server = await RawServerSocket.bind(InternetAddress.loopbackIPv4, 0);
server.listen((client) {
int bytesRead = 0;
int bytesWritten = 0;
@@ -223,7 +223,7 @@
client.writeEventsEnabled = false;
client.listen((event) {
switch (event) {
- case RawSocketEvent.READ:
+ case RawSocketEvent.read:
if (doneReading) {
break;
}
@@ -249,7 +249,7 @@
doneReading = true;
}
break;
- case RawSocketEvent.WRITE:
+ case RawSocketEvent.write:
assert(!client.writeEventsEnabled);
bytesWritten +=
client.write(data, bytesWritten, data.length - bytesWritten);
@@ -259,14 +259,14 @@
}
if (bytesWritten == data.length) {
print("client WRITE event: done writing.");
- client.shutdown(SocketDirection.SEND);
+ client.shutdown(SocketDirection.send);
}
break;
- case RawSocketEvent.READ_CLOSED:
+ case RawSocketEvent.readClosed:
print("client READ_CLOSED event");
server.close();
break;
- case RawSocketEvent.CLOSED:
+ case RawSocketEvent.closed:
assert(!closedEventReceived);
print("client CLOSED event");
closedEventReceived = true;
@@ -289,7 +289,7 @@
socket.listen((event) {
switch (event) {
- case RawSocketEvent.READ:
+ case RawSocketEvent.read:
assert(socket.available() > 0);
if (dropReads) {
if (clientReadCount != 10) {
@@ -305,7 +305,7 @@
data.setRange(bytesRead, bytesRead + buffer.length, buffer);
bytesRead += buffer.length;
break;
- case RawSocketEvent.WRITE:
+ case RawSocketEvent.write:
assert(bytesRead == 0);
assert(!socket.writeEventsEnabled);
bytesWritten +=
@@ -318,12 +318,12 @@
data = new List<int>(messageSize);
}
break;
- case RawSocketEvent.READ_CLOSED:
+ case RawSocketEvent.readClosed:
print("server READ_CLOSED event");
verifyTestData(data);
socket.close();
break;
- case RawSocketEvent.CLOSED:
+ case RawSocketEvent.closed:
assert(!closedEventReceived);
print("server CLOSED event");
closedEventReceived = true;
diff --git a/runtime/tests/vm/dart_2/regress38654_test.dart b/runtime/tests/vm/dart_2/regress38654_test.dart
index ad5b1da..73a313c 100644
--- a/runtime/tests/vm/dart_2/regress38654_test.dart
+++ b/runtime/tests/vm/dart_2/regress38654_test.dart
@@ -62,7 +62,7 @@
((var3
? Float32x4.wyyy
: var7[
- (false ? var4 : ZLibOption.DEFAULT_WINDOW_BITS)]) <<
+ (false ? var4 : ZLibOption.defaultWindowBits)]) <<
var7[var7[-32769]]),
(var3 ? 8 : var7[-9223372036854775680]),
(Int32x4.xxww ^ Int32x4.zzyy)
@@ -185,7 +185,7 @@
(~(((!(true))
? (false
? (++var2)
- : var7[ZLibOption.STRATEGY_FILTERED])
+ : var7[ZLibOption.strategyFiltered])
: Float32x4.xxyz))),
(var3
? (true
diff --git a/sdk/lib/_internal/vm/bin/sync_socket_patch.dart b/sdk/lib/_internal/vm/bin/sync_socket_patch.dart
index beff01e..2cfd340 100644
--- a/sdk/lib/_internal/vm/bin/sync_socket_patch.dart
+++ b/sdk/lib/_internal/vm/bin/sync_socket_patch.dart
@@ -177,7 +177,7 @@
}
static List<_InternetAddress> lookup(String host,
- {InternetAddressType type: InternetAddressType.ANY}) {
+ {InternetAddressType type: InternetAddressType.any}) {
var response = _nativeLookupRequest(host, type._value);
if (response is OSError) {
throw response;
diff --git a/tests/language_2/vm/regress_36977_test.dart b/tests/language_2/vm/regress_36977_test.dart
index 0ee27a7..0beca90 100755
--- a/tests/language_2/vm/regress_36977_test.dart
+++ b/tests/language_2/vm/regress_36977_test.dart
@@ -140,7 +140,7 @@
var5[-5],
(-(((var1 ? false : true) ? var5[-87] : par2)))
} ??
- {FileSystemEvent.MODIFY, 31, var2})))) +
+ {FileSystemEvent.modify, 31, var2})))) +
var2),
(((++par2)).isEven
? foo1(
@@ -237,7 +237,7 @@
-13,
par2,
-83,
- ZLibOption.DEFAULT_MEM_LEVEL,
+ ZLibOption.defaultMemLevel,
(var2++)
})))))
});
diff --git a/tests/standalone/io/unix_socket_test.dart b/tests/standalone/io/unix_socket_test.dart
index 2a096b9..d63011a 100644
--- a/tests/standalone/io/unix_socket_test.dart
+++ b/tests/standalone/io/unix_socket_test.dart
@@ -641,7 +641,7 @@
}
Future<RawServerSocket> createTestServer() async {
- final server = await RawServerSocket.bind(InternetAddress.LOOPBACK_IP_V4, 0);
+ final server = await RawServerSocket.bind(InternetAddress.loopbackIPv4, 0);
return server
..listen((client) {
String receivedData = "";
@@ -649,16 +649,16 @@
client.writeEventsEnabled = false;
client.listen((event) {
switch (event) {
- case RawSocketEvent.READ:
+ case RawSocketEvent.read:
assert(client.available() > 0);
final buffer = client.read(200)!;
receivedData += String.fromCharCodes(buffer);
break;
- case RawSocketEvent.READ_CLOSED:
+ case RawSocketEvent.readClosed:
client.close();
server.close();
break;
- case RawSocketEvent.CLOSED:
+ case RawSocketEvent.closed:
Expect.equals(
"Hello, client 1!\nHello, client 2!\nHello, server!\n",
receivedData);
diff --git a/tests/standalone_2/io/unix_socket_test.dart b/tests/standalone_2/io/unix_socket_test.dart
index ecc6b3d..228552a 100644
--- a/tests/standalone_2/io/unix_socket_test.dart
+++ b/tests/standalone_2/io/unix_socket_test.dart
@@ -637,7 +637,7 @@
}
Future<RawServerSocket> createTestServer() async {
- final server = await RawServerSocket.bind(InternetAddress.LOOPBACK_IP_V4, 0);
+ final server = await RawServerSocket.bind(InternetAddress.loopbackIPv4, 0);
return server
..listen((client) {
String receivedData = "";
@@ -645,16 +645,16 @@
client.writeEventsEnabled = false;
client.listen((event) {
switch (event) {
- case RawSocketEvent.READ:
+ case RawSocketEvent.read:
assert(client.available() > 0);
final buffer = client.read(200);
receivedData += String.fromCharCodes(buffer);
break;
- case RawSocketEvent.READ_CLOSED:
+ case RawSocketEvent.readClosed:
client.close();
server.close();
break;
- case RawSocketEvent.CLOSED:
+ case RawSocketEvent.closed:
Expect.equals(
"Hello, client 1!\nHello, client 2!\nHello, server!\n",
receivedData);
diff --git a/tools/VERSION b/tools/VERSION
index 424d0dd..cafe4e0 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -27,5 +27,5 @@
MAJOR 2
MINOR 17
PATCH 0
-PRERELEASE 193
+PRERELEASE 194
PRERELEASE_PATCH 0
\ No newline at end of file
diff --git a/tools/dart2js/sourceMapViewer/bin/source_map_viewer.dart b/tools/dart2js/sourceMapViewer/bin/source_map_viewer.dart
index 51b958c..b7b26b3 100644
--- a/tools/dart2js/sourceMapViewer/bin/source_map_viewer.dart
+++ b/tools/dart2js/sourceMapViewer/bin/source_map_viewer.dart
@@ -81,7 +81,7 @@
// Use port 0 to get an ephemeral port.
int port = 0;
- HttpServer.bind(InternetAddress.LOOPBACK_IP_V4, port).then((server) {
+ HttpServer.bind(InternetAddress.loopbackIPv4, port).then((server) {
port = server.port;
print("Source mapping server is running on "
"'http://${server.address.address}:$port/'");
