Skip to content

Commit bedcf47

Browse files
authored
Merge branch 'master' into vec-with-capacity
2 parents 2559f54 + 14109f3 commit bedcf47

File tree

5 files changed

+41
-27
lines changed

5 files changed

+41
-27
lines changed

.github/workflows/lock.yml

Lines changed: 0 additions & 20 deletions
This file was deleted.

frb_rust/src/dart_api/bin/dart_io_api.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@ Dart_NativeFunction LookupIONative(Dart_Handle name,
5959
int argument_count,
6060
bool* auto_setup_scope);
6161

62+
// Performs a lookup of the I/O function with a specified 'name' and
63+
// 'argument_count'. Returns nullptr if matching function is not found.
64+
void* LookupIOFfiNative(const char* name, uintptr_t argument_count);
65+
6266
// Returns the symbol for I/O native function 'nf'. Returns NULL if 'nf' is not
6367
// a valid I/O native function.
6468
const uint8_t* LookupIONativeSymbol(Dart_NativeFunction nf);

frb_rust/src/dart_api/dart_api.h

Lines changed: 34 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1803,7 +1803,7 @@ DART_EXPORT void Dart_SetCurrentThreadOwnsIsolate(void);
18031803
* The port can be the isolate's main port, or any other port owned by the
18041804
* isolate.
18051805
*
1806-
* \param port_id The port to be checked.
1806+
* \param port The port to be checked.
18071807
*/
18081808
DART_EXPORT bool Dart_GetCurrentThreadOwnsIsolate(Dart_Port port);
18091809

@@ -1892,6 +1892,17 @@ DART_EXPORT Dart_Handle Dart_TypeDynamic(void);
18921892
DART_EXPORT Dart_Handle Dart_TypeVoid(void);
18931893
DART_EXPORT Dart_Handle Dart_TypeNever(void);
18941894

1895+
/**
1896+
* Returns simple core types.
1897+
*
1898+
* \return A handle to type.
1899+
*/
1900+
DART_EXPORT Dart_Handle Dart_TypeString();
1901+
DART_EXPORT Dart_Handle Dart_TypeDouble();
1902+
DART_EXPORT Dart_Handle Dart_TypeInt();
1903+
DART_EXPORT Dart_Handle Dart_TypeBoolean();
1904+
DART_EXPORT Dart_Handle Dart_TypeObject();
1905+
18951906
/**
18961907
* Checks if the two objects are equal.
18971908
*
@@ -2592,6 +2603,26 @@ DART_EXPORT Dart_Handle Dart_MapContainsKey(Dart_Handle map, Dart_Handle key);
25922603
*/
25932604
DART_EXPORT Dart_Handle Dart_MapKeys(Dart_Handle map);
25942605

2606+
/**
2607+
* Returns a Map filled by key value pairs from the provided lists.
2608+
*
2609+
* \param keys_type Handle to a type of keys. E.g., from
2610+
* Dart_Get<XXX>Type.
2611+
* \param keys_handle Handle to a list with keys. E.g., from
2612+
* Dart_NewList<XXX>.
2613+
* \param values_type Handle to a type of values. E.g., from
2614+
* Dart_Get<XXX>Type.
2615+
* \param values_handle Handle to a list with values. E.g., from
2616+
* Dart_NewList<XXX>.
2617+
*
2618+
* \return The Map object if no error occurs. Otherwise returns
2619+
* an error handle.
2620+
*/
2621+
DART_EXPORT Dart_Handle Dart_NewMap(Dart_Handle keys_type,
2622+
Dart_Handle keys_handle,
2623+
Dart_Handle values_type,
2624+
Dart_Handle values_handle);
2625+
25952626
/*
25962627
* ==========
25972628
* Typed Data
@@ -3363,7 +3394,7 @@ typedef void* (*Dart_NativeAssetsDlopenCallbackNoPath)(char** error);
33633394
*
33643395
* If provided, takes prescedence over `Dart_NativeAssetsDlopenCallback`.
33653396
*
3366-
* \param path The asset id requested in the `@Native` external function.
3397+
* \param asset_id The asset id requested in the `@Native` external function.
33673398
*
33683399
* \param error Returns NULL if successful, an error message otherwise. The
33693400
* caller is responsible for calling free() on the error message.
@@ -3381,7 +3412,7 @@ typedef void* (*Dart_NativeAssetsDlopenAssetId)(const char* asset_id,
33813412
* \return A malloced string containing all asset ids. The caller must free this
33823413
* string.
33833414
*/
3384-
typedef char* (*Dart_NativeAssetsAvailableAssets)();
3415+
typedef char* (*Dart_NativeAssetsAvailableAssets)(void);
33853416

33863417
/**
33873418
* Callback provided by the embedder that is used by the VM to lookup symbols

frb_rust/src/dart_api/dart_tools_api.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -535,14 +535,14 @@ Dart_IsolateGroupHeapNewExternalMetric(Dart_IsolateGroup group); // Byte
535535
*/
536536

537537
/*
538-
* Gets the current isolate's currently set UserTag instance.
538+
* Gets the current Dart thread's currently set UserTag instance.
539539
*
540540
* \return The currently set UserTag instance.
541541
*/
542542
DART_EXPORT Dart_Handle Dart_GetCurrentUserTag();
543543

544544
/*
545-
* Gets the current isolate's default UserTag instance.
545+
* Gets the current Dart thread's default UserTag instance.
546546
*
547547
* \return The default UserTag with label 'Default'
548548
*/
@@ -558,7 +558,7 @@ DART_EXPORT Dart_Handle Dart_GetDefaultUserTag();
558558
DART_EXPORT Dart_Handle Dart_NewUserTag(const char* label);
559559

560560
/*
561-
* Updates the current isolate's UserTag to a new value.
561+
* Updates the current Dart thread's UserTag to a new value.
562562
*
563563
* \param user_tag The UserTag to be set as the current UserTag.
564564
*

website/v1_mdbook/book.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[book]
22
authors = ["authors of flutter_rust_bridge, see GitHub README.md for detailed contributions"]
33
language = "en"
4-
multilingual = false
54
src = "src"
65
title = "flutter_rust_bridge"
76

0 commit comments

Comments
 (0)