Merge branch 'feat/12218' into feat/12204

fzyzcjy · Jun 12, 2024 · 627ef0a · 627ef0a
2 parents 9988668 + 792ec40
commit 627ef0a
Show file tree

Hide file tree

Showing 36 changed files with 54 additions and 54 deletions.
diff --git a/frb_example/pure_dart/test/api/external_type_in_crate_test.dart b/frb_example/pure_dart/test/api/external_type_in_crate_test.dart
@@ -19,11 +19,11 @@ Future<void> main({bool skipRustLibInit = false}) async {
 
   test('dart call useImportedEnum()', () async {
     expect(
-      await useImportedEnumTwinNormal(myEnum: MyEnum.False),
+      await useImportedEnumTwinNormal(myEnum: MyEnum.false_),
       false,
     );
     expect(
-      await useImportedEnumTwinNormal(myEnum: MyEnum.True),
+      await useImportedEnumTwinNormal(myEnum: MyEnum.true_),
       true,
     );
   });

diff --git a/frb_example/pure_dart/test/api/mirror_test.dart b/frb_example/pure_dart/test/api/mirror_test.dart
@@ -47,8 +47,8 @@ Future<void> main({bool skipRustLibInit = false}) async {
     final ret = await mirrorStructStreamTwinNormal().first;
     _testAppSettings(ret.a);
     expect(ret.b.content, true);
-    expect(ret.c[0], MyEnum.True);
-    expect(ret.c[1], MyEnum.False);
+    expect(ret.c[0], MyEnum.true_);
+    expect(ret.c[1], MyEnum.false_);
     _testAppSettings(ret.d[0]);
     _testAppSettings(ret.d[1]);
   });

diff --git a/...ple/pure_dart/test/api/pseudo_manual/external_type_in_crate_twin_rust_async_sse_test.dart b/...ple/pure_dart/test/api/pseudo_manual/external_type_in_crate_twin_rust_async_sse_test.dart
@@ -25,11 +25,11 @@ Future<void> main({bool skipRustLibInit = false}) async {
 
   test('dart call useImportedEnum()', () async {
     expect(
-      await useImportedEnumTwinRustAsyncSse(myEnum: MyEnum.False),
+      await useImportedEnumTwinRustAsyncSse(myEnum: MyEnum.false_),
       false,
     );
     expect(
-      await useImportedEnumTwinRustAsyncSse(myEnum: MyEnum.True),
+      await useImportedEnumTwinRustAsyncSse(myEnum: MyEnum.true_),
       true,
     );
   });

diff --git a/...example/pure_dart/test/api/pseudo_manual/external_type_in_crate_twin_rust_async_test.dart b/...example/pure_dart/test/api/pseudo_manual/external_type_in_crate_twin_rust_async_test.dart
@@ -23,11 +23,11 @@ Future<void> main({bool skipRustLibInit = false}) async {
 
   test('dart call useImportedEnum()', () async {
     expect(
-      await useImportedEnumTwinRustAsync(myEnum: MyEnum.False),
+      await useImportedEnumTwinRustAsync(myEnum: MyEnum.false_),
       false,
     );
     expect(
-      await useImportedEnumTwinRustAsync(myEnum: MyEnum.True),
+      await useImportedEnumTwinRustAsync(myEnum: MyEnum.true_),
       true,
     );
   });

diff --git a/frb_example/pure_dart/test/api/pseudo_manual/external_type_in_crate_twin_sse_test.dart b/frb_example/pure_dart/test/api/pseudo_manual/external_type_in_crate_twin_sse_test.dart
@@ -23,11 +23,11 @@ Future<void> main({bool skipRustLibInit = false}) async {
 
   test('dart call useImportedEnum()', () async {
     expect(
-      await useImportedEnumTwinSse(myEnum: MyEnum.False),
+      await useImportedEnumTwinSse(myEnum: MyEnum.false_),
       false,
     );
     expect(
-      await useImportedEnumTwinSse(myEnum: MyEnum.True),
+      await useImportedEnumTwinSse(myEnum: MyEnum.true_),
       true,
     );
   });

diff --git a/frb_example/pure_dart/test/api/pseudo_manual/external_type_in_crate_twin_sync_sse_test.dart b/frb_example/pure_dart/test/api/pseudo_manual/external_type_in_crate_twin_sync_sse_test.dart
@@ -23,11 +23,11 @@ Future<void> main({bool skipRustLibInit = false}) async {
 
   test('dart call useImportedEnum()', () async {
     expect(
-      await useImportedEnumTwinSyncSse(myEnum: MyEnum.False),
+      await useImportedEnumTwinSyncSse(myEnum: MyEnum.false_),
       false,
     );
     expect(
-      await useImportedEnumTwinSyncSse(myEnum: MyEnum.True),
+      await useImportedEnumTwinSyncSse(myEnum: MyEnum.true_),
       true,
     );
   });

diff --git a/frb_example/pure_dart/test/api/pseudo_manual/external_type_in_crate_twin_sync_test.dart b/frb_example/pure_dart/test/api/pseudo_manual/external_type_in_crate_twin_sync_test.dart
@@ -23,11 +23,11 @@ Future<void> main({bool skipRustLibInit = false}) async {
 
   test('dart call useImportedEnum()', () async {
     expect(
-      await useImportedEnumTwinSync(myEnum: MyEnum.False),
+      await useImportedEnumTwinSync(myEnum: MyEnum.false_),
       false,
     );
     expect(
-      await useImportedEnumTwinSync(myEnum: MyEnum.True),
+      await useImportedEnumTwinSync(myEnum: MyEnum.true_),
       true,
     );
   });

diff --git a/frb_example/pure_dart/test/api/pseudo_manual/mirror_twin_rust_async_sse_test.dart b/frb_example/pure_dart/test/api/pseudo_manual/mirror_twin_rust_async_sse_test.dart
@@ -51,8 +51,8 @@ Future<void> main({bool skipRustLibInit = false}) async {
     final ret = await mirrorStructStreamTwinRustAsyncSse().first;
     _testAppSettings(ret.a);
     expect(ret.b.content, true);
-    expect(ret.c[0], MyEnum.True);
-    expect(ret.c[1], MyEnum.False);
+    expect(ret.c[0], MyEnum.true_);
+    expect(ret.c[1], MyEnum.false_);
     _testAppSettings(ret.d[0]);
     _testAppSettings(ret.d[1]);
   });

diff --git a/frb_example/pure_dart/test/api/pseudo_manual/mirror_twin_rust_async_test.dart b/frb_example/pure_dart/test/api/pseudo_manual/mirror_twin_rust_async_test.dart
@@ -51,8 +51,8 @@ Future<void> main({bool skipRustLibInit = false}) async {
     final ret = await mirrorStructStreamTwinRustAsync().first;
     _testAppSettings(ret.a);
     expect(ret.b.content, true);
-    expect(ret.c[0], MyEnum.True);
-    expect(ret.c[1], MyEnum.False);
+    expect(ret.c[0], MyEnum.true_);
+    expect(ret.c[1], MyEnum.false_);
     _testAppSettings(ret.d[0]);
     _testAppSettings(ret.d[1]);
   });

diff --git a/frb_example/pure_dart/test/api/pseudo_manual/mirror_twin_sse_test.dart b/frb_example/pure_dart/test/api/pseudo_manual/mirror_twin_sse_test.dart
@@ -51,8 +51,8 @@ Future<void> main({bool skipRustLibInit = false}) async {
     final ret = await mirrorStructStreamTwinSse().first;
     _testAppSettings(ret.a);
     expect(ret.b.content, true);
-    expect(ret.c[0], MyEnum.True);
-    expect(ret.c[1], MyEnum.False);
+    expect(ret.c[0], MyEnum.true_);
+    expect(ret.c[1], MyEnum.false_);
     _testAppSettings(ret.d[0]);
     _testAppSettings(ret.d[1]);
   });

diff --git a/frb_example/pure_dart/test/api/pseudo_manual/mirror_twin_sync_sse_test.dart b/frb_example/pure_dart/test/api/pseudo_manual/mirror_twin_sync_sse_test.dart
@@ -51,8 +51,8 @@ Future<void> main({bool skipRustLibInit = false}) async {
     final ret = await mirrorStructStreamTwinSyncSse().first;
     _testAppSettings(ret.a);
     expect(ret.b.content, true);
-    expect(ret.c[0], MyEnum.True);
-    expect(ret.c[1], MyEnum.False);
+    expect(ret.c[0], MyEnum.true_);
+    expect(ret.c[1], MyEnum.false_);
     _testAppSettings(ret.d[0]);
     _testAppSettings(ret.d[1]);
   });

diff --git a/frb_example/pure_dart/test/api/pseudo_manual/mirror_twin_sync_test.dart b/frb_example/pure_dart/test/api/pseudo_manual/mirror_twin_sync_test.dart
@@ -51,8 +51,8 @@ Future<void> main({bool skipRustLibInit = false}) async {
     final ret = await mirrorStructStreamTwinSync().first;
     _testAppSettings(ret.a);
     expect(ret.b.content, true);
-    expect(ret.c[0], MyEnum.True);
-    expect(ret.c[1], MyEnum.False);
+    expect(ret.c[0], MyEnum.true_);
+    expect(ret.c[1], MyEnum.false_);
     _testAppSettings(ret.d[0]);
     _testAppSettings(ret.d[1]);
   });

diff --git a/frb_example/pure_dart/test/api/pseudo_manual/raw_string_twin_rust_async_sse_test.dart b/frb_example/pure_dart/test/api/pseudo_manual/raw_string_twin_rust_async_sse_test.dart
@@ -25,7 +25,7 @@ Future<void> main({bool skipRustLibInit = false}) async {
     expect(output, isA<MoreThanJustOneRawStringStructTwinRustAsyncSse>());
     expect(output.regular, "regular");
     expect(output.type, "type");
-    expect(output.async, true);
+    expect(output.async_, true);
     expect(output.another, "another");
   });
 }
diff --git a/frb_example/pure_dart/test/api/pseudo_manual/raw_string_twin_rust_async_test.dart b/frb_example/pure_dart/test/api/pseudo_manual/raw_string_twin_rust_async_test.dart
@@ -25,7 +25,7 @@ Future<void> main({bool skipRustLibInit = false}) async {
     expect(output, isA<MoreThanJustOneRawStringStructTwinRustAsync>());
     expect(output.regular, "regular");
     expect(output.type, "type");
-    expect(output.async, true);
+    expect(output.async_, true);
     expect(output.another, "another");
   });
 }
diff --git a/frb_example/pure_dart/test/api/pseudo_manual/raw_string_twin_sse_test.dart b/frb_example/pure_dart/test/api/pseudo_manual/raw_string_twin_sse_test.dart
@@ -25,7 +25,7 @@ Future<void> main({bool skipRustLibInit = false}) async {
     expect(output, isA<MoreThanJustOneRawStringStructTwinSse>());
     expect(output.regular, "regular");
     expect(output.type, "type");
-    expect(output.async, true);
+    expect(output.async_, true);
     expect(output.another, "another");
   });
 }
diff --git a/frb_example/pure_dart/test/api/pseudo_manual/raw_string_twin_sync_sse_test.dart b/frb_example/pure_dart/test/api/pseudo_manual/raw_string_twin_sync_sse_test.dart
@@ -25,7 +25,7 @@ Future<void> main({bool skipRustLibInit = false}) async {
     expect(output, isA<MoreThanJustOneRawStringStructTwinSyncSse>());
     expect(output.regular, "regular");
     expect(output.type, "type");
-    expect(output.async, true);
+    expect(output.async_, true);
     expect(output.another, "another");
   });
 }
diff --git a/frb_example/pure_dart/test/api/pseudo_manual/raw_string_twin_sync_test.dart b/frb_example/pure_dart/test/api/pseudo_manual/raw_string_twin_sync_test.dart
@@ -25,7 +25,7 @@ Future<void> main({bool skipRustLibInit = false}) async {
     expect(output, isA<MoreThanJustOneRawStringStructTwinSync>());
     expect(output.regular, "regular");
     expect(output.type, "type");
-    expect(output.async, true);
+    expect(output.async_, true);
     expect(output.another, "another");
   });
 }
diff --git a/frb_example/pure_dart/test/api/pseudo_manual/type_alias_twin_rust_async_sse_test.dart b/frb_example/pure_dart/test/api/pseudo_manual/type_alias_twin_rust_async_sse_test.dart
@@ -26,7 +26,7 @@ Future<void> main({bool skipRustLibInit = false}) async {
         await handleTypeAliasModelTwinRustAsyncSse(input: BigInt.from(42));
     expect(testModel.id.toInt(), 42);
     expect(testModel.name, "TestModel");
-    expect(testModel.aliasEnum, MyEnum.False);
+    expect(testModel.aliasEnum, MyEnum.false_);
     expect(testModel.aliasStruct.content, true);
   });
 }
diff --git a/frb_example/pure_dart/test/api/pseudo_manual/type_alias_twin_rust_async_test.dart b/frb_example/pure_dart/test/api/pseudo_manual/type_alias_twin_rust_async_test.dart
@@ -25,7 +25,7 @@ Future<void> main({bool skipRustLibInit = false}) async {
         await handleTypeAliasModelTwinRustAsync(input: BigInt.from(42));
     expect(testModel.id.toInt(), 42);
     expect(testModel.name, "TestModel");
-    expect(testModel.aliasEnum, MyEnum.False);
+    expect(testModel.aliasEnum, MyEnum.false_);
     expect(testModel.aliasStruct.content, true);
   });
 }
diff --git a/frb_example/pure_dart/test/api/pseudo_manual/type_alias_twin_sse_test.dart b/frb_example/pure_dart/test/api/pseudo_manual/type_alias_twin_sse_test.dart
@@ -24,7 +24,7 @@ Future<void> main({bool skipRustLibInit = false}) async {
     final testModel = await handleTypeAliasModelTwinSse(input: BigInt.from(42));
     expect(testModel.id.toInt(), 42);
     expect(testModel.name, "TestModel");
-    expect(testModel.aliasEnum, MyEnum.False);
+    expect(testModel.aliasEnum, MyEnum.false_);
     expect(testModel.aliasStruct.content, true);
   });
 }
diff --git a/frb_example/pure_dart/test/api/pseudo_manual/type_alias_twin_sync_sse_test.dart b/frb_example/pure_dart/test/api/pseudo_manual/type_alias_twin_sync_sse_test.dart
@@ -25,7 +25,7 @@ Future<void> main({bool skipRustLibInit = false}) async {
         await handleTypeAliasModelTwinSyncSse(input: BigInt.from(42));
     expect(testModel.id.toInt(), 42);
     expect(testModel.name, "TestModel");
-    expect(testModel.aliasEnum, MyEnum.False);
+    expect(testModel.aliasEnum, MyEnum.false_);
     expect(testModel.aliasStruct.content, true);
   });
 }
diff --git a/frb_example/pure_dart/test/api/pseudo_manual/type_alias_twin_sync_test.dart b/frb_example/pure_dart/test/api/pseudo_manual/type_alias_twin_sync_test.dart
@@ -25,7 +25,7 @@ Future<void> main({bool skipRustLibInit = false}) async {
         await handleTypeAliasModelTwinSync(input: BigInt.from(42));
     expect(testModel.id.toInt(), 42);
     expect(testModel.name, "TestModel");
-    expect(testModel.aliasEnum, MyEnum.False);
+    expect(testModel.aliasEnum, MyEnum.false_);
     expect(testModel.aliasStruct.content, true);
   });
 }
diff --git a/frb_example/pure_dart/test/api/raw_string_test.dart b/frb_example/pure_dart/test/api/raw_string_test.dart
@@ -21,7 +21,7 @@ Future<void> main({bool skipRustLibInit = false}) async {
     expect(output, isA<MoreThanJustOneRawStringStructTwinNormal>());
     expect(output.regular, "regular");
     expect(output.type, "type");
-    expect(output.async, true);
+    expect(output.async_, true);
     expect(output.another, "another");
   });
 }
diff --git a/frb_example/pure_dart/test/api/type_alias_test.dart b/frb_example/pure_dart/test/api/type_alias_test.dart
@@ -21,7 +21,7 @@ Future<void> main({bool skipRustLibInit = false}) async {
         await handleTypeAliasModelTwinNormal(input: BigInt.from(42));
     expect(testModel.id.toInt(), 42);
     expect(testModel.name, "TestModel");
-    expect(testModel.aliasEnum, MyEnum.False);
+    expect(testModel.aliasEnum, MyEnum.false_);
     expect(testModel.aliasStruct.content, true);
   });
 }
diff --git a/frb_example/pure_dart_pde/test/api/external_type_in_crate_test.dart b/frb_example/pure_dart_pde/test/api/external_type_in_crate_test.dart
@@ -21,11 +21,11 @@ Future<void> main({bool skipRustLibInit = false}) async {
 
   test('dart call useImportedEnum()', () async {
     expect(
-      await useImportedEnumTwinNormal(myEnum: MyEnum.False),
+      await useImportedEnumTwinNormal(myEnum: MyEnum.false_),
       false,
     );
     expect(
-      await useImportedEnumTwinNormal(myEnum: MyEnum.True),
+      await useImportedEnumTwinNormal(myEnum: MyEnum.true_),
       true,
     );
   });

diff --git a/frb_example/pure_dart_pde/test/api/mirror_test.dart b/frb_example/pure_dart_pde/test/api/mirror_test.dart
@@ -49,8 +49,8 @@ Future<void> main({bool skipRustLibInit = false}) async {
     final ret = await mirrorStructStreamTwinNormal().first;
     _testAppSettings(ret.a);
     expect(ret.b.content, true);
-    expect(ret.c[0], MyEnum.True);
-    expect(ret.c[1], MyEnum.False);
+    expect(ret.c[0], MyEnum.true_);
+    expect(ret.c[1], MyEnum.false_);
     _testAppSettings(ret.d[0]);
     _testAppSettings(ret.d[1]);
   });

diff --git a/...ple/pure_dart_pde/test/api/pseudo_manual/external_type_in_crate_twin_rust_async_test.dart b/...ple/pure_dart_pde/test/api/pseudo_manual/external_type_in_crate_twin_rust_async_test.dart
@@ -25,11 +25,11 @@ Future<void> main({bool skipRustLibInit = false}) async {
 
   test('dart call useImportedEnum()', () async {
     expect(
-      await useImportedEnumTwinRustAsync(myEnum: MyEnum.False),
+      await useImportedEnumTwinRustAsync(myEnum: MyEnum.false_),
       false,
     );
     expect(
-      await useImportedEnumTwinRustAsync(myEnum: MyEnum.True),
+      await useImportedEnumTwinRustAsync(myEnum: MyEnum.true_),
       true,
     );
   });

diff --git a/frb_example/pure_dart_pde/test/api/pseudo_manual/external_type_in_crate_twin_sync_test.dart b/frb_example/pure_dart_pde/test/api/pseudo_manual/external_type_in_crate_twin_sync_test.dart
@@ -25,11 +25,11 @@ Future<void> main({bool skipRustLibInit = false}) async {
 
   test('dart call useImportedEnum()', () async {
     expect(
-      await useImportedEnumTwinSync(myEnum: MyEnum.False),
+      await useImportedEnumTwinSync(myEnum: MyEnum.false_),
       false,
     );
     expect(
-      await useImportedEnumTwinSync(myEnum: MyEnum.True),
+      await useImportedEnumTwinSync(myEnum: MyEnum.true_),
       true,
     );
   });

diff --git a/frb_example/pure_dart_pde/test/api/pseudo_manual/mirror_twin_rust_async_test.dart b/frb_example/pure_dart_pde/test/api/pseudo_manual/mirror_twin_rust_async_test.dart
@@ -53,8 +53,8 @@ Future<void> main({bool skipRustLibInit = false}) async {
     final ret = await mirrorStructStreamTwinRustAsync().first;
     _testAppSettings(ret.a);
     expect(ret.b.content, true);
-    expect(ret.c[0], MyEnum.True);
-    expect(ret.c[1], MyEnum.False);
+    expect(ret.c[0], MyEnum.true_);
+    expect(ret.c[1], MyEnum.false_);
     _testAppSettings(ret.d[0]);
     _testAppSettings(ret.d[1]);
   });

diff --git a/frb_example/pure_dart_pde/test/api/pseudo_manual/mirror_twin_sync_test.dart b/frb_example/pure_dart_pde/test/api/pseudo_manual/mirror_twin_sync_test.dart
@@ -53,8 +53,8 @@ Future<void> main({bool skipRustLibInit = false}) async {
     final ret = await mirrorStructStreamTwinSync().first;
     _testAppSettings(ret.a);
     expect(ret.b.content, true);
-    expect(ret.c[0], MyEnum.True);
-    expect(ret.c[1], MyEnum.False);
+    expect(ret.c[0], MyEnum.true_);
+    expect(ret.c[1], MyEnum.false_);
     _testAppSettings(ret.d[0]);
     _testAppSettings(ret.d[1]);
   });

diff --git a/frb_example/pure_dart_pde/test/api/pseudo_manual/raw_string_twin_rust_async_test.dart b/frb_example/pure_dart_pde/test/api/pseudo_manual/raw_string_twin_rust_async_test.dart
@@ -27,7 +27,7 @@ Future<void> main({bool skipRustLibInit = false}) async {
     expect(output, isA<MoreThanJustOneRawStringStructTwinRustAsync>());
     expect(output.regular, "regular");
     expect(output.type, "type");
-    expect(output.async, true);
+    expect(output.async_, true);
     expect(output.another, "another");
   });
 }
diff --git a/frb_example/pure_dart_pde/test/api/pseudo_manual/raw_string_twin_sync_test.dart b/frb_example/pure_dart_pde/test/api/pseudo_manual/raw_string_twin_sync_test.dart
@@ -27,7 +27,7 @@ Future<void> main({bool skipRustLibInit = false}) async {
     expect(output, isA<MoreThanJustOneRawStringStructTwinSync>());
     expect(output.regular, "regular");
     expect(output.type, "type");
-    expect(output.async, true);
+    expect(output.async_, true);
     expect(output.another, "another");
   });
 }
diff --git a/frb_example/pure_dart_pde/test/api/pseudo_manual/type_alias_twin_rust_async_test.dart b/frb_example/pure_dart_pde/test/api/pseudo_manual/type_alias_twin_rust_async_test.dart
@@ -27,7 +27,7 @@ Future<void> main({bool skipRustLibInit = false}) async {
         await handleTypeAliasModelTwinRustAsync(input: BigInt.from(42));
     expect(testModel.id.toInt(), 42);
     expect(testModel.name, "TestModel");
-    expect(testModel.aliasEnum, MyEnum.False);
+    expect(testModel.aliasEnum, MyEnum.false_);
     expect(testModel.aliasStruct.content, true);
   });
 }
diff --git a/frb_example/pure_dart_pde/test/api/pseudo_manual/type_alias_twin_sync_test.dart b/frb_example/pure_dart_pde/test/api/pseudo_manual/type_alias_twin_sync_test.dart
@@ -27,7 +27,7 @@ Future<void> main({bool skipRustLibInit = false}) async {
         await handleTypeAliasModelTwinSync(input: BigInt.from(42));
     expect(testModel.id.toInt(), 42);
     expect(testModel.name, "TestModel");
-    expect(testModel.aliasEnum, MyEnum.False);
+    expect(testModel.aliasEnum, MyEnum.false_);
     expect(testModel.aliasStruct.content, true);
   });
 }
diff --git a/frb_example/pure_dart_pde/test/api/raw_string_test.dart b/frb_example/pure_dart_pde/test/api/raw_string_test.dart
@@ -23,7 +23,7 @@ Future<void> main({bool skipRustLibInit = false}) async {
     expect(output, isA<MoreThanJustOneRawStringStructTwinNormal>());
     expect(output.regular, "regular");
     expect(output.type, "type");
-    expect(output.async, true);
+    expect(output.async_, true);
     expect(output.another, "another");
   });
 }
diff --git a/frb_example/pure_dart_pde/test/api/type_alias_test.dart b/frb_example/pure_dart_pde/test/api/type_alias_test.dart
@@ -23,7 +23,7 @@ Future<void> main({bool skipRustLibInit = false}) async {
         await handleTypeAliasModelTwinNormal(input: BigInt.from(42));
     expect(testModel.id.toInt(), 42);
     expect(testModel.name, "TestModel");
-    expect(testModel.aliasEnum, MyEnum.False);
+    expect(testModel.aliasEnum, MyEnum.false_);
     expect(testModel.aliasStruct.content, true);
   });
 }