From bb7a1bce134bea813c3b0363496f86905eb32e10 Mon Sep 17 00:00:00 2001 From: Robert Bastian <4706271+robertbastian@users.noreply.github.com> Date: Mon, 20 Nov 2023 10:38:11 +0100 Subject: [PATCH 01/10] final --- Cargo.lock | 22 +++++++--- Cargo.toml | 8 ++-- .../package/lib/src/Bcp47ToIanaMapper.g.dart | 2 +- ffi/capi/dart/package/lib/src/Bidi.g.dart | 2 +- ffi/capi/dart/package/lib/src/BidiInfo.g.dart | 2 +- .../dart/package/lib/src/BidiParagraph.g.dart | 2 +- ffi/capi/dart/package/lib/src/Calendar.g.dart | 2 +- .../lib/src/CanonicalCombiningClassMap.g.dart | 2 +- .../lib/src/CanonicalComposition.g.dart | 2 +- .../lib/src/CanonicalDecomposition.g.dart | 2 +- .../dart/package/lib/src/CaseMapCloser.g.dart | 2 +- .../dart/package/lib/src/CaseMapper.g.dart | 2 +- .../package/lib/src/CodePointMapData16.g.dart | 2 +- .../package/lib/src/CodePointMapData8.g.dart | 2 +- .../lib/src/CodePointRangeIterator.g.dart | 2 +- .../src/CodePointRangeIteratorResult.g.dart | 4 +- .../lib/src/CodePointSetBuilder.g.dart | 2 +- .../package/lib/src/CodePointSetData.g.dart | 2 +- ffi/capi/dart/package/lib/src/Collator.g.dart | 2 +- .../package/lib/src/CollatorOptionsV1.g.dart | 4 +- .../lib/src/ComposingNormalizer.g.dart | 2 +- .../package/lib/src/CustomTimeZone.g.dart | 2 +- .../dart/package/lib/src/DataProvider.g.dart | 2 +- ffi/capi/dart/package/lib/src/Date.g.dart | 2 +- .../dart/package/lib/src/DateFormatter.g.dart | 2 +- ffi/capi/dart/package/lib/src/DateTime.g.dart | 2 +- .../package/lib/src/DateTimeFormatter.g.dart | 2 +- .../dart/package/lib/src/Decomposed.g.dart | 4 +- .../lib/src/DecomposingNormalizer.g.dart | 2 +- .../lib/src/DisplayNamesOptionsV1.g.dart | 4 +- .../dart/package/lib/src/FixedDecimal.g.dart | 2 +- .../lib/src/FixedDecimalFormatter.g.dart | 2 +- .../GeneralCategoryNameToMaskMapper.g.dart | 2 +- .../GraphemeClusterBreakIteratorLatin1.g.dart | 2 +- .../GraphemeClusterBreakIteratorUtf16.g.dart | 2 +- .../GraphemeClusterBreakIteratorUtf8.g.dart | 2 +- .../lib/src/GraphemeClusterSegmenter.g.dart | 2 +- .../lib/src/GregorianDateFormatter.g.dart | 2 +- .../lib/src/GregorianDateTimeFormatter.g.dart | 2 +- .../GregorianZonedDateTimeFormatter.g.dart | 2 +- .../package/lib/src/IanaToBcp47Mapper.g.dart | 2 +- ffi/capi/dart/package/lib/src/IsoDate.g.dart | 2 +- .../dart/package/lib/src/IsoDateTime.g.dart | 2 +- .../package/lib/src/IsoTimeZoneOptions.g.dart | 4 +- .../lib/src/LineBreakIteratorLatin1.g.dart | 2 +- .../lib/src/LineBreakIteratorUtf16.g.dart | 2 +- .../lib/src/LineBreakIteratorUtf8.g.dart | 2 +- .../package/lib/src/LineBreakOptionsV1.g.dart | 4 +- .../dart/package/lib/src/LineSegmenter.g.dart | 2 +- ffi/capi/dart/package/lib/src/List.g.dart | 2 +- .../dart/package/lib/src/ListFormatter.g.dart | 2 +- ffi/capi/dart/package/lib/src/Locale.g.dart | 2 +- .../lib/src/LocaleCanonicalizer.g.dart | 2 +- .../lib/src/LocaleDirectionality.g.dart | 2 +- .../src/LocaleDisplayNamesFormatter.g.dart | 2 +- .../package/lib/src/LocaleExpander.g.dart | 2 +- .../lib/src/LocaleFallbackConfig.g.dart | 4 +- .../lib/src/LocaleFallbackIterator.g.dart | 2 +- .../package/lib/src/LocaleFallbacker.g.dart | 2 +- .../lib/src/LocaleFallbackerWithConfig.g.dart | 2 +- .../package/lib/src/MetazoneCalculator.g.dart | 2 +- .../package/lib/src/PluralCategories.g.dart | 4 +- .../package/lib/src/PluralOperands.g.dart | 2 +- .../dart/package/lib/src/PluralRules.g.dart | 2 +- .../src/PropertyValueNameToEnumMapper.g.dart | 2 +- .../package/lib/src/RegionDisplayNames.g.dart | 2 +- .../package/lib/src/ReorderedIndexMap.g.dart | 2 +- .../lib/src/ScriptExtensionsSet.g.dart | 2 +- .../lib/src/ScriptWithExtensions.g.dart | 2 +- .../src/ScriptWithExtensionsBorrowed.g.dart | 2 +- .../src/SentenceBreakIteratorLatin1.g.dart | 2 +- .../lib/src/SentenceBreakIteratorUtf16.g.dart | 2 +- .../lib/src/SentenceBreakIteratorUtf8.g.dart | 2 +- .../package/lib/src/SentenceSegmenter.g.dart | 2 +- ffi/capi/dart/package/lib/src/Time.g.dart | 2 +- .../dart/package/lib/src/TimeFormatter.g.dart | 2 +- .../package/lib/src/TimeZoneFormatter.g.dart | 2 +- .../package/lib/src/TitlecaseMapper.g.dart | 2 +- .../package/lib/src/TitlecaseOptionsV1.g.dart | 4 +- .../package/lib/src/UnicodeSetData.g.dart | 2 +- .../package/lib/src/WeekCalculator.g.dart | 2 +- ffi/capi/dart/package/lib/src/WeekOf.g.dart | 4 +- .../lib/src/WordBreakIteratorLatin1.g.dart | 2 +- .../lib/src/WordBreakIteratorUtf16.g.dart | 2 +- .../lib/src/WordBreakIteratorUtf8.g.dart | 2 +- .../dart/package/lib/src/WordSegmenter.g.dart | 2 +- .../lib/src/ZonedDateTimeFormatter.g.dart | 2 +- ffi/capi/dart/package/lib/src/lib.g.dart | 40 +++++++++---------- ffi/capi/dart/package/pubspec.yaml | 2 +- 89 files changed, 137 insertions(+), 125 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e52da04273f..8387f295d51 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -798,7 +798,7 @@ name = "diplomat" version = "0.7.0" source = "git+https://github.com/rust-diplomat/diplomat.git?rev=564323d77cc7344b323459473d4a5b295f9830cc#564323d77cc7344b323459473d4a5b295f9830cc" dependencies = [ - "diplomat_core", + "diplomat_core 0.7.0 (git+https://github.com/rust-diplomat/diplomat.git?rev=564323d77cc7344b323459473d4a5b295f9830cc)", "proc-macro2", "quote", "syn 2.0.37", @@ -822,12 +822,11 @@ dependencies = [ [[package]] name = "diplomat-tool" version = "0.7.0" -source = "git+https://github.com/rust-diplomat/diplomat.git?rev=564323d77cc7344b323459473d4a5b295f9830cc#564323d77cc7344b323459473d4a5b295f9830cc" dependencies = [ "askama", "clap 3.2.25", "colored", - "diplomat_core", + "diplomat_core 0.7.0", "displaydoc", "heck 0.4.1", "indenter", @@ -842,7 +841,6 @@ dependencies = [ [[package]] name = "diplomat_core" version = "0.7.0" -source = "git+https://github.com/rust-diplomat/diplomat.git?rev=564323d77cc7344b323459473d4a5b295f9830cc#564323d77cc7344b323459473d4a5b295f9830cc" dependencies = [ "displaydoc", "lazy_static", @@ -854,6 +852,20 @@ dependencies = [ "syn 2.0.37", ] +[[package]] +name = "diplomat_core" +version = "0.7.0" +source = "git+https://github.com/rust-diplomat/diplomat.git?rev=564323d77cc7344b323459473d4a5b295f9830cc#564323d77cc7344b323459473d4a5b295f9830cc" +dependencies = [ + "lazy_static", + "proc-macro2", + "quote", + "serde", + "smallvec", + "strck_ident", + "syn 2.0.37", +] + [[package]] name = "discard" version = "1.0.4" @@ -1690,7 +1702,7 @@ version = "1.4.0" name = "icu_ffi_coverage" version = "0.0.0" dependencies = [ - "diplomat_core", + "diplomat_core 0.7.0 (git+https://github.com/rust-diplomat/diplomat.git?rev=564323d77cc7344b323459473d4a5b295f9830cc)", "elsa", "lazy_static", "rustdoc-types", diff --git a/Cargo.toml b/Cargo.toml index 1ccfda29604..4d9c0a0d45d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -230,10 +230,10 @@ icu_benchmark_macros = { path = "tools/benchmark/macros" } # The version here can either be a `version = ".."` spec or `git = "https://github.com/rust-diplomat/diplomat", rev = ".."` # Diplomat must be published preceding a new ICU4X release but may use git versions in between -diplomat = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "564323d77cc7344b323459473d4a5b295f9830cc" } -diplomat-runtime = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "564323d77cc7344b323459473d4a5b295f9830cc" } -diplomat_core = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "564323d77cc7344b323459473d4a5b295f9830cc" } -diplomat-tool = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "564323d77cc7344b323459473d4a5b295f9830cc" } +diplomat = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "7eee7e90381904fb96d4f188ae689b3ad6a103fd" } +diplomat-runtime = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "7eee7e90381904fb96d4f188ae689b3ad6a103fd" } +diplomat_core = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "7eee7e90381904fb96d4f188ae689b3ad6a103fd" } +diplomat-tool = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "7eee7e90381904fb96d4f188ae689b3ad6a103fd" } # Size optimized builds [profile.release-opt-size] diff --git a/ffi/capi/dart/package/lib/src/Bcp47ToIanaMapper.g.dart b/ffi/capi/dart/package/lib/src/Bcp47ToIanaMapper.g.dart index 7391013d4d4..ad98a2d4451 100644 --- a/ffi/capi/dart/package/lib/src/Bcp47ToIanaMapper.g.dart +++ b/ffi/capi/dart/package/lib/src/Bcp47ToIanaMapper.g.dart @@ -8,7 +8,7 @@ part of 'lib.g.dart'; /// An object capable of mapping from a BCP-47 time zone ID to an IANA ID. /// /// See the [Rust documentation for `IanaBcp47RoundTripMapper`](https://docs.rs/icu/latest/icu/timezone/struct.IanaBcp47RoundTripMapper.html) for more information. -class Bcp47ToIanaMapper implements ffi.Finalizable { +final class Bcp47ToIanaMapper implements ffi.Finalizable { final ffi.Pointer _underlying; Bcp47ToIanaMapper._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/Bidi.g.dart b/ffi/capi/dart/package/lib/src/Bidi.g.dart index 455b40b6704..bbc2e91c2a8 100644 --- a/ffi/capi/dart/package/lib/src/Bidi.g.dart +++ b/ffi/capi/dart/package/lib/src/Bidi.g.dart @@ -8,7 +8,7 @@ part of 'lib.g.dart'; /// An ICU4X Bidi object, containing loaded bidi data /// /// See the [Rust documentation for `BidiClassAdapter`](https://docs.rs/icu/latest/icu/properties/bidi/struct.BidiClassAdapter.html) for more information. -class Bidi implements ffi.Finalizable { +final class Bidi implements ffi.Finalizable { final ffi.Pointer _underlying; Bidi._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/BidiInfo.g.dart b/ffi/capi/dart/package/lib/src/BidiInfo.g.dart index e8021441d79..f4e445633b1 100644 --- a/ffi/capi/dart/package/lib/src/BidiInfo.g.dart +++ b/ffi/capi/dart/package/lib/src/BidiInfo.g.dart @@ -8,7 +8,7 @@ part of 'lib.g.dart'; /// An object containing bidi information for a given string, produced by `for_text()` on `Bidi` /// /// See the [Rust documentation for `BidiInfo`](https://docs.rs/unicode_bidi/latest/unicode_bidi/struct.BidiInfo.html) for more information. -class BidiInfo implements ffi.Finalizable { +final class BidiInfo implements ffi.Finalizable { final ffi.Pointer _underlying; BidiInfo._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/BidiParagraph.g.dart b/ffi/capi/dart/package/lib/src/BidiParagraph.g.dart index 4625ac8dfb3..f40eb35c895 100644 --- a/ffi/capi/dart/package/lib/src/BidiParagraph.g.dart +++ b/ffi/capi/dart/package/lib/src/BidiParagraph.g.dart @@ -6,7 +6,7 @@ part of 'lib.g.dart'; /// Bidi information for a single processed paragraph -class BidiParagraph implements ffi.Finalizable { +final class BidiParagraph implements ffi.Finalizable { final ffi.Pointer _underlying; BidiParagraph._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/Calendar.g.dart b/ffi/capi/dart/package/lib/src/Calendar.g.dart index 4d495ef2273..3061ac12b5d 100644 --- a/ffi/capi/dart/package/lib/src/Calendar.g.dart +++ b/ffi/capi/dart/package/lib/src/Calendar.g.dart @@ -6,7 +6,7 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `AnyCalendar`](https://docs.rs/icu/latest/icu/calendar/enum.AnyCalendar.html) for more information. -class Calendar implements ffi.Finalizable { +final class Calendar implements ffi.Finalizable { final ffi.Pointer _underlying; Calendar._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/CanonicalCombiningClassMap.g.dart b/ffi/capi/dart/package/lib/src/CanonicalCombiningClassMap.g.dart index 63fa575a4d9..e7eb7978934 100644 --- a/ffi/capi/dart/package/lib/src/CanonicalCombiningClassMap.g.dart +++ b/ffi/capi/dart/package/lib/src/CanonicalCombiningClassMap.g.dart @@ -8,7 +8,7 @@ part of 'lib.g.dart'; /// Lookup of the Canonical_Combining_Class Unicode property /// /// See the [Rust documentation for `CanonicalCombiningClassMap`](https://docs.rs/icu/latest/icu/normalizer/properties/struct.CanonicalCombiningClassMap.html) for more information. -class CanonicalCombiningClassMap implements ffi.Finalizable { +final class CanonicalCombiningClassMap implements ffi.Finalizable { final ffi.Pointer _underlying; CanonicalCombiningClassMap._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/CanonicalComposition.g.dart b/ffi/capi/dart/package/lib/src/CanonicalComposition.g.dart index d68806c1ed4..eca14d431a1 100644 --- a/ffi/capi/dart/package/lib/src/CanonicalComposition.g.dart +++ b/ffi/capi/dart/package/lib/src/CanonicalComposition.g.dart @@ -10,7 +10,7 @@ part of 'lib.g.dart'; /// Callers should generally use ICU4XComposingNormalizer unless they specifically need raw composition operations /// /// See the [Rust documentation for `CanonicalComposition`](https://docs.rs/icu/latest/icu/normalizer/properties/struct.CanonicalComposition.html) for more information. -class CanonicalComposition implements ffi.Finalizable { +final class CanonicalComposition implements ffi.Finalizable { final ffi.Pointer _underlying; CanonicalComposition._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/CanonicalDecomposition.g.dart b/ffi/capi/dart/package/lib/src/CanonicalDecomposition.g.dart index c6d199c5f8b..e3ba6707119 100644 --- a/ffi/capi/dart/package/lib/src/CanonicalDecomposition.g.dart +++ b/ffi/capi/dart/package/lib/src/CanonicalDecomposition.g.dart @@ -10,7 +10,7 @@ part of 'lib.g.dart'; /// Callers should generally use ICU4XDecomposingNormalizer unless they specifically need raw composition operations /// /// See the [Rust documentation for `CanonicalDecomposition`](https://docs.rs/icu/latest/icu/normalizer/properties/struct.CanonicalDecomposition.html) for more information. -class CanonicalDecomposition implements ffi.Finalizable { +final class CanonicalDecomposition implements ffi.Finalizable { final ffi.Pointer _underlying; CanonicalDecomposition._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/CaseMapCloser.g.dart b/ffi/capi/dart/package/lib/src/CaseMapCloser.g.dart index 5fc67808e47..d6a73b92a94 100644 --- a/ffi/capi/dart/package/lib/src/CaseMapCloser.g.dart +++ b/ffi/capi/dart/package/lib/src/CaseMapCloser.g.dart @@ -6,7 +6,7 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `CaseMapCloser`](https://docs.rs/icu/latest/icu/casemap/struct.CaseMapCloser.html) for more information. -class CaseMapCloser implements ffi.Finalizable { +final class CaseMapCloser implements ffi.Finalizable { final ffi.Pointer _underlying; CaseMapCloser._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/CaseMapper.g.dart b/ffi/capi/dart/package/lib/src/CaseMapper.g.dart index 1eb16b90a63..78ede2aec5a 100644 --- a/ffi/capi/dart/package/lib/src/CaseMapper.g.dart +++ b/ffi/capi/dart/package/lib/src/CaseMapper.g.dart @@ -6,7 +6,7 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `CaseMapper`](https://docs.rs/icu/latest/icu/casemap/struct.CaseMapper.html) for more information. -class CaseMapper implements ffi.Finalizable { +final class CaseMapper implements ffi.Finalizable { final ffi.Pointer _underlying; CaseMapper._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/CodePointMapData16.g.dart b/ffi/capi/dart/package/lib/src/CodePointMapData16.g.dart index 419f01ca224..7dcfae79d0b 100644 --- a/ffi/capi/dart/package/lib/src/CodePointMapData16.g.dart +++ b/ffi/capi/dart/package/lib/src/CodePointMapData16.g.dart @@ -14,7 +14,7 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `CodePointMapData`](https://docs.rs/icu/latest/icu/properties/maps/struct.CodePointMapData.html) for more information. /// /// See the [Rust documentation for `CodePointMapDataBorrowed`](https://docs.rs/icu/latest/icu/properties/maps/struct.CodePointMapDataBorrowed.html) for more information. -class CodePointMapData16 implements ffi.Finalizable { +final class CodePointMapData16 implements ffi.Finalizable { final ffi.Pointer _underlying; CodePointMapData16._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/CodePointMapData8.g.dart b/ffi/capi/dart/package/lib/src/CodePointMapData8.g.dart index 27a11a14ebe..d2ef86a94c6 100644 --- a/ffi/capi/dart/package/lib/src/CodePointMapData8.g.dart +++ b/ffi/capi/dart/package/lib/src/CodePointMapData8.g.dart @@ -14,7 +14,7 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `CodePointMapData`](https://docs.rs/icu/latest/icu/properties/maps/struct.CodePointMapData.html) for more information. /// /// See the [Rust documentation for `CodePointMapDataBorrowed`](https://docs.rs/icu/latest/icu/properties/maps/struct.CodePointMapDataBorrowed.html) for more information. -class CodePointMapData8 implements ffi.Finalizable { +final class CodePointMapData8 implements ffi.Finalizable { final ffi.Pointer _underlying; CodePointMapData8._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/CodePointRangeIterator.g.dart b/ffi/capi/dart/package/lib/src/CodePointRangeIterator.g.dart index b0d080cbc31..e64e1711f0c 100644 --- a/ffi/capi/dart/package/lib/src/CodePointRangeIterator.g.dart +++ b/ffi/capi/dart/package/lib/src/CodePointRangeIterator.g.dart @@ -7,7 +7,7 @@ part of 'lib.g.dart'; /// An iterator over code point ranges, produced by `CodePointSetData` or /// one of the `CodePointMapData` types -class CodePointRangeIterator implements ffi.Finalizable { +final class CodePointRangeIterator implements ffi.Finalizable { final ffi.Pointer _underlying; CodePointRangeIterator._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/CodePointRangeIteratorResult.g.dart b/ffi/capi/dart/package/lib/src/CodePointRangeIteratorResult.g.dart index 58d703c1fe7..34dd91c4dc0 100644 --- a/ffi/capi/dart/package/lib/src/CodePointRangeIteratorResult.g.dart +++ b/ffi/capi/dart/package/lib/src/CodePointRangeIteratorResult.g.dart @@ -12,7 +12,7 @@ part of 'lib.g.dart'; /// and `done` will be true if the iterator has already finished. The last contentful /// iteration will NOT produce a range done=true, in other words `start` and `end` are useful /// values if and only if `done=false`. -class _CodePointRangeIteratorResultFfi extends ffi.Struct { +final class _CodePointRangeIteratorResultFfi extends ffi.Struct { @ffi.Uint32() external int start; @ffi.Uint32() @@ -21,7 +21,7 @@ class _CodePointRangeIteratorResultFfi extends ffi.Struct { external bool done; } -class CodePointRangeIteratorResult { +final class CodePointRangeIteratorResult { final _CodePointRangeIteratorResultFfi _underlying; // ignore: unused_element diff --git a/ffi/capi/dart/package/lib/src/CodePointSetBuilder.g.dart b/ffi/capi/dart/package/lib/src/CodePointSetBuilder.g.dart index 4a99a52a762..98595877556 100644 --- a/ffi/capi/dart/package/lib/src/CodePointSetBuilder.g.dart +++ b/ffi/capi/dart/package/lib/src/CodePointSetBuilder.g.dart @@ -6,7 +6,7 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `CodePointInversionListBuilder`](https://docs.rs/icu/latest/icu/collections/codepointinvlist/struct.CodePointInversionListBuilder.html) for more information. -class CodePointSetBuilder implements ffi.Finalizable { +final class CodePointSetBuilder implements ffi.Finalizable { final ffi.Pointer _underlying; CodePointSetBuilder._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/CodePointSetData.g.dart b/ffi/capi/dart/package/lib/src/CodePointSetData.g.dart index dbd450e9e1d..504f50c0bfe 100644 --- a/ffi/capi/dart/package/lib/src/CodePointSetData.g.dart +++ b/ffi/capi/dart/package/lib/src/CodePointSetData.g.dart @@ -12,7 +12,7 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `CodePointSetData`](https://docs.rs/icu/latest/icu/properties/sets/struct.CodePointSetData.html) for more information. /// /// See the [Rust documentation for `CodePointSetDataBorrowed`](https://docs.rs/icu/latest/icu/properties/sets/struct.CodePointSetDataBorrowed.html) for more information. -class CodePointSetData implements ffi.Finalizable { +final class CodePointSetData implements ffi.Finalizable { final ffi.Pointer _underlying; CodePointSetData._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/Collator.g.dart b/ffi/capi/dart/package/lib/src/Collator.g.dart index 4be970e4ecb..e9b939399c4 100644 --- a/ffi/capi/dart/package/lib/src/Collator.g.dart +++ b/ffi/capi/dart/package/lib/src/Collator.g.dart @@ -6,7 +6,7 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `Collator`](https://docs.rs/icu/latest/icu/collator/struct.Collator.html) for more information. -class Collator implements ffi.Finalizable { +final class Collator implements ffi.Finalizable { final ffi.Pointer _underlying; Collator._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/CollatorOptionsV1.g.dart b/ffi/capi/dart/package/lib/src/CollatorOptionsV1.g.dart index 181e0e05269..b4b8869e5d3 100644 --- a/ffi/capi/dart/package/lib/src/CollatorOptionsV1.g.dart +++ b/ffi/capi/dart/package/lib/src/CollatorOptionsV1.g.dart @@ -6,7 +6,7 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `CollatorOptions`](https://docs.rs/icu/latest/icu/collator/struct.CollatorOptions.html) for more information. -class _CollatorOptionsV1Ffi extends ffi.Struct { +final class _CollatorOptionsV1Ffi extends ffi.Struct { @ffi.Int32() external int strength; @ffi.Int32() @@ -23,7 +23,7 @@ class _CollatorOptionsV1Ffi extends ffi.Struct { external int backwardSecondLevel; } -class CollatorOptionsV1 { +final class CollatorOptionsV1 { final _CollatorOptionsV1Ffi _underlying; // ignore: unused_element diff --git a/ffi/capi/dart/package/lib/src/ComposingNormalizer.g.dart b/ffi/capi/dart/package/lib/src/ComposingNormalizer.g.dart index f3d8ee1dbbc..2f154a3a075 100644 --- a/ffi/capi/dart/package/lib/src/ComposingNormalizer.g.dart +++ b/ffi/capi/dart/package/lib/src/ComposingNormalizer.g.dart @@ -6,7 +6,7 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `ComposingNormalizer`](https://docs.rs/icu/latest/icu/normalizer/struct.ComposingNormalizer.html) for more information. -class ComposingNormalizer implements ffi.Finalizable { +final class ComposingNormalizer implements ffi.Finalizable { final ffi.Pointer _underlying; ComposingNormalizer._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/CustomTimeZone.g.dart b/ffi/capi/dart/package/lib/src/CustomTimeZone.g.dart index 29259e01a2e..9823864a3e5 100644 --- a/ffi/capi/dart/package/lib/src/CustomTimeZone.g.dart +++ b/ffi/capi/dart/package/lib/src/CustomTimeZone.g.dart @@ -6,7 +6,7 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `CustomTimeZone`](https://docs.rs/icu/latest/icu/timezone/struct.CustomTimeZone.html) for more information. -class CustomTimeZone implements ffi.Finalizable { +final class CustomTimeZone implements ffi.Finalizable { final ffi.Pointer _underlying; CustomTimeZone._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/DataProvider.g.dart b/ffi/capi/dart/package/lib/src/DataProvider.g.dart index c109135bf83..fa10e37bfd0 100644 --- a/ffi/capi/dart/package/lib/src/DataProvider.g.dart +++ b/ffi/capi/dart/package/lib/src/DataProvider.g.dart @@ -8,7 +8,7 @@ part of 'lib.g.dart'; /// An ICU4X data provider, capable of loading ICU4X data keys from some source. /// /// See the [Rust documentation for `icu_provider`](https://docs.rs/icu_provider/latest/icu_provider/index.html) for more information. -class DataProvider implements ffi.Finalizable { +final class DataProvider implements ffi.Finalizable { final ffi.Pointer _underlying; DataProvider._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/Date.g.dart b/ffi/capi/dart/package/lib/src/Date.g.dart index 947dce49de0..b600c09160f 100644 --- a/ffi/capi/dart/package/lib/src/Date.g.dart +++ b/ffi/capi/dart/package/lib/src/Date.g.dart @@ -8,7 +8,7 @@ part of 'lib.g.dart'; /// An ICU4X Date object capable of containing a date and time for any calendar. /// /// See the [Rust documentation for `Date`](https://docs.rs/icu/latest/icu/calendar/struct.Date.html) for more information. -class Date implements ffi.Finalizable { +final class Date implements ffi.Finalizable { final ffi.Pointer _underlying; Date._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/DateFormatter.g.dart b/ffi/capi/dart/package/lib/src/DateFormatter.g.dart index af26f8eae17..06365fac124 100644 --- a/ffi/capi/dart/package/lib/src/DateFormatter.g.dart +++ b/ffi/capi/dart/package/lib/src/DateFormatter.g.dart @@ -9,7 +9,7 @@ part of 'lib.g.dart'; /// using some calendar specified at runtime in the locale. /// /// See the [Rust documentation for `DateFormatter`](https://docs.rs/icu/latest/icu/datetime/struct.DateFormatter.html) for more information. -class DateFormatter implements ffi.Finalizable { +final class DateFormatter implements ffi.Finalizable { final ffi.Pointer _underlying; DateFormatter._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/DateTime.g.dart b/ffi/capi/dart/package/lib/src/DateTime.g.dart index 8767738527d..c990998a652 100644 --- a/ffi/capi/dart/package/lib/src/DateTime.g.dart +++ b/ffi/capi/dart/package/lib/src/DateTime.g.dart @@ -8,7 +8,7 @@ part of 'lib.g.dart'; /// An ICU4X DateTime object capable of containing a date and time for any calendar. /// /// See the [Rust documentation for `DateTime`](https://docs.rs/icu/latest/icu/calendar/struct.DateTime.html) for more information. -class DateTime implements ffi.Finalizable { +final class DateTime implements ffi.Finalizable { final ffi.Pointer _underlying; DateTime._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/DateTimeFormatter.g.dart b/ffi/capi/dart/package/lib/src/DateTimeFormatter.g.dart index 1be8f13f7a2..1c8e0466b5f 100644 --- a/ffi/capi/dart/package/lib/src/DateTimeFormatter.g.dart +++ b/ffi/capi/dart/package/lib/src/DateTimeFormatter.g.dart @@ -9,7 +9,7 @@ part of 'lib.g.dart'; /// using some calendar specified at runtime in the locale. /// /// See the [Rust documentation for `DateTimeFormatter`](https://docs.rs/icu/latest/icu/datetime/struct.DateTimeFormatter.html) for more information. -class DateTimeFormatter implements ffi.Finalizable { +final class DateTimeFormatter implements ffi.Finalizable { final ffi.Pointer _underlying; DateTimeFormatter._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/Decomposed.g.dart b/ffi/capi/dart/package/lib/src/Decomposed.g.dart index 43b5e67495d..632fb74724e 100644 --- a/ffi/capi/dart/package/lib/src/Decomposed.g.dart +++ b/ffi/capi/dart/package/lib/src/Decomposed.g.dart @@ -10,14 +10,14 @@ part of 'lib.g.dart'; /// (which may or may not be the original one) /// /// See the [Rust documentation for `Decomposed`](https://docs.rs/icu/latest/icu/normalizer/properties/enum.Decomposed.html) for more information. -class _DecomposedFfi extends ffi.Struct { +final class _DecomposedFfi extends ffi.Struct { @ffi.Uint32() external int first; @ffi.Uint32() external int second; } -class Decomposed { +final class Decomposed { final _DecomposedFfi _underlying; // ignore: unused_element diff --git a/ffi/capi/dart/package/lib/src/DecomposingNormalizer.g.dart b/ffi/capi/dart/package/lib/src/DecomposingNormalizer.g.dart index 82e8f111eab..312ed3ddb1f 100644 --- a/ffi/capi/dart/package/lib/src/DecomposingNormalizer.g.dart +++ b/ffi/capi/dart/package/lib/src/DecomposingNormalizer.g.dart @@ -6,7 +6,7 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `DecomposingNormalizer`](https://docs.rs/icu/latest/icu/normalizer/struct.DecomposingNormalizer.html) for more information. -class DecomposingNormalizer implements ffi.Finalizable { +final class DecomposingNormalizer implements ffi.Finalizable { final ffi.Pointer _underlying; DecomposingNormalizer._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/DisplayNamesOptionsV1.g.dart b/ffi/capi/dart/package/lib/src/DisplayNamesOptionsV1.g.dart index 8f113d64e76..f9219835a47 100644 --- a/ffi/capi/dart/package/lib/src/DisplayNamesOptionsV1.g.dart +++ b/ffi/capi/dart/package/lib/src/DisplayNamesOptionsV1.g.dart @@ -6,7 +6,7 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `DisplayNamesOptions`](https://docs.rs/icu/latest/icu/displaynames/options/struct.DisplayNamesOptions.html) for more information. -class _DisplayNamesOptionsV1Ffi extends ffi.Struct { +final class _DisplayNamesOptionsV1Ffi extends ffi.Struct { @ffi.Int32() external int style; @ffi.Int32() @@ -15,7 +15,7 @@ class _DisplayNamesOptionsV1Ffi extends ffi.Struct { external int languageDisplay; } -class DisplayNamesOptionsV1 { +final class DisplayNamesOptionsV1 { final _DisplayNamesOptionsV1Ffi _underlying; // ignore: unused_element diff --git a/ffi/capi/dart/package/lib/src/FixedDecimal.g.dart b/ffi/capi/dart/package/lib/src/FixedDecimal.g.dart index 22405eea52e..e134afca3f5 100644 --- a/ffi/capi/dart/package/lib/src/FixedDecimal.g.dart +++ b/ffi/capi/dart/package/lib/src/FixedDecimal.g.dart @@ -6,7 +6,7 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `FixedDecimal`](https://docs.rs/fixed_decimal/latest/fixed_decimal/struct.FixedDecimal.html) for more information. -class FixedDecimal implements ffi.Finalizable { +final class FixedDecimal implements ffi.Finalizable { final ffi.Pointer _underlying; FixedDecimal._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/FixedDecimalFormatter.g.dart b/ffi/capi/dart/package/lib/src/FixedDecimalFormatter.g.dart index ed47a5e4924..64532d33c2f 100644 --- a/ffi/capi/dart/package/lib/src/FixedDecimalFormatter.g.dart +++ b/ffi/capi/dart/package/lib/src/FixedDecimalFormatter.g.dart @@ -8,7 +8,7 @@ part of 'lib.g.dart'; /// An ICU4X Fixed Decimal Format object, capable of formatting a [`FixedDecimal`] as a string. /// /// See the [Rust documentation for `FixedDecimalFormatter`](https://docs.rs/icu/latest/icu/decimal/struct.FixedDecimalFormatter.html) for more information. -class FixedDecimalFormatter implements ffi.Finalizable { +final class FixedDecimalFormatter implements ffi.Finalizable { final ffi.Pointer _underlying; FixedDecimalFormatter._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/GeneralCategoryNameToMaskMapper.g.dart b/ffi/capi/dart/package/lib/src/GeneralCategoryNameToMaskMapper.g.dart index 39921c36d20..5df98e8b7f4 100644 --- a/ffi/capi/dart/package/lib/src/GeneralCategoryNameToMaskMapper.g.dart +++ b/ffi/capi/dart/package/lib/src/GeneralCategoryNameToMaskMapper.g.dart @@ -10,7 +10,7 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `get_name_to_enum_mapper`](https://docs.rs/icu/latest/icu/properties/struct.GeneralCategoryGroup.html#method.get_name_to_enum_mapper) for more information. /// /// See the [Rust documentation for `PropertyValueNameToEnumMapper`](https://docs.rs/icu/latest/icu/properties/names/struct.PropertyValueNameToEnumMapper.html) for more information. -class GeneralCategoryNameToMaskMapper implements ffi.Finalizable { +final class GeneralCategoryNameToMaskMapper implements ffi.Finalizable { final ffi.Pointer _underlying; GeneralCategoryNameToMaskMapper._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/GraphemeClusterBreakIteratorLatin1.g.dart b/ffi/capi/dart/package/lib/src/GraphemeClusterBreakIteratorLatin1.g.dart index cf4911eb520..6d6bcd346c6 100644 --- a/ffi/capi/dart/package/lib/src/GraphemeClusterBreakIteratorLatin1.g.dart +++ b/ffi/capi/dart/package/lib/src/GraphemeClusterBreakIteratorLatin1.g.dart @@ -6,7 +6,7 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `GraphemeClusterBreakIterator`](https://docs.rs/icu/latest/icu/segmenter/struct.GraphemeClusterBreakIterator.html) for more information. -class GraphemeClusterBreakIteratorLatin1 implements ffi.Finalizable { +final class GraphemeClusterBreakIteratorLatin1 implements ffi.Finalizable { final ffi.Pointer _underlying; GraphemeClusterBreakIteratorLatin1._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/GraphemeClusterBreakIteratorUtf16.g.dart b/ffi/capi/dart/package/lib/src/GraphemeClusterBreakIteratorUtf16.g.dart index b2436c2dbbb..86a561c1576 100644 --- a/ffi/capi/dart/package/lib/src/GraphemeClusterBreakIteratorUtf16.g.dart +++ b/ffi/capi/dart/package/lib/src/GraphemeClusterBreakIteratorUtf16.g.dart @@ -6,7 +6,7 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `GraphemeClusterBreakIterator`](https://docs.rs/icu/latest/icu/segmenter/struct.GraphemeClusterBreakIterator.html) for more information. -class GraphemeClusterBreakIteratorUtf16 implements ffi.Finalizable { +final class GraphemeClusterBreakIteratorUtf16 implements ffi.Finalizable { final ffi.Pointer _underlying; GraphemeClusterBreakIteratorUtf16._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/GraphemeClusterBreakIteratorUtf8.g.dart b/ffi/capi/dart/package/lib/src/GraphemeClusterBreakIteratorUtf8.g.dart index cad39f1a68a..a55f6ba2aee 100644 --- a/ffi/capi/dart/package/lib/src/GraphemeClusterBreakIteratorUtf8.g.dart +++ b/ffi/capi/dart/package/lib/src/GraphemeClusterBreakIteratorUtf8.g.dart @@ -6,7 +6,7 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `GraphemeClusterBreakIterator`](https://docs.rs/icu/latest/icu/segmenter/struct.GraphemeClusterBreakIterator.html) for more information. -class GraphemeClusterBreakIteratorUtf8 implements ffi.Finalizable { +final class GraphemeClusterBreakIteratorUtf8 implements ffi.Finalizable { final ffi.Pointer _underlying; GraphemeClusterBreakIteratorUtf8._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/GraphemeClusterSegmenter.g.dart b/ffi/capi/dart/package/lib/src/GraphemeClusterSegmenter.g.dart index 06a2ad3334a..c041b923838 100644 --- a/ffi/capi/dart/package/lib/src/GraphemeClusterSegmenter.g.dart +++ b/ffi/capi/dart/package/lib/src/GraphemeClusterSegmenter.g.dart @@ -9,7 +9,7 @@ part of 'lib.g.dart'; /// in strings. /// /// See the [Rust documentation for `GraphemeClusterSegmenter`](https://docs.rs/icu/latest/icu/segmenter/struct.GraphemeClusterSegmenter.html) for more information. -class GraphemeClusterSegmenter implements ffi.Finalizable { +final class GraphemeClusterSegmenter implements ffi.Finalizable { final ffi.Pointer _underlying; GraphemeClusterSegmenter._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/GregorianDateFormatter.g.dart b/ffi/capi/dart/package/lib/src/GregorianDateFormatter.g.dart index e1aa0ef25bc..a784513841d 100644 --- a/ffi/capi/dart/package/lib/src/GregorianDateFormatter.g.dart +++ b/ffi/capi/dart/package/lib/src/GregorianDateFormatter.g.dart @@ -9,7 +9,7 @@ part of 'lib.g.dart'; /// using the Gregorian Calendar. /// /// See the [Rust documentation for `TypedDateFormatter`](https://docs.rs/icu/latest/icu/datetime/struct.TypedDateFormatter.html) for more information. -class GregorianDateFormatter implements ffi.Finalizable { +final class GregorianDateFormatter implements ffi.Finalizable { final ffi.Pointer _underlying; GregorianDateFormatter._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/GregorianDateTimeFormatter.g.dart b/ffi/capi/dart/package/lib/src/GregorianDateTimeFormatter.g.dart index 3b1aadf75b9..bb0a1c293ac 100644 --- a/ffi/capi/dart/package/lib/src/GregorianDateTimeFormatter.g.dart +++ b/ffi/capi/dart/package/lib/src/GregorianDateTimeFormatter.g.dart @@ -9,7 +9,7 @@ part of 'lib.g.dart'; /// using the Gregorian Calendar. /// /// See the [Rust documentation for `TypedDateTimeFormatter`](https://docs.rs/icu/latest/icu/datetime/struct.TypedDateTimeFormatter.html) for more information. -class GregorianDateTimeFormatter implements ffi.Finalizable { +final class GregorianDateTimeFormatter implements ffi.Finalizable { final ffi.Pointer _underlying; GregorianDateTimeFormatter._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/GregorianZonedDateTimeFormatter.g.dart b/ffi/capi/dart/package/lib/src/GregorianZonedDateTimeFormatter.g.dart index 6e870e95028..c74785f6e0f 100644 --- a/ffi/capi/dart/package/lib/src/GregorianZonedDateTimeFormatter.g.dart +++ b/ffi/capi/dart/package/lib/src/GregorianZonedDateTimeFormatter.g.dart @@ -8,7 +8,7 @@ part of 'lib.g.dart'; /// An object capable of formatting a date time with time zone to a string. /// /// See the [Rust documentation for `TypedZonedDateTimeFormatter`](https://docs.rs/icu/latest/icu/datetime/struct.TypedZonedDateTimeFormatter.html) for more information. -class GregorianZonedDateTimeFormatter implements ffi.Finalizable { +final class GregorianZonedDateTimeFormatter implements ffi.Finalizable { final ffi.Pointer _underlying; GregorianZonedDateTimeFormatter._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/IanaToBcp47Mapper.g.dart b/ffi/capi/dart/package/lib/src/IanaToBcp47Mapper.g.dart index 8b0acb6cd17..b11becbb53c 100644 --- a/ffi/capi/dart/package/lib/src/IanaToBcp47Mapper.g.dart +++ b/ffi/capi/dart/package/lib/src/IanaToBcp47Mapper.g.dart @@ -12,7 +12,7 @@ part of 'lib.g.dart'; /// [`CustomTimeZone`]: crate::timezone::ffi::ICU4XCustomTimeZone /// /// See the [Rust documentation for `IanaToBcp47Mapper`](https://docs.rs/icu/latest/icu/timezone/struct.IanaToBcp47Mapper.html) for more information. -class IanaToBcp47Mapper implements ffi.Finalizable { +final class IanaToBcp47Mapper implements ffi.Finalizable { final ffi.Pointer _underlying; IanaToBcp47Mapper._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/IsoDate.g.dart b/ffi/capi/dart/package/lib/src/IsoDate.g.dart index 3a823e4e3fe..94efefdf72b 100644 --- a/ffi/capi/dart/package/lib/src/IsoDate.g.dart +++ b/ffi/capi/dart/package/lib/src/IsoDate.g.dart @@ -8,7 +8,7 @@ part of 'lib.g.dart'; /// An ICU4X Date object capable of containing a ISO-8601 date /// /// See the [Rust documentation for `Date`](https://docs.rs/icu/latest/icu/calendar/struct.Date.html) for more information. -class IsoDate implements ffi.Finalizable { +final class IsoDate implements ffi.Finalizable { final ffi.Pointer _underlying; IsoDate._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/IsoDateTime.g.dart b/ffi/capi/dart/package/lib/src/IsoDateTime.g.dart index 2e14980059d..87e1dc6ad5f 100644 --- a/ffi/capi/dart/package/lib/src/IsoDateTime.g.dart +++ b/ffi/capi/dart/package/lib/src/IsoDateTime.g.dart @@ -8,7 +8,7 @@ part of 'lib.g.dart'; /// An ICU4X DateTime object capable of containing a ISO-8601 date and time. /// /// See the [Rust documentation for `DateTime`](https://docs.rs/icu/latest/icu/calendar/struct.DateTime.html) for more information. -class IsoDateTime implements ffi.Finalizable { +final class IsoDateTime implements ffi.Finalizable { final ffi.Pointer _underlying; IsoDateTime._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/IsoTimeZoneOptions.g.dart b/ffi/capi/dart/package/lib/src/IsoTimeZoneOptions.g.dart index 7568a78a3e3..7eccab5d62b 100644 --- a/ffi/capi/dart/package/lib/src/IsoTimeZoneOptions.g.dart +++ b/ffi/capi/dart/package/lib/src/IsoTimeZoneOptions.g.dart @@ -5,7 +5,7 @@ part of 'lib.g.dart'; -class _IsoTimeZoneOptionsFfi extends ffi.Struct { +final class _IsoTimeZoneOptionsFfi extends ffi.Struct { @ffi.Int32() external int format; @ffi.Int32() @@ -14,7 +14,7 @@ class _IsoTimeZoneOptionsFfi extends ffi.Struct { external int seconds; } -class IsoTimeZoneOptions { +final class IsoTimeZoneOptions { final _IsoTimeZoneOptionsFfi _underlying; // ignore: unused_element diff --git a/ffi/capi/dart/package/lib/src/LineBreakIteratorLatin1.g.dart b/ffi/capi/dart/package/lib/src/LineBreakIteratorLatin1.g.dart index a525d9f18e9..a8727563bcd 100644 --- a/ffi/capi/dart/package/lib/src/LineBreakIteratorLatin1.g.dart +++ b/ffi/capi/dart/package/lib/src/LineBreakIteratorLatin1.g.dart @@ -8,7 +8,7 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `LineBreakIterator`](https://docs.rs/icu/latest/icu/segmenter/struct.LineBreakIterator.html) for more information. /// /// Additional information: [1](https://docs.rs/icu/latest/icu/segmenter/type.LineBreakIteratorLatin1.html) -class LineBreakIteratorLatin1 implements ffi.Finalizable { +final class LineBreakIteratorLatin1 implements ffi.Finalizable { final ffi.Pointer _underlying; LineBreakIteratorLatin1._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/LineBreakIteratorUtf16.g.dart b/ffi/capi/dart/package/lib/src/LineBreakIteratorUtf16.g.dart index 7c613fe1724..977f7b992b0 100644 --- a/ffi/capi/dart/package/lib/src/LineBreakIteratorUtf16.g.dart +++ b/ffi/capi/dart/package/lib/src/LineBreakIteratorUtf16.g.dart @@ -8,7 +8,7 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `LineBreakIterator`](https://docs.rs/icu/latest/icu/segmenter/struct.LineBreakIterator.html) for more information. /// /// Additional information: [1](https://docs.rs/icu/latest/icu/segmenter/type.LineBreakIteratorUtf16.html) -class LineBreakIteratorUtf16 implements ffi.Finalizable { +final class LineBreakIteratorUtf16 implements ffi.Finalizable { final ffi.Pointer _underlying; LineBreakIteratorUtf16._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/LineBreakIteratorUtf8.g.dart b/ffi/capi/dart/package/lib/src/LineBreakIteratorUtf8.g.dart index cf933a11d9d..4048fb8716f 100644 --- a/ffi/capi/dart/package/lib/src/LineBreakIteratorUtf8.g.dart +++ b/ffi/capi/dart/package/lib/src/LineBreakIteratorUtf8.g.dart @@ -8,7 +8,7 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `LineBreakIterator`](https://docs.rs/icu/latest/icu/segmenter/struct.LineBreakIterator.html) for more information. /// /// Additional information: [1](https://docs.rs/icu/latest/icu/segmenter/type.LineBreakIteratorPotentiallyIllFormedUtf8.html) -class LineBreakIteratorUtf8 implements ffi.Finalizable { +final class LineBreakIteratorUtf8 implements ffi.Finalizable { final ffi.Pointer _underlying; LineBreakIteratorUtf8._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/LineBreakOptionsV1.g.dart b/ffi/capi/dart/package/lib/src/LineBreakOptionsV1.g.dart index c6326d37152..164c1c6fa22 100644 --- a/ffi/capi/dart/package/lib/src/LineBreakOptionsV1.g.dart +++ b/ffi/capi/dart/package/lib/src/LineBreakOptionsV1.g.dart @@ -6,7 +6,7 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `LineBreakOptions`](https://docs.rs/icu/latest/icu/segmenter/struct.LineBreakOptions.html) for more information. -class _LineBreakOptionsV1Ffi extends ffi.Struct { +final class _LineBreakOptionsV1Ffi extends ffi.Struct { @ffi.Int32() external int strictness; @ffi.Int32() @@ -15,7 +15,7 @@ class _LineBreakOptionsV1Ffi extends ffi.Struct { external bool jaZh; } -class LineBreakOptionsV1 { +final class LineBreakOptionsV1 { final _LineBreakOptionsV1Ffi _underlying; // ignore: unused_element diff --git a/ffi/capi/dart/package/lib/src/LineSegmenter.g.dart b/ffi/capi/dart/package/lib/src/LineSegmenter.g.dart index e1c88a0a768..0d6c51adfd2 100644 --- a/ffi/capi/dart/package/lib/src/LineSegmenter.g.dart +++ b/ffi/capi/dart/package/lib/src/LineSegmenter.g.dart @@ -8,7 +8,7 @@ part of 'lib.g.dart'; /// An ICU4X line-break segmenter, capable of finding breakpoints in strings. /// /// See the [Rust documentation for `LineSegmenter`](https://docs.rs/icu/latest/icu/segmenter/struct.LineSegmenter.html) for more information. -class LineSegmenter implements ffi.Finalizable { +final class LineSegmenter implements ffi.Finalizable { final ffi.Pointer _underlying; LineSegmenter._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/List.g.dart b/ffi/capi/dart/package/lib/src/List.g.dart index dab9165e182..802dab7a157 100644 --- a/ffi/capi/dart/package/lib/src/List.g.dart +++ b/ffi/capi/dart/package/lib/src/List.g.dart @@ -6,7 +6,7 @@ part of 'lib.g.dart'; /// A list of strings -class List implements ffi.Finalizable { +final class List implements ffi.Finalizable { final ffi.Pointer _underlying; List._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/ListFormatter.g.dart b/ffi/capi/dart/package/lib/src/ListFormatter.g.dart index 2929060d3e5..f8273092e51 100644 --- a/ffi/capi/dart/package/lib/src/ListFormatter.g.dart +++ b/ffi/capi/dart/package/lib/src/ListFormatter.g.dart @@ -6,7 +6,7 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `ListFormatter`](https://docs.rs/icu/latest/icu/list/struct.ListFormatter.html) for more information. -class ListFormatter implements ffi.Finalizable { +final class ListFormatter implements ffi.Finalizable { final ffi.Pointer _underlying; ListFormatter._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/Locale.g.dart b/ffi/capi/dart/package/lib/src/Locale.g.dart index bb673549968..563fd6c4491 100644 --- a/ffi/capi/dart/package/lib/src/Locale.g.dart +++ b/ffi/capi/dart/package/lib/src/Locale.g.dart @@ -8,7 +8,7 @@ part of 'lib.g.dart'; /// An ICU4X Locale, capable of representing strings like `"en-US"`. /// /// See the [Rust documentation for `Locale`](https://docs.rs/icu/latest/icu/locid/struct.Locale.html) for more information. -class Locale implements ffi.Finalizable { +final class Locale implements ffi.Finalizable { final ffi.Pointer _underlying; Locale._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/LocaleCanonicalizer.g.dart b/ffi/capi/dart/package/lib/src/LocaleCanonicalizer.g.dart index b7a5cd31fdd..5c7cae7e872 100644 --- a/ffi/capi/dart/package/lib/src/LocaleCanonicalizer.g.dart +++ b/ffi/capi/dart/package/lib/src/LocaleCanonicalizer.g.dart @@ -8,7 +8,7 @@ part of 'lib.g.dart'; /// A locale canonicalizer. /// /// See the [Rust documentation for `LocaleCanonicalizer`](https://docs.rs/icu/latest/icu/locid_transform/struct.LocaleCanonicalizer.html) for more information. -class LocaleCanonicalizer implements ffi.Finalizable { +final class LocaleCanonicalizer implements ffi.Finalizable { final ffi.Pointer _underlying; LocaleCanonicalizer._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/LocaleDirectionality.g.dart b/ffi/capi/dart/package/lib/src/LocaleDirectionality.g.dart index 0d25f43f2a5..d154558b77e 100644 --- a/ffi/capi/dart/package/lib/src/LocaleDirectionality.g.dart +++ b/ffi/capi/dart/package/lib/src/LocaleDirectionality.g.dart @@ -6,7 +6,7 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `LocaleDirectionality`](https://docs.rs/icu/latest/icu/locid_transform/struct.LocaleDirectionality.html) for more information. -class LocaleDirectionality implements ffi.Finalizable { +final class LocaleDirectionality implements ffi.Finalizable { final ffi.Pointer _underlying; LocaleDirectionality._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/LocaleDisplayNamesFormatter.g.dart b/ffi/capi/dart/package/lib/src/LocaleDisplayNamesFormatter.g.dart index 765ba04398d..5b6a89cf95f 100644 --- a/ffi/capi/dart/package/lib/src/LocaleDisplayNamesFormatter.g.dart +++ b/ffi/capi/dart/package/lib/src/LocaleDisplayNamesFormatter.g.dart @@ -6,7 +6,7 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `LocaleDisplayNamesFormatter`](https://docs.rs/icu/latest/icu/displaynames/struct.LocaleDisplayNamesFormatter.html) for more information. -class LocaleDisplayNamesFormatter implements ffi.Finalizable { +final class LocaleDisplayNamesFormatter implements ffi.Finalizable { final ffi.Pointer _underlying; LocaleDisplayNamesFormatter._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/LocaleExpander.g.dart b/ffi/capi/dart/package/lib/src/LocaleExpander.g.dart index 7d365b293be..1aa2fcc2479 100644 --- a/ffi/capi/dart/package/lib/src/LocaleExpander.g.dart +++ b/ffi/capi/dart/package/lib/src/LocaleExpander.g.dart @@ -8,7 +8,7 @@ part of 'lib.g.dart'; /// A locale expander. /// /// See the [Rust documentation for `LocaleExpander`](https://docs.rs/icu/latest/icu/locid_transform/struct.LocaleExpander.html) for more information. -class LocaleExpander implements ffi.Finalizable { +final class LocaleExpander implements ffi.Finalizable { final ffi.Pointer _underlying; LocaleExpander._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/LocaleFallbackConfig.g.dart b/ffi/capi/dart/package/lib/src/LocaleFallbackConfig.g.dart index 3b2d563cd56..36e29898e19 100644 --- a/ffi/capi/dart/package/lib/src/LocaleFallbackConfig.g.dart +++ b/ffi/capi/dart/package/lib/src/LocaleFallbackConfig.g.dart @@ -8,7 +8,7 @@ part of 'lib.g.dart'; /// Collection of configurations for the ICU4X fallback algorithm. /// /// See the [Rust documentation for `LocaleFallbackConfig`](https://docs.rs/icu/latest/icu/locid_transform/fallback/struct.LocaleFallbackConfig.html) for more information. -class _LocaleFallbackConfigFfi extends ffi.Struct { +final class _LocaleFallbackConfigFfi extends ffi.Struct { @ffi.Int32() external int priority; external _SliceFfi2Utf8 extensionKey; @@ -16,7 +16,7 @@ class _LocaleFallbackConfigFfi extends ffi.Struct { external int fallbackSupplement; } -class LocaleFallbackConfig { +final class LocaleFallbackConfig { final _LocaleFallbackConfigFfi _underlying; // ignore: unused_element diff --git a/ffi/capi/dart/package/lib/src/LocaleFallbackIterator.g.dart b/ffi/capi/dart/package/lib/src/LocaleFallbackIterator.g.dart index ba2589ee4ef..9080a6e34e1 100644 --- a/ffi/capi/dart/package/lib/src/LocaleFallbackIterator.g.dart +++ b/ffi/capi/dart/package/lib/src/LocaleFallbackIterator.g.dart @@ -8,7 +8,7 @@ part of 'lib.g.dart'; /// An iterator over the locale under fallback. /// /// See the [Rust documentation for `LocaleFallbackIterator`](https://docs.rs/icu/latest/icu/locid_transform/fallback/struct.LocaleFallbackIterator.html) for more information. -class LocaleFallbackIterator implements ffi.Finalizable { +final class LocaleFallbackIterator implements ffi.Finalizable { final ffi.Pointer _underlying; LocaleFallbackIterator._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/LocaleFallbacker.g.dart b/ffi/capi/dart/package/lib/src/LocaleFallbacker.g.dart index a40d5390324..4a4b58a422e 100644 --- a/ffi/capi/dart/package/lib/src/LocaleFallbacker.g.dart +++ b/ffi/capi/dart/package/lib/src/LocaleFallbacker.g.dart @@ -8,7 +8,7 @@ part of 'lib.g.dart'; /// An object that runs the ICU4X locale fallback algorithm. /// /// See the [Rust documentation for `LocaleFallbacker`](https://docs.rs/icu/latest/icu/locid_transform/fallback/struct.LocaleFallbacker.html) for more information. -class LocaleFallbacker implements ffi.Finalizable { +final class LocaleFallbacker implements ffi.Finalizable { final ffi.Pointer _underlying; LocaleFallbacker._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/LocaleFallbackerWithConfig.g.dart b/ffi/capi/dart/package/lib/src/LocaleFallbackerWithConfig.g.dart index 6de5fab8ab3..294109e58f5 100644 --- a/ffi/capi/dart/package/lib/src/LocaleFallbackerWithConfig.g.dart +++ b/ffi/capi/dart/package/lib/src/LocaleFallbackerWithConfig.g.dart @@ -10,7 +10,7 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `LocaleFallbacker`](https://docs.rs/icu/latest/icu/locid_transform/fallback/struct.LocaleFallbacker.html) for more information. /// /// See the [Rust documentation for `LocaleFallbackerWithConfig`](https://docs.rs/icu/latest/icu/locid_transform/fallback/struct.LocaleFallbackerWithConfig.html) for more information. -class LocaleFallbackerWithConfig implements ffi.Finalizable { +final class LocaleFallbackerWithConfig implements ffi.Finalizable { final ffi.Pointer _underlying; LocaleFallbackerWithConfig._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/MetazoneCalculator.g.dart b/ffi/capi/dart/package/lib/src/MetazoneCalculator.g.dart index f5ceac2b182..29a21a46377 100644 --- a/ffi/capi/dart/package/lib/src/MetazoneCalculator.g.dart +++ b/ffi/capi/dart/package/lib/src/MetazoneCalculator.g.dart @@ -12,7 +12,7 @@ part of 'lib.g.dart'; /// [`CustomTimeZone`]: crate::timezone::ffi::ICU4XCustomTimeZone /// /// See the [Rust documentation for `MetazoneCalculator`](https://docs.rs/icu/latest/icu/timezone/struct.MetazoneCalculator.html) for more information. -class MetazoneCalculator implements ffi.Finalizable { +final class MetazoneCalculator implements ffi.Finalizable { final ffi.Pointer _underlying; MetazoneCalculator._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/PluralCategories.g.dart b/ffi/capi/dart/package/lib/src/PluralCategories.g.dart index 98f12d01b7e..c9e1f1799f8 100644 --- a/ffi/capi/dart/package/lib/src/PluralCategories.g.dart +++ b/ffi/capi/dart/package/lib/src/PluralCategories.g.dart @@ -6,7 +6,7 @@ part of 'lib.g.dart'; /// FFI version of `PluralRules::categories()` data. -class _PluralCategoriesFfi extends ffi.Struct { +final class _PluralCategoriesFfi extends ffi.Struct { @ffi.Bool() external bool zero; @ffi.Bool() @@ -21,7 +21,7 @@ class _PluralCategoriesFfi extends ffi.Struct { external bool other; } -class PluralCategories { +final class PluralCategories { final _PluralCategoriesFfi _underlying; // ignore: unused_element diff --git a/ffi/capi/dart/package/lib/src/PluralOperands.g.dart b/ffi/capi/dart/package/lib/src/PluralOperands.g.dart index ff0dbad54fa..ed3ade3b975 100644 --- a/ffi/capi/dart/package/lib/src/PluralOperands.g.dart +++ b/ffi/capi/dart/package/lib/src/PluralOperands.g.dart @@ -8,7 +8,7 @@ part of 'lib.g.dart'; /// FFI version of `PluralOperands`. /// /// See the [Rust documentation for `PluralOperands`](https://docs.rs/icu/latest/icu/plurals/struct.PluralOperands.html) for more information. -class PluralOperands implements ffi.Finalizable { +final class PluralOperands implements ffi.Finalizable { final ffi.Pointer _underlying; PluralOperands._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/PluralRules.g.dart b/ffi/capi/dart/package/lib/src/PluralRules.g.dart index f4932a607a5..4d626a5f6b2 100644 --- a/ffi/capi/dart/package/lib/src/PluralRules.g.dart +++ b/ffi/capi/dart/package/lib/src/PluralRules.g.dart @@ -8,7 +8,7 @@ part of 'lib.g.dart'; /// FFI version of `PluralRules`. /// /// See the [Rust documentation for `PluralRules`](https://docs.rs/icu/latest/icu/plurals/struct.PluralRules.html) for more information. -class PluralRules implements ffi.Finalizable { +final class PluralRules implements ffi.Finalizable { final ffi.Pointer _underlying; PluralRules._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/PropertyValueNameToEnumMapper.g.dart b/ffi/capi/dart/package/lib/src/PropertyValueNameToEnumMapper.g.dart index e3362a2059b..862048153ee 100644 --- a/ffi/capi/dart/package/lib/src/PropertyValueNameToEnumMapper.g.dart +++ b/ffi/capi/dart/package/lib/src/PropertyValueNameToEnumMapper.g.dart @@ -10,7 +10,7 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `PropertyValueNameToEnumMapper`](https://docs.rs/icu/latest/icu/properties/names/struct.PropertyValueNameToEnumMapper.html) for more information. /// /// See the [Rust documentation for `PropertyValueNameToEnumMapperBorrowed`](https://docs.rs/icu/latest/icu/properties/names/struct.PropertyValueNameToEnumMapperBorrowed.html) for more information. -class PropertyValueNameToEnumMapper implements ffi.Finalizable { +final class PropertyValueNameToEnumMapper implements ffi.Finalizable { final ffi.Pointer _underlying; PropertyValueNameToEnumMapper._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/RegionDisplayNames.g.dart b/ffi/capi/dart/package/lib/src/RegionDisplayNames.g.dart index 194ce8cd95d..a5c3e0ebe5e 100644 --- a/ffi/capi/dart/package/lib/src/RegionDisplayNames.g.dart +++ b/ffi/capi/dart/package/lib/src/RegionDisplayNames.g.dart @@ -6,7 +6,7 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `RegionDisplayNames`](https://docs.rs/icu/latest/icu/displaynames/struct.RegionDisplayNames.html) for more information. -class RegionDisplayNames implements ffi.Finalizable { +final class RegionDisplayNames implements ffi.Finalizable { final ffi.Pointer _underlying; RegionDisplayNames._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/ReorderedIndexMap.g.dart b/ffi/capi/dart/package/lib/src/ReorderedIndexMap.g.dart index d6be47b9731..c3105614577 100644 --- a/ffi/capi/dart/package/lib/src/ReorderedIndexMap.g.dart +++ b/ffi/capi/dart/package/lib/src/ReorderedIndexMap.g.dart @@ -10,7 +10,7 @@ part of 'lib.g.dart'; /// `map[visualIndex] = sourceIndex` /// /// Produced by `reorder_visual()` on [`Bidi`]. -class ReorderedIndexMap implements ffi.Finalizable { +final class ReorderedIndexMap implements ffi.Finalizable { final ffi.Pointer _underlying; ReorderedIndexMap._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/ScriptExtensionsSet.g.dart b/ffi/capi/dart/package/lib/src/ScriptExtensionsSet.g.dart index 829c2906682..2d2ef37965d 100644 --- a/ffi/capi/dart/package/lib/src/ScriptExtensionsSet.g.dart +++ b/ffi/capi/dart/package/lib/src/ScriptExtensionsSet.g.dart @@ -8,7 +8,7 @@ part of 'lib.g.dart'; /// An object that represents the Script_Extensions property for a single character /// /// See the [Rust documentation for `ScriptExtensionsSet`](https://docs.rs/icu/latest/icu/properties/script/struct.ScriptExtensionsSet.html) for more information. -class ScriptExtensionsSet implements ffi.Finalizable { +final class ScriptExtensionsSet implements ffi.Finalizable { final ffi.Pointer _underlying; ScriptExtensionsSet._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/ScriptWithExtensions.g.dart b/ffi/capi/dart/package/lib/src/ScriptWithExtensions.g.dart index 7639c26f3ed..cd8c7295446 100644 --- a/ffi/capi/dart/package/lib/src/ScriptWithExtensions.g.dart +++ b/ffi/capi/dart/package/lib/src/ScriptWithExtensions.g.dart @@ -8,7 +8,7 @@ part of 'lib.g.dart'; /// An ICU4X ScriptWithExtensions map object, capable of holding a map of codepoints to scriptextensions values /// /// See the [Rust documentation for `ScriptWithExtensions`](https://docs.rs/icu/latest/icu/properties/script/struct.ScriptWithExtensions.html) for more information. -class ScriptWithExtensions implements ffi.Finalizable { +final class ScriptWithExtensions implements ffi.Finalizable { final ffi.Pointer _underlying; ScriptWithExtensions._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/ScriptWithExtensionsBorrowed.g.dart b/ffi/capi/dart/package/lib/src/ScriptWithExtensionsBorrowed.g.dart index ab808b3ce8b..f52427168ea 100644 --- a/ffi/capi/dart/package/lib/src/ScriptWithExtensionsBorrowed.g.dart +++ b/ffi/capi/dart/package/lib/src/ScriptWithExtensionsBorrowed.g.dart @@ -8,7 +8,7 @@ part of 'lib.g.dart'; /// A slightly faster ICU4XScriptWithExtensions object /// /// See the [Rust documentation for `ScriptWithExtensionsBorrowed`](https://docs.rs/icu/latest/icu/properties/script/struct.ScriptWithExtensionsBorrowed.html) for more information. -class ScriptWithExtensionsBorrowed implements ffi.Finalizable { +final class ScriptWithExtensionsBorrowed implements ffi.Finalizable { final ffi.Pointer _underlying; ScriptWithExtensionsBorrowed._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/SentenceBreakIteratorLatin1.g.dart b/ffi/capi/dart/package/lib/src/SentenceBreakIteratorLatin1.g.dart index 803f76a2e36..5a7bd0d2067 100644 --- a/ffi/capi/dart/package/lib/src/SentenceBreakIteratorLatin1.g.dart +++ b/ffi/capi/dart/package/lib/src/SentenceBreakIteratorLatin1.g.dart @@ -6,7 +6,7 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `SentenceBreakIterator`](https://docs.rs/icu/latest/icu/segmenter/struct.SentenceBreakIterator.html) for more information. -class SentenceBreakIteratorLatin1 implements ffi.Finalizable { +final class SentenceBreakIteratorLatin1 implements ffi.Finalizable { final ffi.Pointer _underlying; SentenceBreakIteratorLatin1._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/SentenceBreakIteratorUtf16.g.dart b/ffi/capi/dart/package/lib/src/SentenceBreakIteratorUtf16.g.dart index 709a3df744c..5c7c80dd56e 100644 --- a/ffi/capi/dart/package/lib/src/SentenceBreakIteratorUtf16.g.dart +++ b/ffi/capi/dart/package/lib/src/SentenceBreakIteratorUtf16.g.dart @@ -6,7 +6,7 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `SentenceBreakIterator`](https://docs.rs/icu/latest/icu/segmenter/struct.SentenceBreakIterator.html) for more information. -class SentenceBreakIteratorUtf16 implements ffi.Finalizable { +final class SentenceBreakIteratorUtf16 implements ffi.Finalizable { final ffi.Pointer _underlying; SentenceBreakIteratorUtf16._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/SentenceBreakIteratorUtf8.g.dart b/ffi/capi/dart/package/lib/src/SentenceBreakIteratorUtf8.g.dart index 4fe376b149c..9e34464a7d5 100644 --- a/ffi/capi/dart/package/lib/src/SentenceBreakIteratorUtf8.g.dart +++ b/ffi/capi/dart/package/lib/src/SentenceBreakIteratorUtf8.g.dart @@ -6,7 +6,7 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `SentenceBreakIterator`](https://docs.rs/icu/latest/icu/segmenter/struct.SentenceBreakIterator.html) for more information. -class SentenceBreakIteratorUtf8 implements ffi.Finalizable { +final class SentenceBreakIteratorUtf8 implements ffi.Finalizable { final ffi.Pointer _underlying; SentenceBreakIteratorUtf8._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/SentenceSegmenter.g.dart b/ffi/capi/dart/package/lib/src/SentenceSegmenter.g.dart index c46b25596e4..a3ecd2a3489 100644 --- a/ffi/capi/dart/package/lib/src/SentenceSegmenter.g.dart +++ b/ffi/capi/dart/package/lib/src/SentenceSegmenter.g.dart @@ -8,7 +8,7 @@ part of 'lib.g.dart'; /// An ICU4X sentence-break segmenter, capable of finding sentence breakpoints in strings. /// /// See the [Rust documentation for `SentenceSegmenter`](https://docs.rs/icu/latest/icu/segmenter/struct.SentenceSegmenter.html) for more information. -class SentenceSegmenter implements ffi.Finalizable { +final class SentenceSegmenter implements ffi.Finalizable { final ffi.Pointer _underlying; SentenceSegmenter._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/Time.g.dart b/ffi/capi/dart/package/lib/src/Time.g.dart index a5214f16419..72c71ccc71e 100644 --- a/ffi/capi/dart/package/lib/src/Time.g.dart +++ b/ffi/capi/dart/package/lib/src/Time.g.dart @@ -8,7 +8,7 @@ part of 'lib.g.dart'; /// An ICU4X Time object representing a time in terms of hour, minute, second, nanosecond /// /// See the [Rust documentation for `Time`](https://docs.rs/icu/latest/icu/calendar/types/struct.Time.html) for more information. -class Time implements ffi.Finalizable { +final class Time implements ffi.Finalizable { final ffi.Pointer _underlying; Time._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/TimeFormatter.g.dart b/ffi/capi/dart/package/lib/src/TimeFormatter.g.dart index f64f8fd0bd2..e0d9b40c54b 100644 --- a/ffi/capi/dart/package/lib/src/TimeFormatter.g.dart +++ b/ffi/capi/dart/package/lib/src/TimeFormatter.g.dart @@ -8,7 +8,7 @@ part of 'lib.g.dart'; /// An ICU4X TimeFormatter object capable of formatting an [`Time`] type (and others) as a string /// /// See the [Rust documentation for `TimeFormatter`](https://docs.rs/icu/latest/icu/datetime/struct.TimeFormatter.html) for more information. -class TimeFormatter implements ffi.Finalizable { +final class TimeFormatter implements ffi.Finalizable { final ffi.Pointer _underlying; TimeFormatter._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/TimeZoneFormatter.g.dart b/ffi/capi/dart/package/lib/src/TimeZoneFormatter.g.dart index 7d5ac4e221d..f19d4679cae 100644 --- a/ffi/capi/dart/package/lib/src/TimeZoneFormatter.g.dart +++ b/ffi/capi/dart/package/lib/src/TimeZoneFormatter.g.dart @@ -8,7 +8,7 @@ part of 'lib.g.dart'; /// An ICU4X TimeZoneFormatter object capable of formatting an [`CustomTimeZone`] type (and others) as a string /// /// See the [Rust documentation for `TimeZoneFormatter`](https://docs.rs/icu/latest/icu/datetime/time_zone/struct.TimeZoneFormatter.html) for more information. -class TimeZoneFormatter implements ffi.Finalizable { +final class TimeZoneFormatter implements ffi.Finalizable { final ffi.Pointer _underlying; TimeZoneFormatter._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/TitlecaseMapper.g.dart b/ffi/capi/dart/package/lib/src/TitlecaseMapper.g.dart index 627c38a09ac..7a8e5ed0351 100644 --- a/ffi/capi/dart/package/lib/src/TitlecaseMapper.g.dart +++ b/ffi/capi/dart/package/lib/src/TitlecaseMapper.g.dart @@ -6,7 +6,7 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `TitlecaseMapper`](https://docs.rs/icu/latest/icu/casemap/struct.TitlecaseMapper.html) for more information. -class TitlecaseMapper implements ffi.Finalizable { +final class TitlecaseMapper implements ffi.Finalizable { final ffi.Pointer _underlying; TitlecaseMapper._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/TitlecaseOptionsV1.g.dart b/ffi/capi/dart/package/lib/src/TitlecaseOptionsV1.g.dart index c2241b22f70..555d96874cb 100644 --- a/ffi/capi/dart/package/lib/src/TitlecaseOptionsV1.g.dart +++ b/ffi/capi/dart/package/lib/src/TitlecaseOptionsV1.g.dart @@ -6,14 +6,14 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `TitlecaseOptions`](https://docs.rs/icu/latest/icu/casemap/titlecase/struct.TitlecaseOptions.html) for more information. -class _TitlecaseOptionsV1Ffi extends ffi.Struct { +final class _TitlecaseOptionsV1Ffi extends ffi.Struct { @ffi.Int32() external int leadingAdjustment; @ffi.Int32() external int trailingCase; } -class TitlecaseOptionsV1 { +final class TitlecaseOptionsV1 { final _TitlecaseOptionsV1Ffi _underlying; // ignore: unused_element diff --git a/ffi/capi/dart/package/lib/src/UnicodeSetData.g.dart b/ffi/capi/dart/package/lib/src/UnicodeSetData.g.dart index a22293de120..bc45469968d 100644 --- a/ffi/capi/dart/package/lib/src/UnicodeSetData.g.dart +++ b/ffi/capi/dart/package/lib/src/UnicodeSetData.g.dart @@ -12,7 +12,7 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `UnicodeSetData`](https://docs.rs/icu/latest/icu/properties/sets/struct.UnicodeSetData.html) for more information. /// /// See the [Rust documentation for `UnicodeSetDataBorrowed`](https://docs.rs/icu/latest/icu/properties/sets/struct.UnicodeSetDataBorrowed.html) for more information. -class UnicodeSetData implements ffi.Finalizable { +final class UnicodeSetData implements ffi.Finalizable { final ffi.Pointer _underlying; UnicodeSetData._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/WeekCalculator.g.dart b/ffi/capi/dart/package/lib/src/WeekCalculator.g.dart index 1384822ce88..72509b38570 100644 --- a/ffi/capi/dart/package/lib/src/WeekCalculator.g.dart +++ b/ffi/capi/dart/package/lib/src/WeekCalculator.g.dart @@ -8,7 +8,7 @@ part of 'lib.g.dart'; /// A Week calculator, useful to be passed in to `week_of_year()` on Date and DateTime types /// /// See the [Rust documentation for `WeekCalculator`](https://docs.rs/icu/latest/icu/calendar/week/struct.WeekCalculator.html) for more information. -class WeekCalculator implements ffi.Finalizable { +final class WeekCalculator implements ffi.Finalizable { final ffi.Pointer _underlying; WeekCalculator._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/WeekOf.g.dart b/ffi/capi/dart/package/lib/src/WeekOf.g.dart index 9503ee77b60..cb607e225ce 100644 --- a/ffi/capi/dart/package/lib/src/WeekOf.g.dart +++ b/ffi/capi/dart/package/lib/src/WeekOf.g.dart @@ -6,14 +6,14 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `WeekOf`](https://docs.rs/icu/latest/icu/calendar/week/struct.WeekOf.html) for more information. -class _WeekOfFfi extends ffi.Struct { +final class _WeekOfFfi extends ffi.Struct { @ffi.Uint16() external int week; @ffi.Int32() external int unit; } -class WeekOf { +final class WeekOf { final _WeekOfFfi _underlying; // ignore: unused_element diff --git a/ffi/capi/dart/package/lib/src/WordBreakIteratorLatin1.g.dart b/ffi/capi/dart/package/lib/src/WordBreakIteratorLatin1.g.dart index 7d06f8c8b11..3e08c258763 100644 --- a/ffi/capi/dart/package/lib/src/WordBreakIteratorLatin1.g.dart +++ b/ffi/capi/dart/package/lib/src/WordBreakIteratorLatin1.g.dart @@ -6,7 +6,7 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `WordBreakIterator`](https://docs.rs/icu/latest/icu/segmenter/struct.WordBreakIterator.html) for more information. -class WordBreakIteratorLatin1 implements ffi.Finalizable { +final class WordBreakIteratorLatin1 implements ffi.Finalizable { final ffi.Pointer _underlying; WordBreakIteratorLatin1._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/WordBreakIteratorUtf16.g.dart b/ffi/capi/dart/package/lib/src/WordBreakIteratorUtf16.g.dart index 0053f9413c3..4f9c24b10d5 100644 --- a/ffi/capi/dart/package/lib/src/WordBreakIteratorUtf16.g.dart +++ b/ffi/capi/dart/package/lib/src/WordBreakIteratorUtf16.g.dart @@ -6,7 +6,7 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `WordBreakIterator`](https://docs.rs/icu/latest/icu/segmenter/struct.WordBreakIterator.html) for more information. -class WordBreakIteratorUtf16 implements ffi.Finalizable { +final class WordBreakIteratorUtf16 implements ffi.Finalizable { final ffi.Pointer _underlying; WordBreakIteratorUtf16._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/WordBreakIteratorUtf8.g.dart b/ffi/capi/dart/package/lib/src/WordBreakIteratorUtf8.g.dart index 3ce15ab7ba6..077d98a183f 100644 --- a/ffi/capi/dart/package/lib/src/WordBreakIteratorUtf8.g.dart +++ b/ffi/capi/dart/package/lib/src/WordBreakIteratorUtf8.g.dart @@ -6,7 +6,7 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `WordBreakIterator`](https://docs.rs/icu/latest/icu/segmenter/struct.WordBreakIterator.html) for more information. -class WordBreakIteratorUtf8 implements ffi.Finalizable { +final class WordBreakIteratorUtf8 implements ffi.Finalizable { final ffi.Pointer _underlying; WordBreakIteratorUtf8._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/WordSegmenter.g.dart b/ffi/capi/dart/package/lib/src/WordSegmenter.g.dart index 1b36f6dcfaf..9309e7419d4 100644 --- a/ffi/capi/dart/package/lib/src/WordSegmenter.g.dart +++ b/ffi/capi/dart/package/lib/src/WordSegmenter.g.dart @@ -8,7 +8,7 @@ part of 'lib.g.dart'; /// An ICU4X word-break segmenter, capable of finding word breakpoints in strings. /// /// See the [Rust documentation for `WordSegmenter`](https://docs.rs/icu/latest/icu/segmenter/struct.WordSegmenter.html) for more information. -class WordSegmenter implements ffi.Finalizable { +final class WordSegmenter implements ffi.Finalizable { final ffi.Pointer _underlying; WordSegmenter._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/ZonedDateTimeFormatter.g.dart b/ffi/capi/dart/package/lib/src/ZonedDateTimeFormatter.g.dart index aadb3f13daa..f79093b07d3 100644 --- a/ffi/capi/dart/package/lib/src/ZonedDateTimeFormatter.g.dart +++ b/ffi/capi/dart/package/lib/src/ZonedDateTimeFormatter.g.dart @@ -8,7 +8,7 @@ part of 'lib.g.dart'; /// An object capable of formatting a date time with time zone to a string. /// /// See the [Rust documentation for `ZonedDateTimeFormatter`](https://docs.rs/icu/latest/icu/datetime/struct.ZonedDateTimeFormatter.html) for more information. -class ZonedDateTimeFormatter implements ffi.Finalizable { +final class ZonedDateTimeFormatter implements ffi.Finalizable { final ffi.Pointer _underlying; ZonedDateTimeFormatter._(this._underlying) { diff --git a/ffi/capi/dart/package/lib/src/lib.g.dart b/ffi/capi/dart/package/lib/src/lib.g.dart index efd1bde9188..5fd6908158a 100644 --- a/ffi/capi/dart/package/lib/src/lib.g.dart +++ b/ffi/capi/dart/package/lib/src/lib.g.dart @@ -134,7 +134,7 @@ void init(String path) => _capi = ffi.DynamicLibrary.open(path).lookup; final _callocFree = Finalizer(ffi2.calloc.free); -class SizeList extends ffi.Struct { +final class SizeList extends ffi.Struct { external ffi.Pointer _bytes; @ffi.Size() @@ -163,7 +163,7 @@ class SizeList extends ffi.Struct { int get hashCode => _length.hashCode; } -class _ResultBoolInt32Union extends ffi.Union { +final class _ResultBoolInt32Union extends ffi.Union { @ffi.Bool() external bool ok; @@ -171,14 +171,14 @@ class _ResultBoolInt32Union extends ffi.Union { external int err; } -class _ResultBoolInt32 extends ffi.Struct { +final class _ResultBoolInt32 extends ffi.Struct { external _ResultBoolInt32Union union; @ffi.Bool() external bool isOk; } -class _ResultInt32Int32Union extends ffi.Union { +final class _ResultInt32Int32Union extends ffi.Union { @ffi.Int32() external int ok; @@ -186,83 +186,83 @@ class _ResultInt32Int32Union extends ffi.Union { external int err; } -class _ResultInt32Int32 extends ffi.Struct { +final class _ResultInt32Int32 extends ffi.Struct { external _ResultInt32Int32Union union; @ffi.Bool() external bool isOk; } -class _ResultInt32VoidUnion extends ffi.Union { +final class _ResultInt32VoidUnion extends ffi.Union { @ffi.Int32() external int ok; } -class _ResultInt32Void extends ffi.Struct { +final class _ResultInt32Void extends ffi.Struct { external _ResultInt32VoidUnion union; @ffi.Bool() external bool isOk; } -class _ResultOpaqueInt32Union extends ffi.Union { +final class _ResultOpaqueInt32Union extends ffi.Union { external ffi.Pointer ok; @ffi.Int32() external int err; } -class _ResultOpaqueInt32 extends ffi.Struct { +final class _ResultOpaqueInt32 extends ffi.Struct { external _ResultOpaqueInt32Union union; @ffi.Bool() external bool isOk; } -class _ResultUint16VoidUnion extends ffi.Union { +final class _ResultUint16VoidUnion extends ffi.Union { @ffi.Uint16() external int ok; } -class _ResultUint16Void extends ffi.Struct { +final class _ResultUint16Void extends ffi.Struct { external _ResultUint16VoidUnion union; @ffi.Bool() external bool isOk; } -class _ResultVoidInt32Union extends ffi.Union { +final class _ResultVoidInt32Union extends ffi.Union { @ffi.Int32() external int err; } -class _ResultVoidInt32 extends ffi.Struct { +final class _ResultVoidInt32 extends ffi.Struct { external _ResultVoidInt32Union union; @ffi.Bool() external bool isOk; } -class _ResultVoidVoid extends ffi.Struct { +final class _ResultVoidVoid extends ffi.Struct { @ffi.Bool() external bool isOk; } -class _ResultWeekOfFfiInt32Union extends ffi.Union { +final class _ResultWeekOfFfiInt32Union extends ffi.Union { external _WeekOfFfi ok; @ffi.Int32() external int err; } -class _ResultWeekOfFfiInt32 extends ffi.Struct { +final class _ResultWeekOfFfiInt32 extends ffi.Struct { external _ResultWeekOfFfiInt32Union union; @ffi.Bool() external bool isOk; } -class _SliceFfi2Utf8 extends ffi.Struct { +final class _SliceFfi2Utf8 extends ffi.Struct { external ffi.Pointer _bytes; @ffi.Size() @@ -306,7 +306,7 @@ class _SliceFfi2Utf8 extends ffi.Struct { int get hashCode => _length.hashCode; } -class _SliceFfiUint16 extends ffi.Struct { +final class _SliceFfiUint16 extends ffi.Struct { external ffi.Pointer _bytes; @ffi.Size() @@ -348,7 +348,7 @@ class _SliceFfiUint16 extends ffi.Struct { int get hashCode => _length.hashCode; } -class _SliceFfiUint8 extends ffi.Struct { +final class _SliceFfiUint8 extends ffi.Struct { external ffi.Pointer _bytes; @ffi.Size() @@ -393,7 +393,7 @@ class _SliceFfiUint8 extends ffi.Struct { /// An unspecified error value class VoidError {} -class _Writeable { +final class _Writeable { final ffi.Pointer _underlying; _Writeable() : _underlying = _create(0); diff --git a/ffi/capi/dart/package/pubspec.yaml b/ffi/capi/dart/package/pubspec.yaml index 83316da5a08..c1820933901 100644 --- a/ffi/capi/dart/package/pubspec.yaml +++ b/ffi/capi/dart/package/pubspec.yaml @@ -9,6 +9,6 @@ dependencies: ffi: '>=1.1.0' dev_dependencies: - lints: ^2.0.0 + lints: ^3.0.0 test: ^1.21.0 path: ^1.0.0 From 2af18ed2855f5c6b2a01714ea6a585cf5a736703 Mon Sep 17 00:00:00 2001 From: Robert Bastian <4706271+robertbastian@users.noreply.github.com> Date: Mon, 20 Nov 2023 10:41:07 +0100 Subject: [PATCH 02/10] gn --- Cargo.lock | 26 +++++++------------------- ffi/gn/.cargo/config | 4 ++-- ffi/gn/Cargo.lock | 6 +++--- 3 files changed, 12 insertions(+), 24 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8387f295d51..95c2a20c34c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -796,9 +796,9 @@ dependencies = [ [[package]] name = "diplomat" version = "0.7.0" -source = "git+https://github.com/rust-diplomat/diplomat.git?rev=564323d77cc7344b323459473d4a5b295f9830cc#564323d77cc7344b323459473d4a5b295f9830cc" +source = "git+https://github.com/rust-diplomat/diplomat.git?rev=7eee7e90381904fb96d4f188ae689b3ad6a103fd#7eee7e90381904fb96d4f188ae689b3ad6a103fd" dependencies = [ - "diplomat_core 0.7.0 (git+https://github.com/rust-diplomat/diplomat.git?rev=564323d77cc7344b323459473d4a5b295f9830cc)", + "diplomat_core", "proc-macro2", "quote", "syn 2.0.37", @@ -814,7 +814,7 @@ dependencies = [ [[package]] name = "diplomat-runtime" version = "0.7.0" -source = "git+https://github.com/rust-diplomat/diplomat.git?rev=564323d77cc7344b323459473d4a5b295f9830cc#564323d77cc7344b323459473d4a5b295f9830cc" +source = "git+https://github.com/rust-diplomat/diplomat.git?rev=7eee7e90381904fb96d4f188ae689b3ad6a103fd#7eee7e90381904fb96d4f188ae689b3ad6a103fd" dependencies = [ "log", ] @@ -822,11 +822,12 @@ dependencies = [ [[package]] name = "diplomat-tool" version = "0.7.0" +source = "git+https://github.com/rust-diplomat/diplomat.git?rev=7eee7e90381904fb96d4f188ae689b3ad6a103fd#7eee7e90381904fb96d4f188ae689b3ad6a103fd" dependencies = [ "askama", "clap 3.2.25", "colored", - "diplomat_core 0.7.0", + "diplomat_core", "displaydoc", "heck 0.4.1", "indenter", @@ -841,6 +842,7 @@ dependencies = [ [[package]] name = "diplomat_core" version = "0.7.0" +source = "git+https://github.com/rust-diplomat/diplomat.git?rev=7eee7e90381904fb96d4f188ae689b3ad6a103fd#7eee7e90381904fb96d4f188ae689b3ad6a103fd" dependencies = [ "displaydoc", "lazy_static", @@ -852,20 +854,6 @@ dependencies = [ "syn 2.0.37", ] -[[package]] -name = "diplomat_core" -version = "0.7.0" -source = "git+https://github.com/rust-diplomat/diplomat.git?rev=564323d77cc7344b323459473d4a5b295f9830cc#564323d77cc7344b323459473d4a5b295f9830cc" -dependencies = [ - "lazy_static", - "proc-macro2", - "quote", - "serde", - "smallvec", - "strck_ident", - "syn 2.0.37", -] - [[package]] name = "discard" version = "1.0.4" @@ -1702,7 +1690,7 @@ version = "1.4.0" name = "icu_ffi_coverage" version = "0.0.0" dependencies = [ - "diplomat_core 0.7.0 (git+https://github.com/rust-diplomat/diplomat.git?rev=564323d77cc7344b323459473d4a5b295f9830cc)", + "diplomat_core", "elsa", "lazy_static", "rustdoc-types", diff --git a/ffi/gn/.cargo/config b/ffi/gn/.cargo/config index f69a6a6968b..b3525580dcd 100644 --- a/ffi/gn/.cargo/config +++ b/ffi/gn/.cargo/config @@ -6,9 +6,9 @@ [source.crates-io] replace-with = "vendored-sources" -[source."git+https://github.com/rust-diplomat/diplomat.git?rev=564323d77cc7344b323459473d4a5b295f9830cc"] +[source."git+https://github.com/rust-diplomat/diplomat.git?rev=7eee7e90381904fb96d4f188ae689b3ad6a103fd"] git = "https://github.com/rust-diplomat/diplomat.git" -rev = "564323d77cc7344b323459473d4a5b295f9830cc" +rev = "7eee7e90381904fb96d4f188ae689b3ad6a103fd" replace-with = "vendored-sources" [source.vendored-sources] diff --git a/ffi/gn/Cargo.lock b/ffi/gn/Cargo.lock index 873d3cf784a..ef5a03b07db 100644 --- a/ffi/gn/Cargo.lock +++ b/ffi/gn/Cargo.lock @@ -120,7 +120,7 @@ checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" [[package]] name = "diplomat" version = "0.7.0" -source = "git+https://github.com/rust-diplomat/diplomat.git?rev=564323d77cc7344b323459473d4a5b295f9830cc#564323d77cc7344b323459473d4a5b295f9830cc" +source = "git+https://github.com/rust-diplomat/diplomat.git?rev=7eee7e90381904fb96d4f188ae689b3ad6a103fd#7eee7e90381904fb96d4f188ae689b3ad6a103fd" dependencies = [ "diplomat_core", "proc-macro2", @@ -131,12 +131,12 @@ dependencies = [ [[package]] name = "diplomat-runtime" version = "0.7.0" -source = "git+https://github.com/rust-diplomat/diplomat.git?rev=564323d77cc7344b323459473d4a5b295f9830cc#564323d77cc7344b323459473d4a5b295f9830cc" +source = "git+https://github.com/rust-diplomat/diplomat.git?rev=7eee7e90381904fb96d4f188ae689b3ad6a103fd#7eee7e90381904fb96d4f188ae689b3ad6a103fd" [[package]] name = "diplomat_core" version = "0.7.0" -source = "git+https://github.com/rust-diplomat/diplomat.git?rev=564323d77cc7344b323459473d4a5b295f9830cc#564323d77cc7344b323459473d4a5b295f9830cc" +source = "git+https://github.com/rust-diplomat/diplomat.git?rev=7eee7e90381904fb96d4f188ae689b3ad6a103fd#7eee7e90381904fb96d4f188ae689b3ad6a103fd" dependencies = [ "lazy_static", "proc-macro2", From 27bb82b5b3e07891693a25e6662597b33b01e259 Mon Sep 17 00:00:00 2001 From: Robert Bastian <4706271+robertbastian@users.noreply.github.com> Date: Mon, 20 Nov 2023 23:20:02 +0100 Subject: [PATCH 03/10] format --- Cargo.lock | 8 ++++---- Cargo.toml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 95c2a20c34c..cba16a5cdee 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -796,7 +796,7 @@ dependencies = [ [[package]] name = "diplomat" version = "0.7.0" -source = "git+https://github.com/rust-diplomat/diplomat.git?rev=7eee7e90381904fb96d4f188ae689b3ad6a103fd#7eee7e90381904fb96d4f188ae689b3ad6a103fd" +source = "git+https://github.com/rust-diplomat/diplomat.git?rev=fa3747fbc9d41248d8d0c034c3e462a71e8ab6bf#fa3747fbc9d41248d8d0c034c3e462a71e8ab6bf" dependencies = [ "diplomat_core", "proc-macro2", @@ -814,7 +814,7 @@ dependencies = [ [[package]] name = "diplomat-runtime" version = "0.7.0" -source = "git+https://github.com/rust-diplomat/diplomat.git?rev=7eee7e90381904fb96d4f188ae689b3ad6a103fd#7eee7e90381904fb96d4f188ae689b3ad6a103fd" +source = "git+https://github.com/rust-diplomat/diplomat.git?rev=fa3747fbc9d41248d8d0c034c3e462a71e8ab6bf#fa3747fbc9d41248d8d0c034c3e462a71e8ab6bf" dependencies = [ "log", ] @@ -822,7 +822,7 @@ dependencies = [ [[package]] name = "diplomat-tool" version = "0.7.0" -source = "git+https://github.com/rust-diplomat/diplomat.git?rev=7eee7e90381904fb96d4f188ae689b3ad6a103fd#7eee7e90381904fb96d4f188ae689b3ad6a103fd" +source = "git+https://github.com/rust-diplomat/diplomat.git?rev=fa3747fbc9d41248d8d0c034c3e462a71e8ab6bf#fa3747fbc9d41248d8d0c034c3e462a71e8ab6bf" dependencies = [ "askama", "clap 3.2.25", @@ -842,7 +842,7 @@ dependencies = [ [[package]] name = "diplomat_core" version = "0.7.0" -source = "git+https://github.com/rust-diplomat/diplomat.git?rev=7eee7e90381904fb96d4f188ae689b3ad6a103fd#7eee7e90381904fb96d4f188ae689b3ad6a103fd" +source = "git+https://github.com/rust-diplomat/diplomat.git?rev=fa3747fbc9d41248d8d0c034c3e462a71e8ab6bf#fa3747fbc9d41248d8d0c034c3e462a71e8ab6bf" dependencies = [ "displaydoc", "lazy_static", diff --git a/Cargo.toml b/Cargo.toml index 4d9c0a0d45d..a5215b2d203 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -230,10 +230,10 @@ icu_benchmark_macros = { path = "tools/benchmark/macros" } # The version here can either be a `version = ".."` spec or `git = "https://github.com/rust-diplomat/diplomat", rev = ".."` # Diplomat must be published preceding a new ICU4X release but may use git versions in between -diplomat = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "7eee7e90381904fb96d4f188ae689b3ad6a103fd" } -diplomat-runtime = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "7eee7e90381904fb96d4f188ae689b3ad6a103fd" } -diplomat_core = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "7eee7e90381904fb96d4f188ae689b3ad6a103fd" } -diplomat-tool = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "7eee7e90381904fb96d4f188ae689b3ad6a103fd" } +diplomat = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "fa3747fbc9d41248d8d0c034c3e462a71e8ab6bf" } +diplomat-runtime = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "fa3747fbc9d41248d8d0c034c3e462a71e8ab6bf" } +diplomat_core = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "fa3747fbc9d41248d8d0c034c3e462a71e8ab6bf" } +diplomat-tool = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "fa3747fbc9d41248d8d0c034c3e462a71e8ab6bf" } # Size optimized builds [profile.release-opt-size] From 73ea3d4b1f177082a7e82b5a71b7a38b5a4ab29c Mon Sep 17 00:00:00 2001 From: Robert Bastian <4706271+robertbastian@users.noreply.github.com> Date: Mon, 20 Nov 2023 23:22:54 +0100 Subject: [PATCH 04/10] =?UTF-8?q?h=C3=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-test.yml | 5 - .../package/lib/src/AnyCalendarKind.g.dart | 33 +- .../package/lib/src/Bcp47ToIanaMapper.g.dart | 33 +- ffi/capi/dart/package/lib/src/Bidi.g.dart | 61 +- .../dart/package/lib/src/BidiDirection.g.dart | 2 + ffi/capi/dart/package/lib/src/BidiInfo.g.dart | 26 +- .../dart/package/lib/src/BidiParagraph.g.dart | 54 +- ffi/capi/dart/package/lib/src/Calendar.g.dart | 32 +- .../lib/src/CanonicalCombiningClassMap.g.dart | 28 +- .../lib/src/CanonicalComposition.g.dart | 25 +- .../lib/src/CanonicalDecomposition.g.dart | 22 +- .../dart/package/lib/src/CaseMapCloser.g.dart | 45 +- .../dart/package/lib/src/CaseMapper.g.dart | 170 +--- .../package/lib/src/CodePointMapData16.g.dart | 64 +- .../package/lib/src/CodePointMapData8.g.dart | 176 ++-- .../lib/src/CodePointRangeIterator.g.dart | 13 +- .../lib/src/CodePointSetBuilder.g.dart | 137 +-- .../package/lib/src/CodePointSetData.g.dart | 846 +++++++----------- ffi/capi/dart/package/lib/src/Collator.g.dart | 59 +- .../lib/src/CollatorAlternateHandling.g.dart | 2 + .../src/CollatorBackwardSecondLevel.g.dart | 2 + .../package/lib/src/CollatorCaseFirst.g.dart | 3 + .../package/lib/src/CollatorCaseLevel.g.dart | 2 + .../lib/src/CollatorMaxVariable.g.dart | 4 + .../package/lib/src/CollatorNumeric.g.dart | 2 + .../package/lib/src/CollatorOptionsV1.g.dart | 18 +- .../package/lib/src/CollatorStrength.g.dart | 5 + .../lib/src/ComposingNormalizer.g.dart | 58 +- .../package/lib/src/CustomTimeZone.g.dart | 258 ++---- .../dart/package/lib/src/DataProvider.g.dart | 78 +- ffi/capi/dart/package/lib/src/Date.g.dart | 157 +--- .../dart/package/lib/src/DateFormatter.g.dart | 79 +- .../dart/package/lib/src/DateLength.g.dart | 3 + ffi/capi/dart/package/lib/src/DateTime.g.dart | 246 ++--- .../package/lib/src/DateTimeFormatter.g.dart | 54 +- .../lib/src/DecomposingNormalizer.g.dart | 61 +- .../lib/src/DisplayNamesFallback.g.dart | 1 + .../lib/src/DisplayNamesOptionsV1.g.dart | 6 +- .../package/lib/src/DisplayNamesStyle.g.dart | 4 + ffi/capi/dart/package/lib/src/Error.g.dart | 50 ++ .../dart/package/lib/src/FixedDecimal.g.dart | 213 ++--- .../lib/src/FixedDecimalFormatter.g.dart | 34 +- .../src/FixedDecimalGroupingStrategy.g.dart | 3 + .../lib/src/FixedDecimalSignDisplay.g.dart | 4 + .../GeneralCategoryNameToMaskMapper.g.dart | 48 +- .../GraphemeClusterBreakIteratorLatin1.g.dart | 8 +- .../GraphemeClusterBreakIteratorUtf16.g.dart | 8 +- .../GraphemeClusterBreakIteratorUtf8.g.dart | 8 +- .../lib/src/GraphemeClusterSegmenter.g.dart | 61 +- .../lib/src/GregorianDateFormatter.g.dart | 50 +- .../lib/src/GregorianDateTimeFormatter.g.dart | 38 +- .../GregorianZonedDateTimeFormatter.g.dart | 83 +- .../package/lib/src/IanaToBcp47Mapper.g.dart | 13 +- ffi/capi/dart/package/lib/src/IsoDate.g.dart | 94 +- .../dart/package/lib/src/IsoDateTime.g.dart | 180 ++-- .../package/lib/src/IsoTimeZoneFormat.g.dart | 3 + .../lib/src/IsoTimeZoneMinuteDisplay.g.dart | 1 + .../package/lib/src/IsoTimeZoneOptions.g.dart | 6 +- .../lib/src/IsoTimeZoneSecondDisplay.g.dart | 1 + .../dart/package/lib/src/IsoWeekday.g.dart | 6 + .../package/lib/src/LanguageDisplay.g.dart | 1 + .../package/lib/src/LeadingAdjustment.g.dart | 2 + .../lib/src/LineBreakIteratorLatin1.g.dart | 8 +- .../lib/src/LineBreakIteratorUtf16.g.dart | 8 +- .../lib/src/LineBreakIteratorUtf8.g.dart | 8 +- .../package/lib/src/LineBreakOptionsV1.g.dart | 6 +- .../lib/src/LineBreakStrictness.g.dart | 3 + .../lib/src/LineBreakWordOption.g.dart | 2 + .../dart/package/lib/src/LineSegmenter.g.dart | 135 +-- ffi/capi/dart/package/lib/src/List.g.dart | 28 +- .../dart/package/lib/src/ListFormatter.g.dart | 75 +- .../dart/package/lib/src/ListLength.g.dart | 2 + ffi/capi/dart/package/lib/src/Locale.g.dart | 186 ++-- .../lib/src/LocaleCanonicalizer.g.dart | 40 +- .../package/lib/src/LocaleDirection.g.dart | 2 + .../lib/src/LocaleDirectionality.g.dart | 72 +- .../src/LocaleDisplayNamesFormatter.g.dart | 37 +- .../package/lib/src/LocaleExpander.g.dart | 49 +- .../lib/src/LocaleFallbackConfig.g.dart | 6 +- .../lib/src/LocaleFallbackIterator.g.dart | 17 +- .../lib/src/LocaleFallbackPriority.g.dart | 2 + .../lib/src/LocaleFallbackSupplement.g.dart | 1 + .../package/lib/src/LocaleFallbacker.g.dart | 33 +- .../lib/src/LocaleFallbackerWithConfig.g.dart | 17 +- .../package/lib/src/MetazoneCalculator.g.dart | 13 +- ffi/capi/dart/package/lib/src/Ordering.g.dart | 2 + .../package/lib/src/PluralCategory.g.dart | 19 +- .../package/lib/src/PluralOperands.g.dart | 17 +- .../dart/package/lib/src/PluralRules.g.dart | 50 +- .../src/PropertyValueNameToEnumMapper.g.dart | 165 ++-- .../package/lib/src/RegionDisplayNames.g.dart | 37 +- .../package/lib/src/ReorderedIndexMap.g.dart | 19 +- .../package/lib/src/RoundingIncrement.g.dart | 3 + .../lib/src/ScriptExtensionsSet.g.dart | 23 +- .../lib/src/ScriptWithExtensions.g.dart | 57 +- .../src/ScriptWithExtensionsBorrowed.g.dart | 56 +- .../package/lib/src/SegmenterWordType.g.dart | 2 + .../src/SentenceBreakIteratorLatin1.g.dart | 8 +- .../lib/src/SentenceBreakIteratorUtf16.g.dart | 8 +- .../lib/src/SentenceBreakIteratorUtf8.g.dart | 8 +- .../package/lib/src/SentenceSegmenter.g.dart | 61 +- ffi/capi/dart/package/lib/src/Time.g.dart | 36 +- .../dart/package/lib/src/TimeFormatter.g.dart | 65 +- .../dart/package/lib/src/TimeLength.g.dart | 3 + .../package/lib/src/TimeZoneFormatter.g.dart | 148 +-- .../package/lib/src/TitlecaseMapper.g.dart | 46 +- .../package/lib/src/TitlecaseOptionsV1.g.dart | 12 +- .../dart/package/lib/src/TrailingCase.g.dart | 1 + .../package/lib/src/TransformResult.g.dart | 1 + .../package/lib/src/UnicodeSetData.g.dart | 123 +-- .../package/lib/src/WeekCalculator.g.dart | 42 +- .../package/lib/src/WeekRelativeUnit.g.dart | 2 + .../lib/src/WordBreakIteratorLatin1.g.dart | 18 +- .../lib/src/WordBreakIteratorUtf16.g.dart | 18 +- .../lib/src/WordBreakIteratorUtf8.g.dart | 18 +- .../dart/package/lib/src/WordSegmenter.g.dart | 81 +- .../lib/src/ZonedDateTimeFormatter.g.dart | 110 +-- ffi/capi/dart/package/lib/src/lib.g.dart | 37 +- ffi/capi/dart/package/pubspec.yaml | 4 +- 119 files changed, 1970 insertions(+), 3869 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 5028374f740..a34b953aec7 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -596,11 +596,6 @@ jobs: - name: Show the selected Rust toolchain run: rustup show - # Job-specific dependencies - - uses: dart-lang/setup-dart@v1 - with: - sdk: 3.1.5 - # Actual job - name: Run `cargo make ci-job-diplomat` run: cargo make ci-job-diplomat diff --git a/ffi/capi/dart/package/lib/src/AnyCalendarKind.g.dart b/ffi/capi/dart/package/lib/src/AnyCalendarKind.g.dart index 52404d82bd1..6473b08e4a7 100644 --- a/ffi/capi/dart/package/lib/src/AnyCalendarKind.g.dart +++ b/ffi/capi/dart/package/lib/src/AnyCalendarKind.g.dart @@ -78,13 +78,11 @@ enum AnyCalendarKind { } return AnyCalendarKind.values[result.union.ok]; } + // ignore: non_constant_identifier_names - static final _ICU4XAnyCalendarKind_get_for_locale = _capi< - ffi.NativeFunction< - _ResultInt32Void Function(ffi.Pointer)>>( - 'ICU4XAnyCalendarKind_get_for_locale') - .asFunction<_ResultInt32Void Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XAnyCalendarKind_get_for_locale = + _capi)>>('ICU4XAnyCalendarKind_get_for_locale') + .asFunction<_ResultInt32Void Function(ffi.Pointer)>(isLeaf: true); /// Obtain the calendar type given a BCP-47 -u-ca- extension string. /// @@ -96,22 +94,18 @@ enum AnyCalendarKind { factory AnyCalendarKind.forBcp47(String s) { final alloc = ffi2.Arena(); final sSlice = _SliceFfi2Utf8._fromDart(s, alloc); - - final result = - _ICU4XAnyCalendarKind_get_for_bcp47(sSlice._bytes, sSlice._length); + final result = _ICU4XAnyCalendarKind_get_for_bcp47(sSlice._bytes, sSlice._length); alloc.releaseAll(); if (!result.isOk) { throw VoidError(); } return AnyCalendarKind.values[result.union.ok]; } + // ignore: non_constant_identifier_names - static final _ICU4XAnyCalendarKind_get_for_bcp47 = _capi< - ffi.NativeFunction< - _ResultInt32Void Function(ffi.Pointer, - ffi.Size)>>('ICU4XAnyCalendarKind_get_for_bcp47') - .asFunction<_ResultInt32Void Function(ffi.Pointer, int)>( - isLeaf: true); + static final _ICU4XAnyCalendarKind_get_for_bcp47 = + _capi, ffi.Size)>>('ICU4XAnyCalendarKind_get_for_bcp47') + .asFunction<_ResultInt32Void Function(ffi.Pointer, int)>(isLeaf: true); /// Obtain the string suitable for use in the -u-ca- extension in a BCP47 locale. /// @@ -128,10 +122,7 @@ enum AnyCalendarKind { } // ignore: non_constant_identifier_names - static final _ICU4XAnyCalendarKind_bcp47 = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function(ffi.Int32, - ffi.Pointer)>>('ICU4XAnyCalendarKind_bcp47') - .asFunction<_ResultVoidInt32 Function(int, ffi.Pointer)>( - isLeaf: true); + static final _ICU4XAnyCalendarKind_bcp47 = + _capi)>>('ICU4XAnyCalendarKind_bcp47') + .asFunction<_ResultVoidInt32 Function(int, ffi.Pointer)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/Bcp47ToIanaMapper.g.dart b/ffi/capi/dart/package/lib/src/Bcp47ToIanaMapper.g.dart index ad98a2d4451..7067cb49e2a 100644 --- a/ffi/capi/dart/package/lib/src/Bcp47ToIanaMapper.g.dart +++ b/ffi/capi/dart/package/lib/src/Bcp47ToIanaMapper.g.dart @@ -15,8 +15,7 @@ final class Bcp47ToIanaMapper implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XBcp47ToIanaMapper_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XBcp47ToIanaMapper_destroy')); /// See the [Rust documentation for `new`](https://docs.rs/icu/latest/icu/timezone/struct.IanaBcp47RoundTripMapper.html#method.new) for more information. /// @@ -28,13 +27,11 @@ final class Bcp47ToIanaMapper implements ffi.Finalizable { } return Bcp47ToIanaMapper._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XBcp47ToIanaMapper_create = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer)>>('ICU4XBcp47ToIanaMapper_create') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XBcp47ToIanaMapper_create = + _capi)>>('ICU4XBcp47ToIanaMapper_create') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// Writes out the canonical IANA time zone ID corresponding to the given BCP-47 ID. /// @@ -44,10 +41,8 @@ final class Bcp47ToIanaMapper implements ffi.Finalizable { String operator [](String value) { final alloc = ffi2.Arena(); final valueSlice = _SliceFfi2Utf8._fromDart(value, alloc); - final writeable = _Writeable(); - final result = _ICU4XBcp47ToIanaMapper_get(_underlying, valueSlice._bytes, - valueSlice._length, writeable._underlying); + final result = _ICU4XBcp47ToIanaMapper_get(_underlying, valueSlice._bytes, valueSlice._length, writeable._underlying); alloc.releaseAll(); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); @@ -56,17 +51,7 @@ final class Bcp47ToIanaMapper implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XBcp47ToIanaMapper_get = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function( - ffi.Pointer, - ffi.Pointer, - ffi.Size, - ffi.Pointer)>>('ICU4XBcp47ToIanaMapper_get') - .asFunction< - _ResultVoidInt32 Function( - ffi.Pointer, - ffi.Pointer, - int, - ffi.Pointer)>(isLeaf: true); + static final _ICU4XBcp47ToIanaMapper_get = + _capi, ffi.Pointer, ffi.Size, ffi.Pointer)>>('ICU4XBcp47ToIanaMapper_get') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer, int, ffi.Pointer)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/Bidi.g.dart b/ffi/capi/dart/package/lib/src/Bidi.g.dart index bbc2e91c2a8..aa94ebe0d06 100644 --- a/ffi/capi/dart/package/lib/src/Bidi.g.dart +++ b/ffi/capi/dart/package/lib/src/Bidi.g.dart @@ -29,13 +29,11 @@ final class Bidi implements ffi.Finalizable { } return Bidi._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XBidi_create = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer)>>('ICU4XBidi_create') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XBidi_create = + _capi)>>('ICU4XBidi_create') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// Use the data loaded in this object to process a string and calculate bidi information /// @@ -45,24 +43,15 @@ final class Bidi implements ffi.Finalizable { BidiInfo forText(String text, int defaultLevel) { final alloc = ffi2.Arena(); final textSlice = _SliceFfi2Utf8._fromDart(text, alloc); - - final result = _ICU4XBidi_for_text( - _underlying, textSlice._bytes, textSlice._length, defaultLevel); + final result = _ICU4XBidi_for_text(_underlying, textSlice._bytes, textSlice._length, defaultLevel); alloc.releaseAll(); return BidiInfo._(result); } // ignore: non_constant_identifier_names - static final _ICU4XBidi_for_text = _capi< - ffi.NativeFunction< - ffi.Pointer Function( - ffi.Pointer, - ffi.Pointer, - ffi.Size, - ffi.Uint8)>>('ICU4XBidi_for_text') - .asFunction< - ffi.Pointer Function(ffi.Pointer, - ffi.Pointer, int, int)>(isLeaf: true); + static final _ICU4XBidi_for_text = + _capi Function(ffi.Pointer, ffi.Pointer, ffi.Size, ffi.Uint8)>>('ICU4XBidi_for_text') + .asFunction Function(ffi.Pointer, ffi.Pointer, int, int)>(isLeaf: true); /// Utility function for producing reorderings given a list of levels /// @@ -77,23 +66,15 @@ final class Bidi implements ffi.Finalizable { ReorderedIndexMap reorderVisual(Uint8List levels) { final alloc = ffi2.Arena(); final levelsSlice = _SliceFfiUint8._fromDart(levels, alloc); - - final result = _ICU4XBidi_reorder_visual( - _underlying, levelsSlice._bytes, levelsSlice._length); + final result = _ICU4XBidi_reorder_visual(_underlying, levelsSlice._bytes, levelsSlice._length); alloc.releaseAll(); return ReorderedIndexMap._(result); } // ignore: non_constant_identifier_names - static final _ICU4XBidi_reorder_visual = _capi< - ffi.NativeFunction< - ffi.Pointer Function( - ffi.Pointer, - ffi.Pointer, - ffi.Size)>>('ICU4XBidi_reorder_visual') - .asFunction< - ffi.Pointer Function(ffi.Pointer, - ffi.Pointer, int)>(isLeaf: true); + static final _ICU4XBidi_reorder_visual = + _capi Function(ffi.Pointer, ffi.Pointer, ffi.Size)>>('ICU4XBidi_reorder_visual') + .asFunction Function(ffi.Pointer, ffi.Pointer, int)>(isLeaf: true); /// Check if a Level returned by level_at is an RTL level. /// @@ -107,9 +88,8 @@ final class Bidi implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XBidi_level_is_rtl = - _capi>( - 'ICU4XBidi_level_is_rtl') - .asFunction(isLeaf: true); + _capi>('ICU4XBidi_level_is_rtl') + .asFunction(isLeaf: true); /// Check if a Level returned by level_at is an LTR level. /// @@ -123,21 +103,16 @@ final class Bidi implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XBidi_level_is_ltr = - _capi>( - 'ICU4XBidi_level_is_ltr') - .asFunction(isLeaf: true); + _capi>('ICU4XBidi_level_is_ltr') + .asFunction(isLeaf: true); /// Get a basic RTL Level value /// /// See the [Rust documentation for `rtl`](https://docs.rs/unicode_bidi/latest/unicode_bidi/struct.Level.html#method.rtl) for more information. - static final int levelRtl = - _capi>('ICU4XBidi_level_rtl') - .asFunction(isLeaf: true)(); + static final int levelRtl = _capi>('ICU4XBidi_level_rtl').asFunction(isLeaf: true)(); /// Get a simple LTR Level value /// /// See the [Rust documentation for `ltr`](https://docs.rs/unicode_bidi/latest/unicode_bidi/struct.Level.html#method.ltr) for more information. - static final int levelLtr = - _capi>('ICU4XBidi_level_ltr') - .asFunction(isLeaf: true)(); + static final int levelLtr = _capi>('ICU4XBidi_level_ltr').asFunction(isLeaf: true)(); } diff --git a/ffi/capi/dart/package/lib/src/BidiDirection.g.dart b/ffi/capi/dart/package/lib/src/BidiDirection.g.dart index e697e0efa1d..c7c4b413f42 100644 --- a/ffi/capi/dart/package/lib/src/BidiDirection.g.dart +++ b/ffi/capi/dart/package/lib/src/BidiDirection.g.dart @@ -7,6 +7,8 @@ part of 'lib.g.dart'; enum BidiDirection { ltr, + rtl, + mixed; } diff --git a/ffi/capi/dart/package/lib/src/BidiInfo.g.dart b/ffi/capi/dart/package/lib/src/BidiInfo.g.dart index f4e445633b1..e382d5bf853 100644 --- a/ffi/capi/dart/package/lib/src/BidiInfo.g.dart +++ b/ffi/capi/dart/package/lib/src/BidiInfo.g.dart @@ -25,9 +25,8 @@ final class BidiInfo implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XBidiInfo_paragraph_count = - _capi)>>( - 'ICU4XBidiInfo_paragraph_count') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XBidiInfo_paragraph_count') + .asFunction)>(isLeaf: true); /// Get the nth paragraph, returning `None` if out of bounds BidiParagraph? paragraphAt(int n) { @@ -36,13 +35,9 @@ final class BidiInfo implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XBidiInfo_paragraph_at = _capi< - ffi.NativeFunction< - ffi.Pointer Function(ffi.Pointer, - ffi.Size)>>('ICU4XBidiInfo_paragraph_at') - .asFunction< - ffi.Pointer Function( - ffi.Pointer, int)>(isLeaf: true); + static final _ICU4XBidiInfo_paragraph_at = + _capi Function(ffi.Pointer, ffi.Size)>>('ICU4XBidiInfo_paragraph_at') + .asFunction Function(ffi.Pointer, int)>(isLeaf: true); /// The number of bytes in this full text int get size { @@ -52,9 +47,8 @@ final class BidiInfo implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XBidiInfo_size = - _capi)>>( - 'ICU4XBidiInfo_size') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XBidiInfo_size') + .asFunction)>(isLeaf: true); /// Get the BIDI level at a particular byte index in the full text. /// This integer is conceptually a `unicode_bidi::Level`, @@ -67,9 +61,7 @@ final class BidiInfo implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XBidiInfo_level_at = _capi< - ffi.NativeFunction< - ffi.Uint8 Function( - ffi.Pointer, ffi.Size)>>('ICU4XBidiInfo_level_at') + static final _ICU4XBidiInfo_level_at = + _capi, ffi.Size)>>('ICU4XBidiInfo_level_at') .asFunction, int)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/BidiParagraph.g.dart b/ffi/capi/dart/package/lib/src/BidiParagraph.g.dart index f40eb35c895..dfe0fe23552 100644 --- a/ffi/capi/dart/package/lib/src/BidiParagraph.g.dart +++ b/ffi/capi/dart/package/lib/src/BidiParagraph.g.dart @@ -13,8 +13,7 @@ final class BidiParagraph implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XBidiParagraph_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XBidiParagraph_destroy')); /// Given a paragraph index `n` within the surrounding text, this sets this /// object to the paragraph at that index. Returns `Error::OutOfBoundsError` when out of bounds. @@ -31,12 +30,9 @@ final class BidiParagraph implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XBidiParagraph_set_paragraph_in_text = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function(ffi.Pointer, - ffi.Size)>>('ICU4XBidiParagraph_set_paragraph_in_text') - .asFunction<_ResultVoidInt32 Function(ffi.Pointer, int)>( - isLeaf: true); + static final _ICU4XBidiParagraph_set_paragraph_in_text = + _capi, ffi.Size)>>('ICU4XBidiParagraph_set_paragraph_in_text') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, int)>(isLeaf: true); /// The primary direction of this paragraph /// @@ -48,9 +44,8 @@ final class BidiParagraph implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XBidiParagraph_direction = - _capi)>>( - 'ICU4XBidiParagraph_direction') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XBidiParagraph_direction') + .asFunction)>(isLeaf: true); /// The number of bytes in this paragraph /// @@ -62,9 +57,8 @@ final class BidiParagraph implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XBidiParagraph_size = - _capi)>>( - 'ICU4XBidiParagraph_size') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XBidiParagraph_size') + .asFunction)>(isLeaf: true); /// The start index of this paragraph within the source text int get rangeStart { @@ -74,9 +68,8 @@ final class BidiParagraph implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XBidiParagraph_range_start = - _capi)>>( - 'ICU4XBidiParagraph_range_start') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XBidiParagraph_range_start') + .asFunction)>(isLeaf: true); /// The end index of this paragraph within the source text int get rangeEnd { @@ -86,9 +79,8 @@ final class BidiParagraph implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XBidiParagraph_range_end = - _capi)>>( - 'ICU4XBidiParagraph_range_end') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XBidiParagraph_range_end') + .asFunction)>(isLeaf: true); /// Reorder a line based on display order. The ranges are specified relative to the source text and must be contained /// within this paragraph's range. @@ -98,8 +90,7 @@ final class BidiParagraph implements ffi.Finalizable { /// Throws [Error] on failure. String reorderLine(int rangeStart, int rangeEnd) { final writeable = _Writeable(); - final result = _ICU4XBidiParagraph_reorder_line( - _underlying, rangeStart, rangeEnd, writeable._underlying); + final result = _ICU4XBidiParagraph_reorder_line(_underlying, rangeStart, rangeEnd, writeable._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } @@ -107,16 +98,9 @@ final class BidiParagraph implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XBidiParagraph_reorder_line = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function( - ffi.Pointer, - ffi.Size, - ffi.Size, - ffi.Pointer)>>('ICU4XBidiParagraph_reorder_line') - .asFunction< - _ResultVoidInt32 Function(ffi.Pointer, int, int, - ffi.Pointer)>(isLeaf: true); + static final _ICU4XBidiParagraph_reorder_line = + _capi, ffi.Size, ffi.Size, ffi.Pointer)>>('ICU4XBidiParagraph_reorder_line') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, int, int, ffi.Pointer)>(isLeaf: true); /// Get the BIDI level at a particular byte index in this paragraph. /// This integer is conceptually a `unicode_bidi::Level`, @@ -131,9 +115,7 @@ final class BidiParagraph implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XBidiParagraph_level_at = _capi< - ffi.NativeFunction< - ffi.Uint8 Function(ffi.Pointer, - ffi.Size)>>('ICU4XBidiParagraph_level_at') + static final _ICU4XBidiParagraph_level_at = + _capi, ffi.Size)>>('ICU4XBidiParagraph_level_at') .asFunction, int)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/Calendar.g.dart b/ffi/capi/dart/package/lib/src/Calendar.g.dart index 3061ac12b5d..732546b4e16 100644 --- a/ffi/capi/dart/package/lib/src/Calendar.g.dart +++ b/ffi/capi/dart/package/lib/src/Calendar.g.dart @@ -21,21 +21,17 @@ final class Calendar implements ffi.Finalizable { /// /// Throws [Error] on failure. factory Calendar.forLocale(DataProvider provider, Locale locale) { - final result = _ICU4XCalendar_create_for_locale( - provider._underlying, locale._underlying); + final result = _ICU4XCalendar_create_for_locale(provider._underlying, locale._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return Calendar._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCalendar_create_for_locale = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer, - ffi.Pointer)>>('ICU4XCalendar_create_for_locale') - .asFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XCalendar_create_for_locale = + _capi, ffi.Pointer)>>('ICU4XCalendar_create_for_locale') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer, ffi.Pointer)>(isLeaf: true); /// Creates a new [`Calendar`] from the specified date and time. /// @@ -43,20 +39,17 @@ final class Calendar implements ffi.Finalizable { /// /// Throws [Error] on failure. factory Calendar.forKind(DataProvider provider, AnyCalendarKind kind) { - final result = - _ICU4XCalendar_create_for_kind(provider._underlying, kind.index); + final result = _ICU4XCalendar_create_for_kind(provider._underlying, kind.index); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return Calendar._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCalendar_create_for_kind = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer, - ffi.Int32)>>('ICU4XCalendar_create_for_kind') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer, int)>( - isLeaf: true); + static final _ICU4XCalendar_create_for_kind = + _capi, ffi.Int32)>>('ICU4XCalendar_create_for_kind') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer, int)>(isLeaf: true); /// Returns the kind of this calendar /// @@ -68,7 +61,6 @@ final class Calendar implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XCalendar_kind = - _capi)>>( - 'ICU4XCalendar_kind') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XCalendar_kind') + .asFunction)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/CanonicalCombiningClassMap.g.dart b/ffi/capi/dart/package/lib/src/CanonicalCombiningClassMap.g.dart index e7eb7978934..210acf77594 100644 --- a/ffi/capi/dart/package/lib/src/CanonicalCombiningClassMap.g.dart +++ b/ffi/capi/dart/package/lib/src/CanonicalCombiningClassMap.g.dart @@ -15,8 +15,7 @@ final class CanonicalCombiningClassMap implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XCanonicalCombiningClassMap_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XCanonicalCombiningClassMap_destroy')); /// Construct a new ICU4XCanonicalCombiningClassMap instance for NFC /// @@ -24,20 +23,17 @@ final class CanonicalCombiningClassMap implements ffi.Finalizable { /// /// Throws [Error] on failure. factory CanonicalCombiningClassMap(DataProvider provider) { - final result = - _ICU4XCanonicalCombiningClassMap_create(provider._underlying); + final result = _ICU4XCanonicalCombiningClassMap_create(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return CanonicalCombiningClassMap._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCanonicalCombiningClassMap_create = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCanonicalCombiningClassMap_create') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCanonicalCombiningClassMap_create = + _capi)>>('ICU4XCanonicalCombiningClassMap_create') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `get`](https://docs.rs/icu/latest/icu/normalizer/properties/struct.CanonicalCombiningClassMap.html#method.get) for more information. /// @@ -48,10 +44,8 @@ final class CanonicalCombiningClassMap implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XCanonicalCombiningClassMap_get = _capi< - ffi.NativeFunction< - ffi.Uint8 Function(ffi.Pointer, - ffi.Uint32)>>('ICU4XCanonicalCombiningClassMap_get') + static final _ICU4XCanonicalCombiningClassMap_get = + _capi, ffi.Uint32)>>('ICU4XCanonicalCombiningClassMap_get') .asFunction, int)>(isLeaf: true); /// See the [Rust documentation for `get32`](https://docs.rs/icu/latest/icu/normalizer/properties/struct.CanonicalCombiningClassMap.html#method.get32) for more information. @@ -63,9 +57,7 @@ final class CanonicalCombiningClassMap implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XCanonicalCombiningClassMap_get32 = _capi< - ffi.NativeFunction< - ffi.Uint8 Function(ffi.Pointer, - ffi.Uint32)>>('ICU4XCanonicalCombiningClassMap_get32') + static final _ICU4XCanonicalCombiningClassMap_get32 = + _capi, ffi.Uint32)>>('ICU4XCanonicalCombiningClassMap_get32') .asFunction, int)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/CanonicalComposition.g.dart b/ffi/capi/dart/package/lib/src/CanonicalComposition.g.dart index eca14d431a1..35c82d19f7f 100644 --- a/ffi/capi/dart/package/lib/src/CanonicalComposition.g.dart +++ b/ffi/capi/dart/package/lib/src/CanonicalComposition.g.dart @@ -17,8 +17,7 @@ final class CanonicalComposition implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XCanonicalComposition_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XCanonicalComposition_destroy')); /// Construct a new ICU4XCanonicalComposition instance for NFC /// @@ -32,29 +31,23 @@ final class CanonicalComposition implements ffi.Finalizable { } return CanonicalComposition._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCanonicalComposition_create = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer)>>('ICU4XCanonicalComposition_create') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCanonicalComposition_create = + _capi)>>('ICU4XCanonicalComposition_create') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// Performs canonical composition (including Hangul) on a pair of characters /// or returns NUL if these characters don’t compose. Composition exclusions are taken into account. /// /// See the [Rust documentation for `compose`](https://docs.rs/icu/latest/icu/normalizer/properties/struct.CanonicalComposition.html#method.compose) for more information. int compose(int starter, int second) { - final result = - _ICU4XCanonicalComposition_compose(_underlying, starter, second); + final result = _ICU4XCanonicalComposition_compose(_underlying, starter, second); return result; } // ignore: non_constant_identifier_names - static final _ICU4XCanonicalComposition_compose = _capi< - ffi.NativeFunction< - ffi.Uint32 Function(ffi.Pointer, ffi.Uint32, - ffi.Uint32)>>('ICU4XCanonicalComposition_compose') - .asFunction, int, int)>( - isLeaf: true); + static final _ICU4XCanonicalComposition_compose = + _capi, ffi.Uint32, ffi.Uint32)>>('ICU4XCanonicalComposition_compose') + .asFunction, int, int)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/CanonicalDecomposition.g.dart b/ffi/capi/dart/package/lib/src/CanonicalDecomposition.g.dart index e3ba6707119..292dac8f25a 100644 --- a/ffi/capi/dart/package/lib/src/CanonicalDecomposition.g.dart +++ b/ffi/capi/dart/package/lib/src/CanonicalDecomposition.g.dart @@ -17,8 +17,7 @@ final class CanonicalDecomposition implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XCanonicalDecomposition_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XCanonicalDecomposition_destroy')); /// Construct a new ICU4XCanonicalDecomposition instance for NFC /// @@ -32,13 +31,11 @@ final class CanonicalDecomposition implements ffi.Finalizable { } return CanonicalDecomposition._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCanonicalDecomposition_create = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCanonicalDecomposition_create') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCanonicalDecomposition_create = + _capi)>>('ICU4XCanonicalDecomposition_create') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// Performs non-recursive canonical decomposition (including for Hangul). /// @@ -49,10 +46,7 @@ final class CanonicalDecomposition implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XCanonicalDecomposition_decompose = _capi< - ffi.NativeFunction< - _DecomposedFfi Function(ffi.Pointer, - ffi.Uint32)>>('ICU4XCanonicalDecomposition_decompose') - .asFunction<_DecomposedFfi Function(ffi.Pointer, int)>( - isLeaf: true); + static final _ICU4XCanonicalDecomposition_decompose = + _capi, ffi.Uint32)>>('ICU4XCanonicalDecomposition_decompose') + .asFunction<_DecomposedFfi Function(ffi.Pointer, int)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/CaseMapCloser.g.dart b/ffi/capi/dart/package/lib/src/CaseMapCloser.g.dart index d6a73b92a94..ffb6a9397b4 100644 --- a/ffi/capi/dart/package/lib/src/CaseMapCloser.g.dart +++ b/ffi/capi/dart/package/lib/src/CaseMapCloser.g.dart @@ -13,8 +13,7 @@ final class CaseMapCloser implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XCaseMapCloser_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XCaseMapCloser_destroy')); /// Construct a new ICU4XCaseMapper instance /// @@ -28,32 +27,24 @@ final class CaseMapCloser implements ffi.Finalizable { } return CaseMapCloser._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCaseMapCloser_create = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer)>>('ICU4XCaseMapCloser_create') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCaseMapCloser_create = + _capi)>>('ICU4XCaseMapCloser_create') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// Adds all simple case mappings and the full case folding for `c` to `builder`. /// Also adds special case closure mappings. /// /// See the [Rust documentation for `add_case_closure_to`](https://docs.rs/icu/latest/icu/casemap/struct.CaseMapCloser.html#method.add_case_closure_to) for more information. void addCaseClosureTo(int c, CodePointSetBuilder builder) { - _ICU4XCaseMapCloser_add_case_closure_to( - _underlying, c, builder._underlying); + _ICU4XCaseMapCloser_add_case_closure_to(_underlying, c, builder._underlying); } // ignore: non_constant_identifier_names - static final _ICU4XCaseMapCloser_add_case_closure_to = _capi< - ffi.NativeFunction< - ffi.Void Function(ffi.Pointer, ffi.Uint32, - ffi.Pointer)>>( - 'ICU4XCaseMapCloser_add_case_closure_to') - .asFunction< - void Function(ffi.Pointer, int, - ffi.Pointer)>(isLeaf: true); + static final _ICU4XCaseMapCloser_add_case_closure_to = + _capi, ffi.Uint32, ffi.Pointer)>>('ICU4XCaseMapCloser_add_case_closure_to') + .asFunction, int, ffi.Pointer)>(isLeaf: true); /// Finds all characters and strings which may casemap to `s` as their full case folding string /// and adds them to the set. @@ -64,23 +55,13 @@ final class CaseMapCloser implements ffi.Finalizable { bool addStringCaseClosureTo(String s, CodePointSetBuilder builder) { final alloc = ffi2.Arena(); final sSlice = _SliceFfi2Utf8._fromDart(s, alloc); - - final result = _ICU4XCaseMapCloser_add_string_case_closure_to( - _underlying, sSlice._bytes, sSlice._length, builder._underlying); + final result = _ICU4XCaseMapCloser_add_string_case_closure_to(_underlying, sSlice._bytes, sSlice._length, builder._underlying); alloc.releaseAll(); return result; } // ignore: non_constant_identifier_names - static final _ICU4XCaseMapCloser_add_string_case_closure_to = _capi< - ffi.NativeFunction< - ffi.Bool Function( - ffi.Pointer, - ffi.Pointer, - ffi.Size, - ffi.Pointer)>>( - 'ICU4XCaseMapCloser_add_string_case_closure_to') - .asFunction< - bool Function(ffi.Pointer, ffi.Pointer, int, - ffi.Pointer)>(isLeaf: true); + static final _ICU4XCaseMapCloser_add_string_case_closure_to = + _capi, ffi.Pointer, ffi.Size, ffi.Pointer)>>('ICU4XCaseMapCloser_add_string_case_closure_to') + .asFunction, ffi.Pointer, int, ffi.Pointer)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/CaseMapper.g.dart b/ffi/capi/dart/package/lib/src/CaseMapper.g.dart index 78ede2aec5a..657b7de77c0 100644 --- a/ffi/capi/dart/package/lib/src/CaseMapper.g.dart +++ b/ffi/capi/dart/package/lib/src/CaseMapper.g.dart @@ -13,8 +13,7 @@ final class CaseMapper implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XCaseMapper_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XCaseMapper_destroy')); /// Construct a new ICU4XCaseMapper instance /// @@ -28,13 +27,11 @@ final class CaseMapper implements ffi.Finalizable { } return CaseMapper._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCaseMapper_create = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer)>>('ICU4XCaseMapper_create') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCaseMapper_create = + _capi)>>('ICU4XCaseMapper_create') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// Returns the full lowercase mapping of the given string /// @@ -44,10 +41,8 @@ final class CaseMapper implements ffi.Finalizable { String lowercase(String s, Locale locale) { final alloc = ffi2.Arena(); final sSlice = _SliceFfi2Utf8._fromDart(s, alloc); - final writeable = _Writeable(); - final result = _ICU4XCaseMapper_lowercase(_underlying, sSlice._bytes, - sSlice._length, locale._underlying, writeable._underlying); + final result = _ICU4XCaseMapper_lowercase(_underlying, sSlice._bytes, sSlice._length, locale._underlying, writeable._underlying); alloc.releaseAll(); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); @@ -56,21 +51,9 @@ final class CaseMapper implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XCaseMapper_lowercase = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function( - ffi.Pointer, - ffi.Pointer, - ffi.Size, - ffi.Pointer, - ffi.Pointer)>>('ICU4XCaseMapper_lowercase') - .asFunction< - _ResultVoidInt32 Function( - ffi.Pointer, - ffi.Pointer, - int, - ffi.Pointer, - ffi.Pointer)>(isLeaf: true); + static final _ICU4XCaseMapper_lowercase = + _capi, ffi.Pointer, ffi.Size, ffi.Pointer, ffi.Pointer)>>('ICU4XCaseMapper_lowercase') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer, int, ffi.Pointer, ffi.Pointer)>(isLeaf: true); /// Returns the full uppercase mapping of the given string /// @@ -80,10 +63,8 @@ final class CaseMapper implements ffi.Finalizable { String uppercase(String s, Locale locale) { final alloc = ffi2.Arena(); final sSlice = _SliceFfi2Utf8._fromDart(s, alloc); - final writeable = _Writeable(); - final result = _ICU4XCaseMapper_uppercase(_underlying, sSlice._bytes, - sSlice._length, locale._underlying, writeable._underlying); + final result = _ICU4XCaseMapper_uppercase(_underlying, sSlice._bytes, sSlice._length, locale._underlying, writeable._underlying); alloc.releaseAll(); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); @@ -92,21 +73,9 @@ final class CaseMapper implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XCaseMapper_uppercase = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function( - ffi.Pointer, - ffi.Pointer, - ffi.Size, - ffi.Pointer, - ffi.Pointer)>>('ICU4XCaseMapper_uppercase') - .asFunction< - _ResultVoidInt32 Function( - ffi.Pointer, - ffi.Pointer, - int, - ffi.Pointer, - ffi.Pointer)>(isLeaf: true); + static final _ICU4XCaseMapper_uppercase = + _capi, ffi.Pointer, ffi.Size, ffi.Pointer, ffi.Pointer)>>('ICU4XCaseMapper_uppercase') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer, int, ffi.Pointer, ffi.Pointer)>(isLeaf: true); /// Returns the full titlecase mapping of the given string, performing head adjustment without /// loading additional data. @@ -117,19 +86,11 @@ final class CaseMapper implements ffi.Finalizable { /// See the [Rust documentation for `titlecase_segment_with_only_case_data`](https://docs.rs/icu/latest/icu/casemap/struct.CaseMapper.html#method.titlecase_segment_with_only_case_data) for more information. /// /// Throws [Error] on failure. - String titlecaseSegmentWithOnlyCaseDataV1( - String s, Locale locale, TitlecaseOptionsV1 options) { + String titlecaseSegmentWithOnlyCaseDataV1(String s, Locale locale, TitlecaseOptionsV1 options) { final alloc = ffi2.Arena(); final sSlice = _SliceFfi2Utf8._fromDart(s, alloc); - final writeable = _Writeable(); - final result = _ICU4XCaseMapper_titlecase_segment_with_only_case_data_v1( - _underlying, - sSlice._bytes, - sSlice._length, - locale._underlying, - options._underlying, - writeable._underlying); + final result = _ICU4XCaseMapper_titlecase_segment_with_only_case_data_v1(_underlying, sSlice._bytes, sSlice._length, locale._underlying, options._underlying, writeable._underlying); alloc.releaseAll(); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); @@ -139,24 +100,8 @@ final class CaseMapper implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XCaseMapper_titlecase_segment_with_only_case_data_v1 = - _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function( - ffi.Pointer, - ffi.Pointer, - ffi.Size, - ffi.Pointer, - _TitlecaseOptionsV1Ffi, - ffi.Pointer)>>( - 'ICU4XCaseMapper_titlecase_segment_with_only_case_data_v1') - .asFunction< - _ResultVoidInt32 Function( - ffi.Pointer, - ffi.Pointer, - int, - ffi.Pointer, - _TitlecaseOptionsV1Ffi, - ffi.Pointer)>(isLeaf: true); + _capi, ffi.Pointer, ffi.Size, ffi.Pointer, _TitlecaseOptionsV1Ffi, ffi.Pointer)>>('ICU4XCaseMapper_titlecase_segment_with_only_case_data_v1') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer, int, ffi.Pointer, _TitlecaseOptionsV1Ffi, ffi.Pointer)>(isLeaf: true); /// Case-folds the characters in the given string /// @@ -166,10 +111,8 @@ final class CaseMapper implements ffi.Finalizable { String fold(String s) { final alloc = ffi2.Arena(); final sSlice = _SliceFfi2Utf8._fromDart(s, alloc); - final writeable = _Writeable(); - final result = _ICU4XCaseMapper_fold( - _underlying, sSlice._bytes, sSlice._length, writeable._underlying); + final result = _ICU4XCaseMapper_fold(_underlying, sSlice._bytes, sSlice._length, writeable._underlying); alloc.releaseAll(); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); @@ -178,19 +121,9 @@ final class CaseMapper implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XCaseMapper_fold = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function( - ffi.Pointer, - ffi.Pointer, - ffi.Size, - ffi.Pointer)>>('ICU4XCaseMapper_fold') - .asFunction< - _ResultVoidInt32 Function( - ffi.Pointer, - ffi.Pointer, - int, - ffi.Pointer)>(isLeaf: true); + static final _ICU4XCaseMapper_fold = + _capi, ffi.Pointer, ffi.Size, ffi.Pointer)>>('ICU4XCaseMapper_fold') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer, int, ffi.Pointer)>(isLeaf: true); /// Case-folds the characters in the given string /// using Turkic (T) mappings for dotted/dotless I. @@ -201,10 +134,8 @@ final class CaseMapper implements ffi.Finalizable { String foldTurkic(String s) { final alloc = ffi2.Arena(); final sSlice = _SliceFfi2Utf8._fromDart(s, alloc); - final writeable = _Writeable(); - final result = _ICU4XCaseMapper_fold_turkic( - _underlying, sSlice._bytes, sSlice._length, writeable._underlying); + final result = _ICU4XCaseMapper_fold_turkic(_underlying, sSlice._bytes, sSlice._length, writeable._underlying); alloc.releaseAll(); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); @@ -213,19 +144,9 @@ final class CaseMapper implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XCaseMapper_fold_turkic = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function( - ffi.Pointer, - ffi.Pointer, - ffi.Size, - ffi.Pointer)>>('ICU4XCaseMapper_fold_turkic') - .asFunction< - _ResultVoidInt32 Function( - ffi.Pointer, - ffi.Pointer, - int, - ffi.Pointer)>(isLeaf: true); + static final _ICU4XCaseMapper_fold_turkic = + _capi, ffi.Pointer, ffi.Size, ffi.Pointer)>>('ICU4XCaseMapper_fold_turkic') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer, int, ffi.Pointer)>(isLeaf: true); /// Adds all simple case mappings and the full case folding for `c` to `builder`. /// Also adds special case closure mappings. @@ -245,14 +166,9 @@ final class CaseMapper implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XCaseMapper_add_case_closure_to = _capi< - ffi.NativeFunction< - ffi.Void Function(ffi.Pointer, ffi.Uint32, - ffi.Pointer)>>( - 'ICU4XCaseMapper_add_case_closure_to') - .asFunction< - void Function(ffi.Pointer, int, - ffi.Pointer)>(isLeaf: true); + static final _ICU4XCaseMapper_add_case_closure_to = + _capi, ffi.Uint32, ffi.Pointer)>>('ICU4XCaseMapper_add_case_closure_to') + .asFunction, int, ffi.Pointer)>(isLeaf: true); /// Returns the simple lowercase mapping of the given character. /// @@ -267,10 +183,8 @@ final class CaseMapper implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XCaseMapper_simple_lowercase = _capi< - ffi.NativeFunction< - ffi.Uint32 Function(ffi.Pointer, - ffi.Uint32)>>('ICU4XCaseMapper_simple_lowercase') + static final _ICU4XCaseMapper_simple_lowercase = + _capi, ffi.Uint32)>>('ICU4XCaseMapper_simple_lowercase') .asFunction, int)>(isLeaf: true); /// Returns the simple uppercase mapping of the given character. @@ -286,10 +200,8 @@ final class CaseMapper implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XCaseMapper_simple_uppercase = _capi< - ffi.NativeFunction< - ffi.Uint32 Function(ffi.Pointer, - ffi.Uint32)>>('ICU4XCaseMapper_simple_uppercase') + static final _ICU4XCaseMapper_simple_uppercase = + _capi, ffi.Uint32)>>('ICU4XCaseMapper_simple_uppercase') .asFunction, int)>(isLeaf: true); /// Returns the simple titlecase mapping of the given character. @@ -305,10 +217,8 @@ final class CaseMapper implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XCaseMapper_simple_titlecase = _capi< - ffi.NativeFunction< - ffi.Uint32 Function(ffi.Pointer, - ffi.Uint32)>>('ICU4XCaseMapper_simple_titlecase') + static final _ICU4XCaseMapper_simple_titlecase = + _capi, ffi.Uint32)>>('ICU4XCaseMapper_simple_titlecase') .asFunction, int)>(isLeaf: true); /// Returns the simple casefolding of the given character. @@ -323,10 +233,8 @@ final class CaseMapper implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XCaseMapper_simple_fold = _capi< - ffi.NativeFunction< - ffi.Uint32 Function(ffi.Pointer, - ffi.Uint32)>>('ICU4XCaseMapper_simple_fold') + static final _ICU4XCaseMapper_simple_fold = + _capi, ffi.Uint32)>>('ICU4XCaseMapper_simple_fold') .asFunction, int)>(isLeaf: true); /// Returns the simple casefolding of the given character in the Turkic locale @@ -341,9 +249,7 @@ final class CaseMapper implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XCaseMapper_simple_fold_turkic = _capi< - ffi.NativeFunction< - ffi.Uint32 Function(ffi.Pointer, - ffi.Uint32)>>('ICU4XCaseMapper_simple_fold_turkic') + static final _ICU4XCaseMapper_simple_fold_turkic = + _capi, ffi.Uint32)>>('ICU4XCaseMapper_simple_fold_turkic') .asFunction, int)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/CodePointMapData16.g.dart b/ffi/capi/dart/package/lib/src/CodePointMapData16.g.dart index 7dcfae79d0b..51bd4b222fc 100644 --- a/ffi/capi/dart/package/lib/src/CodePointMapData16.g.dart +++ b/ffi/capi/dart/package/lib/src/CodePointMapData16.g.dart @@ -21,8 +21,7 @@ final class CodePointMapData16 implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XCodePointMapData16_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XCodePointMapData16_destroy')); /// Gets the value for a code point. /// @@ -33,10 +32,8 @@ final class CodePointMapData16 implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XCodePointMapData16_get = _capi< - ffi.NativeFunction< - ffi.Uint16 Function(ffi.Pointer, - ffi.Uint32)>>('ICU4XCodePointMapData16_get') + static final _ICU4XCodePointMapData16_get = + _capi, ffi.Uint32)>>('ICU4XCodePointMapData16_get') .asFunction, int)>(isLeaf: true); /// Gets the value for a code point (specified as a 32 bit integer, in UTF-32) @@ -46,67 +43,48 @@ final class CodePointMapData16 implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XCodePointMapData16_get32 = _capi< - ffi.NativeFunction< - ffi.Uint16 Function(ffi.Pointer, - ffi.Uint32)>>('ICU4XCodePointMapData16_get32') + static final _ICU4XCodePointMapData16_get32 = + _capi, ffi.Uint32)>>('ICU4XCodePointMapData16_get32') .asFunction, int)>(isLeaf: true); /// Produces an iterator over ranges of code points that map to `value` /// /// See the [Rust documentation for `iter_ranges_for_value`](https://docs.rs/icu/latest/icu/properties/maps/struct.CodePointMapDataBorrowed.html#method.iter_ranges_for_value) for more information. CodePointRangeIterator iterRangesForValue(int value) { - final result = - _ICU4XCodePointMapData16_iter_ranges_for_value(_underlying, value); + final result = _ICU4XCodePointMapData16_iter_ranges_for_value(_underlying, value); return CodePointRangeIterator._(result); } // ignore: non_constant_identifier_names - static final _ICU4XCodePointMapData16_iter_ranges_for_value = _capi< - ffi.NativeFunction< - ffi.Pointer Function(ffi.Pointer, - ffi.Uint16)>>('ICU4XCodePointMapData16_iter_ranges_for_value') - .asFunction< - ffi.Pointer Function( - ffi.Pointer, int)>(isLeaf: true); + static final _ICU4XCodePointMapData16_iter_ranges_for_value = + _capi Function(ffi.Pointer, ffi.Uint16)>>('ICU4XCodePointMapData16_iter_ranges_for_value') + .asFunction Function(ffi.Pointer, int)>(isLeaf: true); /// Produces an iterator over ranges of code points that do not map to `value` /// /// See the [Rust documentation for `iter_ranges_for_value_complemented`](https://docs.rs/icu/latest/icu/properties/maps/struct.CodePointMapDataBorrowed.html#method.iter_ranges_for_value_complemented) for more information. CodePointRangeIterator iterRangesForValueComplemented(int value) { - final result = _ICU4XCodePointMapData16_iter_ranges_for_value_complemented( - _underlying, value); + final result = _ICU4XCodePointMapData16_iter_ranges_for_value_complemented(_underlying, value); return CodePointRangeIterator._(result); } // ignore: non_constant_identifier_names static final _ICU4XCodePointMapData16_iter_ranges_for_value_complemented = - _capi< - ffi.NativeFunction< - ffi.Pointer Function( - ffi.Pointer, ffi.Uint16)>>( - 'ICU4XCodePointMapData16_iter_ranges_for_value_complemented') - .asFunction< - ffi.Pointer Function( - ffi.Pointer, int)>(isLeaf: true); + _capi Function(ffi.Pointer, ffi.Uint16)>>('ICU4XCodePointMapData16_iter_ranges_for_value_complemented') + .asFunction Function(ffi.Pointer, int)>(isLeaf: true); /// Gets a [`CodePointSetData`] representing all entries in this map that map to the given value /// /// See the [Rust documentation for `get_set_for_value`](https://docs.rs/icu/latest/icu/properties/maps/struct.CodePointMapDataBorrowed.html#method.get_set_for_value) for more information. CodePointSetData getSetForValue(int value) { - final result = - _ICU4XCodePointMapData16_get_set_for_value(_underlying, value); + final result = _ICU4XCodePointMapData16_get_set_for_value(_underlying, value); return CodePointSetData._(result); } // ignore: non_constant_identifier_names - static final _ICU4XCodePointMapData16_get_set_for_value = _capi< - ffi.NativeFunction< - ffi.Pointer Function(ffi.Pointer, - ffi.Uint16)>>('ICU4XCodePointMapData16_get_set_for_value') - .asFunction< - ffi.Pointer Function( - ffi.Pointer, int)>(isLeaf: true); + static final _ICU4XCodePointMapData16_get_set_for_value = + _capi Function(ffi.Pointer, ffi.Uint16)>>('ICU4XCodePointMapData16_get_set_for_value') + .asFunction Function(ffi.Pointer, int)>(isLeaf: true); /// See the [Rust documentation for `script`](https://docs.rs/icu/latest/icu/properties/maps/fn.script.html) for more information. /// @@ -118,11 +96,9 @@ final class CodePointMapData16 implements ffi.Finalizable { } return CodePointMapData16._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointMapData16_load_script = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointMapData16_load_script') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointMapData16_load_script = + _capi)>>('ICU4XCodePointMapData16_load_script') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/CodePointMapData8.g.dart b/ffi/capi/dart/package/lib/src/CodePointMapData8.g.dart index d2ef86a94c6..50a4f4d5c76 100644 --- a/ffi/capi/dart/package/lib/src/CodePointMapData8.g.dart +++ b/ffi/capi/dart/package/lib/src/CodePointMapData8.g.dart @@ -21,8 +21,7 @@ final class CodePointMapData8 implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XCodePointMapData8_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XCodePointMapData8_destroy')); /// Gets the value for a code point. /// @@ -33,10 +32,8 @@ final class CodePointMapData8 implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XCodePointMapData8_get = _capi< - ffi.NativeFunction< - ffi.Uint8 Function(ffi.Pointer, - ffi.Uint32)>>('ICU4XCodePointMapData8_get') + static final _ICU4XCodePointMapData8_get = + _capi, ffi.Uint32)>>('ICU4XCodePointMapData8_get') .asFunction, int)>(isLeaf: true); /// Gets the value for a code point (specified as a 32 bit integer, in UTF-32) @@ -46,10 +43,8 @@ final class CodePointMapData8 implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XCodePointMapData8_get32 = _capi< - ffi.NativeFunction< - ffi.Uint8 Function(ffi.Pointer, - ffi.Uint32)>>('ICU4XCodePointMapData8_get32') + static final _ICU4XCodePointMapData8_get32 = + _capi, ffi.Uint32)>>('ICU4XCodePointMapData8_get32') .asFunction, int)>(isLeaf: true); /// Converts a general category to its corresponding mask value @@ -64,47 +59,34 @@ final class CodePointMapData8 implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XCodePointMapData8_general_category_to_mask = - _capi>( - 'ICU4XCodePointMapData8_general_category_to_mask') - .asFunction(isLeaf: true); + _capi>('ICU4XCodePointMapData8_general_category_to_mask') + .asFunction(isLeaf: true); /// Produces an iterator over ranges of code points that map to `value` /// /// See the [Rust documentation for `iter_ranges_for_value`](https://docs.rs/icu/latest/icu/properties/maps/struct.CodePointMapDataBorrowed.html#method.iter_ranges_for_value) for more information. CodePointRangeIterator iterRangesForValue(int value) { - final result = - _ICU4XCodePointMapData8_iter_ranges_for_value(_underlying, value); + final result = _ICU4XCodePointMapData8_iter_ranges_for_value(_underlying, value); return CodePointRangeIterator._(result); } // ignore: non_constant_identifier_names - static final _ICU4XCodePointMapData8_iter_ranges_for_value = _capi< - ffi.NativeFunction< - ffi.Pointer Function(ffi.Pointer, - ffi.Uint8)>>('ICU4XCodePointMapData8_iter_ranges_for_value') - .asFunction< - ffi.Pointer Function( - ffi.Pointer, int)>(isLeaf: true); + static final _ICU4XCodePointMapData8_iter_ranges_for_value = + _capi Function(ffi.Pointer, ffi.Uint8)>>('ICU4XCodePointMapData8_iter_ranges_for_value') + .asFunction Function(ffi.Pointer, int)>(isLeaf: true); /// Produces an iterator over ranges of code points that do not map to `value` /// /// See the [Rust documentation for `iter_ranges_for_value_complemented`](https://docs.rs/icu/latest/icu/properties/maps/struct.CodePointMapDataBorrowed.html#method.iter_ranges_for_value_complemented) for more information. CodePointRangeIterator iterRangesForValueComplemented(int value) { - final result = _ICU4XCodePointMapData8_iter_ranges_for_value_complemented( - _underlying, value); + final result = _ICU4XCodePointMapData8_iter_ranges_for_value_complemented(_underlying, value); return CodePointRangeIterator._(result); } // ignore: non_constant_identifier_names static final _ICU4XCodePointMapData8_iter_ranges_for_value_complemented = - _capi< - ffi.NativeFunction< - ffi.Pointer Function( - ffi.Pointer, ffi.Uint8)>>( - 'ICU4XCodePointMapData8_iter_ranges_for_value_complemented') - .asFunction< - ffi.Pointer Function( - ffi.Pointer, int)>(isLeaf: true); + _capi Function(ffi.Pointer, ffi.Uint8)>>('ICU4XCodePointMapData8_iter_ranges_for_value_complemented') + .asFunction Function(ffi.Pointer, int)>(isLeaf: true); /// Given a mask value (the nth bit marks property value = n), produce an iterator over ranges of code points /// whose property values are contained in the mask. @@ -117,187 +99,153 @@ final class CodePointMapData8 implements ffi.Finalizable { /// /// See the [Rust documentation for `iter_ranges_for_group`](https://docs.rs/icu/latest/icu/properties/maps/struct.CodePointMapDataBorrowed.html#method.iter_ranges_for_group) for more information. CodePointRangeIterator iterRangesForMask(int mask) { - final result = - _ICU4XCodePointMapData8_iter_ranges_for_mask(_underlying, mask); + final result = _ICU4XCodePointMapData8_iter_ranges_for_mask(_underlying, mask); return CodePointRangeIterator._(result); } // ignore: non_constant_identifier_names - static final _ICU4XCodePointMapData8_iter_ranges_for_mask = _capi< - ffi.NativeFunction< - ffi.Pointer Function(ffi.Pointer, - ffi.Uint32)>>('ICU4XCodePointMapData8_iter_ranges_for_mask') - .asFunction< - ffi.Pointer Function( - ffi.Pointer, int)>(isLeaf: true); + static final _ICU4XCodePointMapData8_iter_ranges_for_mask = + _capi Function(ffi.Pointer, ffi.Uint32)>>('ICU4XCodePointMapData8_iter_ranges_for_mask') + .asFunction Function(ffi.Pointer, int)>(isLeaf: true); /// Gets a [`CodePointSetData`] representing all entries in this map that map to the given value /// /// See the [Rust documentation for `get_set_for_value`](https://docs.rs/icu/latest/icu/properties/maps/struct.CodePointMapDataBorrowed.html#method.get_set_for_value) for more information. CodePointSetData getSetForValue(int value) { - final result = - _ICU4XCodePointMapData8_get_set_for_value(_underlying, value); + final result = _ICU4XCodePointMapData8_get_set_for_value(_underlying, value); return CodePointSetData._(result); } // ignore: non_constant_identifier_names - static final _ICU4XCodePointMapData8_get_set_for_value = _capi< - ffi.NativeFunction< - ffi.Pointer Function(ffi.Pointer, - ffi.Uint8)>>('ICU4XCodePointMapData8_get_set_for_value') - .asFunction< - ffi.Pointer Function( - ffi.Pointer, int)>(isLeaf: true); + static final _ICU4XCodePointMapData8_get_set_for_value = + _capi Function(ffi.Pointer, ffi.Uint8)>>('ICU4XCodePointMapData8_get_set_for_value') + .asFunction Function(ffi.Pointer, int)>(isLeaf: true); /// See the [Rust documentation for `general_category`](https://docs.rs/icu/latest/icu/properties/maps/fn.general_category.html) for more information. /// /// Throws [Error] on failure. factory CodePointMapData8.loadGeneralCategory(DataProvider provider) { - final result = - _ICU4XCodePointMapData8_load_general_category(provider._underlying); + final result = _ICU4XCodePointMapData8_load_general_category(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return CodePointMapData8._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointMapData8_load_general_category = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointMapData8_load_general_category') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointMapData8_load_general_category = + _capi)>>('ICU4XCodePointMapData8_load_general_category') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `bidi_class`](https://docs.rs/icu/latest/icu/properties/maps/fn.bidi_class.html) for more information. /// /// Throws [Error] on failure. factory CodePointMapData8.loadBidiClass(DataProvider provider) { - final result = - _ICU4XCodePointMapData8_load_bidi_class(provider._underlying); + final result = _ICU4XCodePointMapData8_load_bidi_class(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return CodePointMapData8._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointMapData8_load_bidi_class = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointMapData8_load_bidi_class') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointMapData8_load_bidi_class = + _capi)>>('ICU4XCodePointMapData8_load_bidi_class') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `east_asian_width`](https://docs.rs/icu/latest/icu/properties/maps/fn.east_asian_width.html) for more information. /// /// Throws [Error] on failure. factory CodePointMapData8.loadEastAsianWidth(DataProvider provider) { - final result = - _ICU4XCodePointMapData8_load_east_asian_width(provider._underlying); + final result = _ICU4XCodePointMapData8_load_east_asian_width(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return CodePointMapData8._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointMapData8_load_east_asian_width = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointMapData8_load_east_asian_width') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointMapData8_load_east_asian_width = + _capi)>>('ICU4XCodePointMapData8_load_east_asian_width') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `indic_syllabic_category`](https://docs.rs/icu/latest/icu/properties/maps/fn.indic_syllabic_category.html) for more information. /// /// Throws [Error] on failure. factory CodePointMapData8.loadIndicSyllabicCategory(DataProvider provider) { - final result = _ICU4XCodePointMapData8_load_indic_syllabic_category( - provider._underlying); + final result = _ICU4XCodePointMapData8_load_indic_syllabic_category(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return CodePointMapData8._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointMapData8_load_indic_syllabic_category = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointMapData8_load_indic_syllabic_category') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointMapData8_load_indic_syllabic_category = + _capi)>>('ICU4XCodePointMapData8_load_indic_syllabic_category') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `line_break`](https://docs.rs/icu/latest/icu/properties/maps/fn.line_break.html) for more information. /// /// Throws [Error] on failure. factory CodePointMapData8.loadLineBreak(DataProvider provider) { - final result = - _ICU4XCodePointMapData8_load_line_break(provider._underlying); + final result = _ICU4XCodePointMapData8_load_line_break(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return CodePointMapData8._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointMapData8_load_line_break = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointMapData8_load_line_break') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointMapData8_load_line_break = + _capi)>>('ICU4XCodePointMapData8_load_line_break') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `grapheme_cluster_break`](https://docs.rs/icu/latest/icu/properties/maps/fn.grapheme_cluster_break.html) for more information. /// /// Throws [Error] on failure. factory CodePointMapData8.graphemeClusterBreak(DataProvider provider) { - final result = _ICU4XCodePointMapData8_try_grapheme_cluster_break( - provider._underlying); + final result = _ICU4XCodePointMapData8_try_grapheme_cluster_break(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return CodePointMapData8._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointMapData8_try_grapheme_cluster_break = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointMapData8_try_grapheme_cluster_break') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointMapData8_try_grapheme_cluster_break = + _capi)>>('ICU4XCodePointMapData8_try_grapheme_cluster_break') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `word_break`](https://docs.rs/icu/latest/icu/properties/maps/fn.word_break.html) for more information. /// /// Throws [Error] on failure. factory CodePointMapData8.loadWordBreak(DataProvider provider) { - final result = - _ICU4XCodePointMapData8_load_word_break(provider._underlying); + final result = _ICU4XCodePointMapData8_load_word_break(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return CodePointMapData8._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointMapData8_load_word_break = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointMapData8_load_word_break') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointMapData8_load_word_break = + _capi)>>('ICU4XCodePointMapData8_load_word_break') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `sentence_break`](https://docs.rs/icu/latest/icu/properties/maps/fn.sentence_break.html) for more information. /// /// Throws [Error] on failure. factory CodePointMapData8.loadSentenceBreak(DataProvider provider) { - final result = - _ICU4XCodePointMapData8_load_sentence_break(provider._underlying); + final result = _ICU4XCodePointMapData8_load_sentence_break(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return CodePointMapData8._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointMapData8_load_sentence_break = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointMapData8_load_sentence_break') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointMapData8_load_sentence_break = + _capi)>>('ICU4XCodePointMapData8_load_sentence_break') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/CodePointRangeIterator.g.dart b/ffi/capi/dart/package/lib/src/CodePointRangeIterator.g.dart index e64e1711f0c..11e66faa101 100644 --- a/ffi/capi/dart/package/lib/src/CodePointRangeIterator.g.dart +++ b/ffi/capi/dart/package/lib/src/CodePointRangeIterator.g.dart @@ -14,8 +14,7 @@ final class CodePointRangeIterator implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('CodePointRangeIterator_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('CodePointRangeIterator_destroy')); /// Advance the iterator by one and return the next range. /// @@ -26,11 +25,7 @@ final class CodePointRangeIterator implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _CodePointRangeIterator_next = _capi< - ffi.NativeFunction< - _CodePointRangeIteratorResultFfi Function( - ffi.Pointer)>>('CodePointRangeIterator_next') - .asFunction< - _CodePointRangeIteratorResultFfi Function( - ffi.Pointer)>(isLeaf: true); + static final _CodePointRangeIterator_next = + _capi)>>('CodePointRangeIterator_next') + .asFunction<_CodePointRangeIteratorResultFfi Function(ffi.Pointer)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/CodePointSetBuilder.g.dart b/ffi/capi/dart/package/lib/src/CodePointSetBuilder.g.dart index 98595877556..bc5329c42aa 100644 --- a/ffi/capi/dart/package/lib/src/CodePointSetBuilder.g.dart +++ b/ffi/capi/dart/package/lib/src/CodePointSetBuilder.g.dart @@ -13,8 +13,7 @@ final class CodePointSetBuilder implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XCodePointSetBuilder_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XCodePointSetBuilder_destroy')); /// Make a new set builder containing nothing /// @@ -23,11 +22,11 @@ final class CodePointSetBuilder implements ffi.Finalizable { final result = _ICU4XCodePointSetBuilder_create(); return CodePointSetBuilder._(result); } + // ignore: non_constant_identifier_names static final _ICU4XCodePointSetBuilder_create = - _capi Function()>>( - 'ICU4XCodePointSetBuilder_create') - .asFunction Function()>(isLeaf: true); + _capi Function()>>('ICU4XCodePointSetBuilder_create') + .asFunction Function()>(isLeaf: true); /// Build this into a set /// @@ -40,12 +39,9 @@ final class CodePointSetBuilder implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetBuilder_build = _capi< - ffi.NativeFunction< - ffi.Pointer Function( - ffi.Pointer)>>('ICU4XCodePointSetBuilder_build') - .asFunction Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetBuilder_build = + _capi Function(ffi.Pointer)>>('ICU4XCodePointSetBuilder_build') + .asFunction Function(ffi.Pointer)>(isLeaf: true); /// Complements this set /// @@ -58,9 +54,8 @@ final class CodePointSetBuilder implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XCodePointSetBuilder_complement = - _capi)>>( - 'ICU4XCodePointSetBuilder_complement') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XCodePointSetBuilder_complement') + .asFunction)>(isLeaf: true); /// Returns whether this set is empty /// @@ -72,9 +67,8 @@ final class CodePointSetBuilder implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XCodePointSetBuilder_is_empty = - _capi)>>( - 'ICU4XCodePointSetBuilder_is_empty') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XCodePointSetBuilder_is_empty') + .asFunction)>(isLeaf: true); /// Add a single character to the set /// @@ -84,10 +78,8 @@ final class CodePointSetBuilder implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetBuilder_add_char = _capi< - ffi.NativeFunction< - ffi.Void Function(ffi.Pointer, - ffi.Uint32)>>('ICU4XCodePointSetBuilder_add_char') + static final _ICU4XCodePointSetBuilder_add_char = + _capi, ffi.Uint32)>>('ICU4XCodePointSetBuilder_add_char') .asFunction, int)>(isLeaf: true); /// Add an inclusive range of characters to the set @@ -98,12 +90,9 @@ final class CodePointSetBuilder implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetBuilder_add_inclusive_range = _capi< - ffi.NativeFunction< - ffi.Void Function(ffi.Pointer, ffi.Uint32, - ffi.Uint32)>>('ICU4XCodePointSetBuilder_add_inclusive_range') - .asFunction, int, int)>( - isLeaf: true); + static final _ICU4XCodePointSetBuilder_add_inclusive_range = + _capi, ffi.Uint32, ffi.Uint32)>>('ICU4XCodePointSetBuilder_add_inclusive_range') + .asFunction, int, int)>(isLeaf: true); /// Add all elements that belong to the provided set to the set /// @@ -113,13 +102,9 @@ final class CodePointSetBuilder implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetBuilder_add_set = _capi< - ffi.NativeFunction< - ffi.Void Function(ffi.Pointer, - ffi.Pointer)>>('ICU4XCodePointSetBuilder_add_set') - .asFunction< - void Function( - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XCodePointSetBuilder_add_set = + _capi, ffi.Pointer)>>('ICU4XCodePointSetBuilder_add_set') + .asFunction, ffi.Pointer)>(isLeaf: true); /// Remove a single character to the set /// @@ -129,10 +114,8 @@ final class CodePointSetBuilder implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetBuilder_remove_char = _capi< - ffi.NativeFunction< - ffi.Void Function(ffi.Pointer, - ffi.Uint32)>>('ICU4XCodePointSetBuilder_remove_char') + static final _ICU4XCodePointSetBuilder_remove_char = + _capi, ffi.Uint32)>>('ICU4XCodePointSetBuilder_remove_char') .asFunction, int)>(isLeaf: true); /// Remove an inclusive range of characters from the set @@ -143,13 +126,9 @@ final class CodePointSetBuilder implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetBuilder_remove_inclusive_range = _capi< - ffi.NativeFunction< - ffi.Void Function( - ffi.Pointer, ffi.Uint32, ffi.Uint32)>>( - 'ICU4XCodePointSetBuilder_remove_inclusive_range') - .asFunction, int, int)>( - isLeaf: true); + static final _ICU4XCodePointSetBuilder_remove_inclusive_range = + _capi, ffi.Uint32, ffi.Uint32)>>('ICU4XCodePointSetBuilder_remove_inclusive_range') + .asFunction, int, int)>(isLeaf: true); /// Remove all elements that belong to the provided set from the set /// @@ -159,14 +138,9 @@ final class CodePointSetBuilder implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetBuilder_remove_set = _capi< - ffi.NativeFunction< - ffi.Void Function( - ffi.Pointer, ffi.Pointer)>>( - 'ICU4XCodePointSetBuilder_remove_set') - .asFunction< - void Function( - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XCodePointSetBuilder_remove_set = + _capi, ffi.Pointer)>>('ICU4XCodePointSetBuilder_remove_set') + .asFunction, ffi.Pointer)>(isLeaf: true); /// Removes all elements from the set except a single character /// @@ -176,10 +150,8 @@ final class CodePointSetBuilder implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetBuilder_retain_char = _capi< - ffi.NativeFunction< - ffi.Void Function(ffi.Pointer, - ffi.Uint32)>>('ICU4XCodePointSetBuilder_retain_char') + static final _ICU4XCodePointSetBuilder_retain_char = + _capi, ffi.Uint32)>>('ICU4XCodePointSetBuilder_retain_char') .asFunction, int)>(isLeaf: true); /// Removes all elements from the set except an inclusive range of characters f @@ -190,13 +162,9 @@ final class CodePointSetBuilder implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetBuilder_retain_inclusive_range = _capi< - ffi.NativeFunction< - ffi.Void Function( - ffi.Pointer, ffi.Uint32, ffi.Uint32)>>( - 'ICU4XCodePointSetBuilder_retain_inclusive_range') - .asFunction, int, int)>( - isLeaf: true); + static final _ICU4XCodePointSetBuilder_retain_inclusive_range = + _capi, ffi.Uint32, ffi.Uint32)>>('ICU4XCodePointSetBuilder_retain_inclusive_range') + .asFunction, int, int)>(isLeaf: true); /// Removes all elements from the set except all elements in the provided set /// @@ -206,14 +174,9 @@ final class CodePointSetBuilder implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetBuilder_retain_set = _capi< - ffi.NativeFunction< - ffi.Void Function( - ffi.Pointer, ffi.Pointer)>>( - 'ICU4XCodePointSetBuilder_retain_set') - .asFunction< - void Function( - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XCodePointSetBuilder_retain_set = + _capi, ffi.Pointer)>>('ICU4XCodePointSetBuilder_retain_set') + .asFunction, ffi.Pointer)>(isLeaf: true); /// Complement a single character to the set /// @@ -225,10 +188,8 @@ final class CodePointSetBuilder implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetBuilder_complement_char = _capi< - ffi.NativeFunction< - ffi.Void Function(ffi.Pointer, - ffi.Uint32)>>('ICU4XCodePointSetBuilder_complement_char') + static final _ICU4XCodePointSetBuilder_complement_char = + _capi, ffi.Uint32)>>('ICU4XCodePointSetBuilder_complement_char') .asFunction, int)>(isLeaf: true); /// Complement an inclusive range of characters from the set @@ -237,18 +198,13 @@ final class CodePointSetBuilder implements ffi.Finalizable { /// /// See the [Rust documentation for `complement_range`](https://docs.rs/icu/latest/icu/collections/codepointinvlist/struct.CodePointInversionListBuilder.html#method.complement_range) for more information. void complementInclusiveRange(int start, int end) { - _ICU4XCodePointSetBuilder_complement_inclusive_range( - _underlying, start, end); + _ICU4XCodePointSetBuilder_complement_inclusive_range(_underlying, start, end); } // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetBuilder_complement_inclusive_range = _capi< - ffi.NativeFunction< - ffi.Void Function( - ffi.Pointer, ffi.Uint32, ffi.Uint32)>>( - 'ICU4XCodePointSetBuilder_complement_inclusive_range') - .asFunction, int, int)>( - isLeaf: true); + static final _ICU4XCodePointSetBuilder_complement_inclusive_range = + _capi, ffi.Uint32, ffi.Uint32)>>('ICU4XCodePointSetBuilder_complement_inclusive_range') + .asFunction, int, int)>(isLeaf: true); /// Complement all elements that belong to the provided set from the set /// @@ -260,12 +216,7 @@ final class CodePointSetBuilder implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetBuilder_complement_set = _capi< - ffi.NativeFunction< - ffi.Void Function( - ffi.Pointer, ffi.Pointer)>>( - 'ICU4XCodePointSetBuilder_complement_set') - .asFunction< - void Function( - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XCodePointSetBuilder_complement_set = + _capi, ffi.Pointer)>>('ICU4XCodePointSetBuilder_complement_set') + .asFunction, ffi.Pointer)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/CodePointSetData.g.dart b/ffi/capi/dart/package/lib/src/CodePointSetData.g.dart index 504f50c0bfe..885b4514e31 100644 --- a/ffi/capi/dart/package/lib/src/CodePointSetData.g.dart +++ b/ffi/capi/dart/package/lib/src/CodePointSetData.g.dart @@ -19,8 +19,7 @@ final class CodePointSetData implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XCodePointSetData_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XCodePointSetData_destroy')); /// Checks whether the code point is in the set. /// @@ -31,10 +30,8 @@ final class CodePointSetData implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_contains = _capi< - ffi.NativeFunction< - ffi.Bool Function(ffi.Pointer, - ffi.Uint32)>>('ICU4XCodePointSetData_contains') + static final _ICU4XCodePointSetData_contains = + _capi, ffi.Uint32)>>('ICU4XCodePointSetData_contains') .asFunction, int)>(isLeaf: true); /// Produces an iterator over ranges of code points contained in this set @@ -46,12 +43,9 @@ final class CodePointSetData implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_iter_ranges = _capi< - ffi.NativeFunction< - ffi.Pointer Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_iter_ranges') - .asFunction Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_iter_ranges = + _capi Function(ffi.Pointer)>>('ICU4XCodePointSetData_iter_ranges') + .asFunction Function(ffi.Pointer)>(isLeaf: true); /// Produces an iterator over ranges of code points not contained in this set /// @@ -62,54 +56,43 @@ final class CodePointSetData implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_iter_ranges_complemented = _capi< - ffi.NativeFunction< - ffi.Pointer Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_iter_ranges_complemented') - .asFunction Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_iter_ranges_complemented = + _capi Function(ffi.Pointer)>>('ICU4XCodePointSetData_iter_ranges_complemented') + .asFunction Function(ffi.Pointer)>(isLeaf: true); /// which is a mask with the same format as the `U_GC_XX_MASK` mask in ICU4C /// /// See the [Rust documentation for `for_general_category_group`](https://docs.rs/icu/latest/icu/properties/sets/fn.for_general_category_group.html) for more information. /// /// Throws [Error] on failure. - factory CodePointSetData.loadForGeneralCategoryGroup( - DataProvider provider, int group) { - final result = _ICU4XCodePointSetData_load_for_general_category_group( - provider._underlying, group); + factory CodePointSetData.loadForGeneralCategoryGroup(DataProvider provider, int group) { + final result = _ICU4XCodePointSetData_load_for_general_category_group(provider._underlying, group); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_for_general_category_group = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer, ffi.Uint32)>>( - 'ICU4XCodePointSetData_load_for_general_category_group') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer, int)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_for_general_category_group = + _capi, ffi.Uint32)>>('ICU4XCodePointSetData_load_for_general_category_group') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer, int)>(isLeaf: true); /// See the [Rust documentation for `ascii_hex_digit`](https://docs.rs/icu/latest/icu/properties/sets/fn.ascii_hex_digit.html) for more information. /// /// Throws [Error] on failure. factory CodePointSetData.loadAsciiHexDigit(DataProvider provider) { - final result = - _ICU4XCodePointSetData_load_ascii_hex_digit(provider._underlying); + final result = _ICU4XCodePointSetData_load_ascii_hex_digit(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_ascii_hex_digit = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_ascii_hex_digit') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_ascii_hex_digit = + _capi)>>('ICU4XCodePointSetData_load_ascii_hex_digit') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `alnum`](https://docs.rs/icu/latest/icu/properties/sets/fn.alnum.html) for more information. /// @@ -121,13 +104,11 @@ final class CodePointSetData implements ffi.Finalizable { } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_alnum = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer)>>('ICU4XCodePointSetData_load_alnum') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_alnum = + _capi)>>('ICU4XCodePointSetData_load_alnum') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `alphabetic`](https://docs.rs/icu/latest/icu/properties/sets/fn.alphabetic.html) for more information. /// @@ -139,51 +120,43 @@ final class CodePointSetData implements ffi.Finalizable { } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_alphabetic = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_alphabetic') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_alphabetic = + _capi)>>('ICU4XCodePointSetData_load_alphabetic') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `bidi_control`](https://docs.rs/icu/latest/icu/properties/sets/fn.bidi_control.html) for more information. /// /// Throws [Error] on failure. factory CodePointSetData.loadBidiControl(DataProvider provider) { - final result = - _ICU4XCodePointSetData_load_bidi_control(provider._underlying); + final result = _ICU4XCodePointSetData_load_bidi_control(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_bidi_control = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_bidi_control') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_bidi_control = + _capi)>>('ICU4XCodePointSetData_load_bidi_control') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `bidi_mirrored`](https://docs.rs/icu/latest/icu/properties/sets/fn.bidi_mirrored.html) for more information. /// /// Throws [Error] on failure. factory CodePointSetData.loadBidiMirrored(DataProvider provider) { - final result = - _ICU4XCodePointSetData_load_bidi_mirrored(provider._underlying); + final result = _ICU4XCodePointSetData_load_bidi_mirrored(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_bidi_mirrored = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_bidi_mirrored') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_bidi_mirrored = + _capi)>>('ICU4XCodePointSetData_load_bidi_mirrored') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `blank`](https://docs.rs/icu/latest/icu/properties/sets/fn.blank.html) for more information. /// @@ -195,13 +168,11 @@ final class CodePointSetData implements ffi.Finalizable { } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_blank = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer)>>('ICU4XCodePointSetData_load_blank') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_blank = + _capi)>>('ICU4XCodePointSetData_load_blank') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `cased`](https://docs.rs/icu/latest/icu/properties/sets/fn.cased.html) for more information. /// @@ -213,166 +184,139 @@ final class CodePointSetData implements ffi.Finalizable { } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_cased = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer)>>('ICU4XCodePointSetData_load_cased') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_cased = + _capi)>>('ICU4XCodePointSetData_load_cased') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `case_ignorable`](https://docs.rs/icu/latest/icu/properties/sets/fn.case_ignorable.html) for more information. /// /// Throws [Error] on failure. factory CodePointSetData.loadCaseIgnorable(DataProvider provider) { - final result = - _ICU4XCodePointSetData_load_case_ignorable(provider._underlying); + final result = _ICU4XCodePointSetData_load_case_ignorable(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_case_ignorable = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_case_ignorable') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_case_ignorable = + _capi)>>('ICU4XCodePointSetData_load_case_ignorable') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `full_composition_exclusion`](https://docs.rs/icu/latest/icu/properties/sets/fn.full_composition_exclusion.html) for more information. /// /// Throws [Error] on failure. factory CodePointSetData.loadFullCompositionExclusion(DataProvider provider) { - final result = _ICU4XCodePointSetData_load_full_composition_exclusion( - provider._underlying); + final result = _ICU4XCodePointSetData_load_full_composition_exclusion(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_full_composition_exclusion = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_full_composition_exclusion') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_full_composition_exclusion = + _capi)>>('ICU4XCodePointSetData_load_full_composition_exclusion') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `changes_when_casefolded`](https://docs.rs/icu/latest/icu/properties/sets/fn.changes_when_casefolded.html) for more information. /// /// Throws [Error] on failure. factory CodePointSetData.loadChangesWhenCasefolded(DataProvider provider) { - final result = _ICU4XCodePointSetData_load_changes_when_casefolded( - provider._underlying); + final result = _ICU4XCodePointSetData_load_changes_when_casefolded(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_changes_when_casefolded = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_changes_when_casefolded') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_changes_when_casefolded = + _capi)>>('ICU4XCodePointSetData_load_changes_when_casefolded') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `changes_when_casemapped`](https://docs.rs/icu/latest/icu/properties/sets/fn.changes_when_casemapped.html) for more information. /// /// Throws [Error] on failure. factory CodePointSetData.loadChangesWhenCasemapped(DataProvider provider) { - final result = _ICU4XCodePointSetData_load_changes_when_casemapped( - provider._underlying); + final result = _ICU4XCodePointSetData_load_changes_when_casemapped(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_changes_when_casemapped = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_changes_when_casemapped') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_changes_when_casemapped = + _capi)>>('ICU4XCodePointSetData_load_changes_when_casemapped') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `changes_when_nfkc_casefolded`](https://docs.rs/icu/latest/icu/properties/sets/fn.changes_when_nfkc_casefolded.html) for more information. /// /// Throws [Error] on failure. - factory CodePointSetData.loadChangesWhenNfkcCasefolded( - DataProvider provider) { - final result = _ICU4XCodePointSetData_load_changes_when_nfkc_casefolded( - provider._underlying); + factory CodePointSetData.loadChangesWhenNfkcCasefolded(DataProvider provider) { + final result = _ICU4XCodePointSetData_load_changes_when_nfkc_casefolded(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_changes_when_nfkc_casefolded = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_changes_when_nfkc_casefolded') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_changes_when_nfkc_casefolded = + _capi)>>('ICU4XCodePointSetData_load_changes_when_nfkc_casefolded') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `changes_when_lowercased`](https://docs.rs/icu/latest/icu/properties/sets/fn.changes_when_lowercased.html) for more information. /// /// Throws [Error] on failure. factory CodePointSetData.loadChangesWhenLowercased(DataProvider provider) { - final result = _ICU4XCodePointSetData_load_changes_when_lowercased( - provider._underlying); + final result = _ICU4XCodePointSetData_load_changes_when_lowercased(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_changes_when_lowercased = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_changes_when_lowercased') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_changes_when_lowercased = + _capi)>>('ICU4XCodePointSetData_load_changes_when_lowercased') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `changes_when_titlecased`](https://docs.rs/icu/latest/icu/properties/sets/fn.changes_when_titlecased.html) for more information. /// /// Throws [Error] on failure. factory CodePointSetData.loadChangesWhenTitlecased(DataProvider provider) { - final result = _ICU4XCodePointSetData_load_changes_when_titlecased( - provider._underlying); + final result = _ICU4XCodePointSetData_load_changes_when_titlecased(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_changes_when_titlecased = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_changes_when_titlecased') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_changes_when_titlecased = + _capi)>>('ICU4XCodePointSetData_load_changes_when_titlecased') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `changes_when_uppercased`](https://docs.rs/icu/latest/icu/properties/sets/fn.changes_when_uppercased.html) for more information. /// /// Throws [Error] on failure. factory CodePointSetData.loadChangesWhenUppercased(DataProvider provider) { - final result = _ICU4XCodePointSetData_load_changes_when_uppercased( - provider._underlying); + final result = _ICU4XCodePointSetData_load_changes_when_uppercased(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_changes_when_uppercased = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_changes_when_uppercased') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_changes_when_uppercased = + _capi)>>('ICU4XCodePointSetData_load_changes_when_uppercased') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `dash`](https://docs.rs/icu/latest/icu/properties/sets/fn.dash.html) for more information. /// @@ -384,13 +328,11 @@ final class CodePointSetData implements ffi.Finalizable { } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_dash = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer)>>('ICU4XCodePointSetData_load_dash') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_dash = + _capi)>>('ICU4XCodePointSetData_load_dash') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `deprecated`](https://docs.rs/icu/latest/icu/properties/sets/fn.deprecated.html) for more information. /// @@ -402,33 +344,27 @@ final class CodePointSetData implements ffi.Finalizable { } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_deprecated = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_deprecated') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_deprecated = + _capi)>>('ICU4XCodePointSetData_load_deprecated') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `default_ignorable_code_point`](https://docs.rs/icu/latest/icu/properties/sets/fn.default_ignorable_code_point.html) for more information. /// /// Throws [Error] on failure. - factory CodePointSetData.loadDefaultIgnorableCodePoint( - DataProvider provider) { - final result = _ICU4XCodePointSetData_load_default_ignorable_code_point( - provider._underlying); + factory CodePointSetData.loadDefaultIgnorableCodePoint(DataProvider provider) { + final result = _ICU4XCodePointSetData_load_default_ignorable_code_point(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_default_ignorable_code_point = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_default_ignorable_code_point') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_default_ignorable_code_point = + _capi)>>('ICU4XCodePointSetData_load_default_ignorable_code_point') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `diacritic`](https://docs.rs/icu/latest/icu/properties/sets/fn.diacritic.html) for more information. /// @@ -440,70 +376,59 @@ final class CodePointSetData implements ffi.Finalizable { } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_diacritic = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_diacritic') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_diacritic = + _capi)>>('ICU4XCodePointSetData_load_diacritic') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `emoji_modifier_base`](https://docs.rs/icu/latest/icu/properties/sets/fn.emoji_modifier_base.html) for more information. /// /// Throws [Error] on failure. factory CodePointSetData.loadEmojiModifierBase(DataProvider provider) { - final result = - _ICU4XCodePointSetData_load_emoji_modifier_base(provider._underlying); + final result = _ICU4XCodePointSetData_load_emoji_modifier_base(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_emoji_modifier_base = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_emoji_modifier_base') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_emoji_modifier_base = + _capi)>>('ICU4XCodePointSetData_load_emoji_modifier_base') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `emoji_component`](https://docs.rs/icu/latest/icu/properties/sets/fn.emoji_component.html) for more information. /// /// Throws [Error] on failure. factory CodePointSetData.loadEmojiComponent(DataProvider provider) { - final result = - _ICU4XCodePointSetData_load_emoji_component(provider._underlying); + final result = _ICU4XCodePointSetData_load_emoji_component(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_emoji_component = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_emoji_component') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_emoji_component = + _capi)>>('ICU4XCodePointSetData_load_emoji_component') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `emoji_modifier`](https://docs.rs/icu/latest/icu/properties/sets/fn.emoji_modifier.html) for more information. /// /// Throws [Error] on failure. factory CodePointSetData.loadEmojiModifier(DataProvider provider) { - final result = - _ICU4XCodePointSetData_load_emoji_modifier(provider._underlying); + final result = _ICU4XCodePointSetData_load_emoji_modifier(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_emoji_modifier = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_emoji_modifier') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_emoji_modifier = + _capi)>>('ICU4XCodePointSetData_load_emoji_modifier') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `emoji`](https://docs.rs/icu/latest/icu/properties/sets/fn.emoji.html) for more information. /// @@ -515,32 +440,27 @@ final class CodePointSetData implements ffi.Finalizable { } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_emoji = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer)>>('ICU4XCodePointSetData_load_emoji') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_emoji = + _capi)>>('ICU4XCodePointSetData_load_emoji') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `emoji_presentation`](https://docs.rs/icu/latest/icu/properties/sets/fn.emoji_presentation.html) for more information. /// /// Throws [Error] on failure. factory CodePointSetData.loadEmojiPresentation(DataProvider provider) { - final result = - _ICU4XCodePointSetData_load_emoji_presentation(provider._underlying); + final result = _ICU4XCodePointSetData_load_emoji_presentation(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_emoji_presentation = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_emoji_presentation') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_emoji_presentation = + _capi)>>('ICU4XCodePointSetData_load_emoji_presentation') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `extender`](https://docs.rs/icu/latest/icu/properties/sets/fn.extender.html) for more information. /// @@ -552,32 +472,27 @@ final class CodePointSetData implements ffi.Finalizable { } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_extender = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_extender') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_extender = + _capi)>>('ICU4XCodePointSetData_load_extender') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `extended_pictographic`](https://docs.rs/icu/latest/icu/properties/sets/fn.extended_pictographic.html) for more information. /// /// Throws [Error] on failure. factory CodePointSetData.loadExtendedPictographic(DataProvider provider) { - final result = - _ICU4XCodePointSetData_load_extended_pictographic(provider._underlying); + final result = _ICU4XCodePointSetData_load_extended_pictographic(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_extended_pictographic = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_extended_pictographic') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_extended_pictographic = + _capi)>>('ICU4XCodePointSetData_load_extended_pictographic') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `graph`](https://docs.rs/icu/latest/icu/properties/sets/fn.graph.html) for more information. /// @@ -589,70 +504,59 @@ final class CodePointSetData implements ffi.Finalizable { } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_graph = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer)>>('ICU4XCodePointSetData_load_graph') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_graph = + _capi)>>('ICU4XCodePointSetData_load_graph') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `grapheme_base`](https://docs.rs/icu/latest/icu/properties/sets/fn.grapheme_base.html) for more information. /// /// Throws [Error] on failure. factory CodePointSetData.loadGraphemeBase(DataProvider provider) { - final result = - _ICU4XCodePointSetData_load_grapheme_base(provider._underlying); + final result = _ICU4XCodePointSetData_load_grapheme_base(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_grapheme_base = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_grapheme_base') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_grapheme_base = + _capi)>>('ICU4XCodePointSetData_load_grapheme_base') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `grapheme_extend`](https://docs.rs/icu/latest/icu/properties/sets/fn.grapheme_extend.html) for more information. /// /// Throws [Error] on failure. factory CodePointSetData.loadGraphemeExtend(DataProvider provider) { - final result = - _ICU4XCodePointSetData_load_grapheme_extend(provider._underlying); + final result = _ICU4XCodePointSetData_load_grapheme_extend(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_grapheme_extend = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_grapheme_extend') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_grapheme_extend = + _capi)>>('ICU4XCodePointSetData_load_grapheme_extend') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `grapheme_link`](https://docs.rs/icu/latest/icu/properties/sets/fn.grapheme_link.html) for more information. /// /// Throws [Error] on failure. factory CodePointSetData.loadGraphemeLink(DataProvider provider) { - final result = - _ICU4XCodePointSetData_load_grapheme_link(provider._underlying); + final result = _ICU4XCodePointSetData_load_grapheme_link(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_grapheme_link = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_grapheme_link') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_grapheme_link = + _capi)>>('ICU4XCodePointSetData_load_grapheme_link') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `hex_digit`](https://docs.rs/icu/latest/icu/properties/sets/fn.hex_digit.html) for more information. /// @@ -664,13 +568,11 @@ final class CodePointSetData implements ffi.Finalizable { } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_hex_digit = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_hex_digit') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_hex_digit = + _capi)>>('ICU4XCodePointSetData_load_hex_digit') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `hyphen`](https://docs.rs/icu/latest/icu/properties/sets/fn.hyphen.html) for more information. /// @@ -682,51 +584,43 @@ final class CodePointSetData implements ffi.Finalizable { } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_hyphen = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_hyphen') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_hyphen = + _capi)>>('ICU4XCodePointSetData_load_hyphen') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `id_continue`](https://docs.rs/icu/latest/icu/properties/sets/fn.id_continue.html) for more information. /// /// Throws [Error] on failure. factory CodePointSetData.loadIdContinue(DataProvider provider) { - final result = - _ICU4XCodePointSetData_load_id_continue(provider._underlying); + final result = _ICU4XCodePointSetData_load_id_continue(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_id_continue = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_id_continue') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_id_continue = + _capi)>>('ICU4XCodePointSetData_load_id_continue') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `ideographic`](https://docs.rs/icu/latest/icu/properties/sets/fn.ideographic.html) for more information. /// /// Throws [Error] on failure. factory CodePointSetData.loadIdeographic(DataProvider provider) { - final result = - _ICU4XCodePointSetData_load_ideographic(provider._underlying); + final result = _ICU4XCodePointSetData_load_ideographic(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_ideographic = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_ideographic') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_ideographic = + _capi)>>('ICU4XCodePointSetData_load_ideographic') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `id_start`](https://docs.rs/icu/latest/icu/properties/sets/fn.id_start.html) for more information. /// @@ -738,89 +632,75 @@ final class CodePointSetData implements ffi.Finalizable { } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_id_start = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_id_start') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_id_start = + _capi)>>('ICU4XCodePointSetData_load_id_start') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `ids_binary_operator`](https://docs.rs/icu/latest/icu/properties/sets/fn.ids_binary_operator.html) for more information. /// /// Throws [Error] on failure. factory CodePointSetData.loadIdsBinaryOperator(DataProvider provider) { - final result = - _ICU4XCodePointSetData_load_ids_binary_operator(provider._underlying); + final result = _ICU4XCodePointSetData_load_ids_binary_operator(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_ids_binary_operator = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_ids_binary_operator') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_ids_binary_operator = + _capi)>>('ICU4XCodePointSetData_load_ids_binary_operator') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `ids_trinary_operator`](https://docs.rs/icu/latest/icu/properties/sets/fn.ids_trinary_operator.html) for more information. /// /// Throws [Error] on failure. factory CodePointSetData.loadIdsTrinaryOperator(DataProvider provider) { - final result = - _ICU4XCodePointSetData_load_ids_trinary_operator(provider._underlying); + final result = _ICU4XCodePointSetData_load_ids_trinary_operator(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_ids_trinary_operator = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_ids_trinary_operator') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_ids_trinary_operator = + _capi)>>('ICU4XCodePointSetData_load_ids_trinary_operator') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `join_control`](https://docs.rs/icu/latest/icu/properties/sets/fn.join_control.html) for more information. /// /// Throws [Error] on failure. factory CodePointSetData.loadJoinControl(DataProvider provider) { - final result = - _ICU4XCodePointSetData_load_join_control(provider._underlying); + final result = _ICU4XCodePointSetData_load_join_control(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_join_control = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_join_control') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_join_control = + _capi)>>('ICU4XCodePointSetData_load_join_control') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `logical_order_exception`](https://docs.rs/icu/latest/icu/properties/sets/fn.logical_order_exception.html) for more information. /// /// Throws [Error] on failure. factory CodePointSetData.loadLogicalOrderException(DataProvider provider) { - final result = _ICU4XCodePointSetData_load_logical_order_exception( - provider._underlying); + final result = _ICU4XCodePointSetData_load_logical_order_exception(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_logical_order_exception = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_logical_order_exception') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_logical_order_exception = + _capi)>>('ICU4XCodePointSetData_load_logical_order_exception') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `lowercase`](https://docs.rs/icu/latest/icu/properties/sets/fn.lowercase.html) for more information. /// @@ -832,13 +712,11 @@ final class CodePointSetData implements ffi.Finalizable { } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_lowercase = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_lowercase') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_lowercase = + _capi)>>('ICU4XCodePointSetData_load_lowercase') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `math`](https://docs.rs/icu/latest/icu/properties/sets/fn.math.html) for more information. /// @@ -850,32 +728,27 @@ final class CodePointSetData implements ffi.Finalizable { } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_math = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer)>>('ICU4XCodePointSetData_load_math') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_math = + _capi)>>('ICU4XCodePointSetData_load_math') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `noncharacter_code_point`](https://docs.rs/icu/latest/icu/properties/sets/fn.noncharacter_code_point.html) for more information. /// /// Throws [Error] on failure. factory CodePointSetData.loadNoncharacterCodePoint(DataProvider provider) { - final result = _ICU4XCodePointSetData_load_noncharacter_code_point( - provider._underlying); + final result = _ICU4XCodePointSetData_load_noncharacter_code_point(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_noncharacter_code_point = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_noncharacter_code_point') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_noncharacter_code_point = + _capi)>>('ICU4XCodePointSetData_load_noncharacter_code_point') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `nfc_inert`](https://docs.rs/icu/latest/icu/properties/sets/fn.nfc_inert.html) for more information. /// @@ -887,13 +760,11 @@ final class CodePointSetData implements ffi.Finalizable { } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_nfc_inert = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_nfc_inert') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_nfc_inert = + _capi)>>('ICU4XCodePointSetData_load_nfc_inert') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `nfd_inert`](https://docs.rs/icu/latest/icu/properties/sets/fn.nfd_inert.html) for more information. /// @@ -905,13 +776,11 @@ final class CodePointSetData implements ffi.Finalizable { } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_nfd_inert = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_nfd_inert') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_nfd_inert = + _capi)>>('ICU4XCodePointSetData_load_nfd_inert') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `nfkc_inert`](https://docs.rs/icu/latest/icu/properties/sets/fn.nfkc_inert.html) for more information. /// @@ -923,13 +792,11 @@ final class CodePointSetData implements ffi.Finalizable { } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_nfkc_inert = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_nfkc_inert') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_nfkc_inert = + _capi)>>('ICU4XCodePointSetData_load_nfkc_inert') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `nfkd_inert`](https://docs.rs/icu/latest/icu/properties/sets/fn.nfkd_inert.html) for more information. /// @@ -941,71 +808,59 @@ final class CodePointSetData implements ffi.Finalizable { } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_nfkd_inert = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_nfkd_inert') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_nfkd_inert = + _capi)>>('ICU4XCodePointSetData_load_nfkd_inert') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `pattern_syntax`](https://docs.rs/icu/latest/icu/properties/sets/fn.pattern_syntax.html) for more information. /// /// Throws [Error] on failure. factory CodePointSetData.loadPatternSyntax(DataProvider provider) { - final result = - _ICU4XCodePointSetData_load_pattern_syntax(provider._underlying); + final result = _ICU4XCodePointSetData_load_pattern_syntax(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_pattern_syntax = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_pattern_syntax') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_pattern_syntax = + _capi)>>('ICU4XCodePointSetData_load_pattern_syntax') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `pattern_white_space`](https://docs.rs/icu/latest/icu/properties/sets/fn.pattern_white_space.html) for more information. /// /// Throws [Error] on failure. factory CodePointSetData.loadPatternWhiteSpace(DataProvider provider) { - final result = - _ICU4XCodePointSetData_load_pattern_white_space(provider._underlying); + final result = _ICU4XCodePointSetData_load_pattern_white_space(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_pattern_white_space = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_pattern_white_space') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_pattern_white_space = + _capi)>>('ICU4XCodePointSetData_load_pattern_white_space') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `prepended_concatenation_mark`](https://docs.rs/icu/latest/icu/properties/sets/fn.prepended_concatenation_mark.html) for more information. /// /// Throws [Error] on failure. - factory CodePointSetData.loadPrependedConcatenationMark( - DataProvider provider) { - final result = _ICU4XCodePointSetData_load_prepended_concatenation_mark( - provider._underlying); + factory CodePointSetData.loadPrependedConcatenationMark(DataProvider provider) { + final result = _ICU4XCodePointSetData_load_prepended_concatenation_mark(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_prepended_concatenation_mark = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_prepended_concatenation_mark') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_prepended_concatenation_mark = + _capi)>>('ICU4XCodePointSetData_load_prepended_concatenation_mark') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `print`](https://docs.rs/icu/latest/icu/properties/sets/fn.print.html) for more information. /// @@ -1017,32 +872,27 @@ final class CodePointSetData implements ffi.Finalizable { } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_print = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer)>>('ICU4XCodePointSetData_load_print') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_print = + _capi)>>('ICU4XCodePointSetData_load_print') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `quotation_mark`](https://docs.rs/icu/latest/icu/properties/sets/fn.quotation_mark.html) for more information. /// /// Throws [Error] on failure. factory CodePointSetData.loadQuotationMark(DataProvider provider) { - final result = - _ICU4XCodePointSetData_load_quotation_mark(provider._underlying); + final result = _ICU4XCodePointSetData_load_quotation_mark(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_quotation_mark = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_quotation_mark') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_quotation_mark = + _capi)>>('ICU4XCodePointSetData_load_quotation_mark') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `radical`](https://docs.rs/icu/latest/icu/properties/sets/fn.radical.html) for more information. /// @@ -1054,146 +904,123 @@ final class CodePointSetData implements ffi.Finalizable { } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_radical = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_radical') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_radical = + _capi)>>('ICU4XCodePointSetData_load_radical') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `regional_indicator`](https://docs.rs/icu/latest/icu/properties/sets/fn.regional_indicator.html) for more information. /// /// Throws [Error] on failure. factory CodePointSetData.loadRegionalIndicator(DataProvider provider) { - final result = - _ICU4XCodePointSetData_load_regional_indicator(provider._underlying); + final result = _ICU4XCodePointSetData_load_regional_indicator(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_regional_indicator = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_regional_indicator') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_regional_indicator = + _capi)>>('ICU4XCodePointSetData_load_regional_indicator') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `soft_dotted`](https://docs.rs/icu/latest/icu/properties/sets/fn.soft_dotted.html) for more information. /// /// Throws [Error] on failure. factory CodePointSetData.loadSoftDotted(DataProvider provider) { - final result = - _ICU4XCodePointSetData_load_soft_dotted(provider._underlying); + final result = _ICU4XCodePointSetData_load_soft_dotted(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_soft_dotted = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_soft_dotted') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_soft_dotted = + _capi)>>('ICU4XCodePointSetData_load_soft_dotted') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `segment_starter`](https://docs.rs/icu/latest/icu/properties/sets/fn.segment_starter.html) for more information. /// /// Throws [Error] on failure. factory CodePointSetData.loadSegmentStarter(DataProvider provider) { - final result = - _ICU4XCodePointSetData_load_segment_starter(provider._underlying); + final result = _ICU4XCodePointSetData_load_segment_starter(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_segment_starter = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_segment_starter') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_segment_starter = + _capi)>>('ICU4XCodePointSetData_load_segment_starter') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `case_sensitive`](https://docs.rs/icu/latest/icu/properties/sets/fn.case_sensitive.html) for more information. /// /// Throws [Error] on failure. factory CodePointSetData.loadCaseSensitive(DataProvider provider) { - final result = - _ICU4XCodePointSetData_load_case_sensitive(provider._underlying); + final result = _ICU4XCodePointSetData_load_case_sensitive(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_case_sensitive = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_case_sensitive') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_case_sensitive = + _capi)>>('ICU4XCodePointSetData_load_case_sensitive') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `sentence_terminal`](https://docs.rs/icu/latest/icu/properties/sets/fn.sentence_terminal.html) for more information. /// /// Throws [Error] on failure. factory CodePointSetData.loadSentenceTerminal(DataProvider provider) { - final result = - _ICU4XCodePointSetData_load_sentence_terminal(provider._underlying); + final result = _ICU4XCodePointSetData_load_sentence_terminal(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_sentence_terminal = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_sentence_terminal') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_sentence_terminal = + _capi)>>('ICU4XCodePointSetData_load_sentence_terminal') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `terminal_punctuation`](https://docs.rs/icu/latest/icu/properties/sets/fn.terminal_punctuation.html) for more information. /// /// Throws [Error] on failure. factory CodePointSetData.loadTerminalPunctuation(DataProvider provider) { - final result = - _ICU4XCodePointSetData_load_terminal_punctuation(provider._underlying); + final result = _ICU4XCodePointSetData_load_terminal_punctuation(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_terminal_punctuation = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_terminal_punctuation') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_terminal_punctuation = + _capi)>>('ICU4XCodePointSetData_load_terminal_punctuation') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `unified_ideograph`](https://docs.rs/icu/latest/icu/properties/sets/fn.unified_ideograph.html) for more information. /// /// Throws [Error] on failure. factory CodePointSetData.loadUnifiedIdeograph(DataProvider provider) { - final result = - _ICU4XCodePointSetData_load_unified_ideograph(provider._underlying); + final result = _ICU4XCodePointSetData_load_unified_ideograph(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_unified_ideograph = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_unified_ideograph') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_unified_ideograph = + _capi)>>('ICU4XCodePointSetData_load_unified_ideograph') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `uppercase`](https://docs.rs/icu/latest/icu/properties/sets/fn.uppercase.html) for more information. /// @@ -1205,51 +1032,43 @@ final class CodePointSetData implements ffi.Finalizable { } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_uppercase = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_uppercase') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_uppercase = + _capi)>>('ICU4XCodePointSetData_load_uppercase') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `variation_selector`](https://docs.rs/icu/latest/icu/properties/sets/fn.variation_selector.html) for more information. /// /// Throws [Error] on failure. factory CodePointSetData.loadVariationSelector(DataProvider provider) { - final result = - _ICU4XCodePointSetData_load_variation_selector(provider._underlying); + final result = _ICU4XCodePointSetData_load_variation_selector(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_variation_selector = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_variation_selector') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_variation_selector = + _capi)>>('ICU4XCodePointSetData_load_variation_selector') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `white_space`](https://docs.rs/icu/latest/icu/properties/sets/fn.white_space.html) for more information. /// /// Throws [Error] on failure. factory CodePointSetData.loadWhiteSpace(DataProvider provider) { - final result = - _ICU4XCodePointSetData_load_white_space(provider._underlying); + final result = _ICU4XCodePointSetData_load_white_space(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_white_space = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_white_space') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_white_space = + _capi)>>('ICU4XCodePointSetData_load_white_space') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `xdigit`](https://docs.rs/icu/latest/icu/properties/sets/fn.xdigit.html) for more information. /// @@ -1261,32 +1080,27 @@ final class CodePointSetData implements ffi.Finalizable { } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_xdigit = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_xdigit') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_xdigit = + _capi)>>('ICU4XCodePointSetData_load_xdigit') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `xid_continue`](https://docs.rs/icu/latest/icu/properties/sets/fn.xid_continue.html) for more information. /// /// Throws [Error] on failure. factory CodePointSetData.loadXidContinue(DataProvider provider) { - final result = - _ICU4XCodePointSetData_load_xid_continue(provider._underlying); + final result = _ICU4XCodePointSetData_load_xid_continue(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_xid_continue = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_xid_continue') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_xid_continue = + _capi)>>('ICU4XCodePointSetData_load_xid_continue') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `xid_start`](https://docs.rs/icu/latest/icu/properties/sets/fn.xid_start.html) for more information. /// @@ -1298,13 +1112,11 @@ final class CodePointSetData implements ffi.Finalizable { } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_xid_start = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XCodePointSetData_load_xid_start') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCodePointSetData_load_xid_start = + _capi)>>('ICU4XCodePointSetData_load_xid_start') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// Loads data for a property specified as a string as long as it is one of the /// [ECMA-262 binary properties][ecma] (not including Any, ASCII, and Assigned pseudoproperties). @@ -1317,27 +1129,19 @@ final class CodePointSetData implements ffi.Finalizable { /// See the [Rust documentation for `for_ecma262`](https://docs.rs/icu/latest/icu/properties/sets/fn.for_ecma262.html) for more information. /// /// Throws [Error] on failure. - factory CodePointSetData.loadForEcma262( - DataProvider provider, String propertyName) { + factory CodePointSetData.loadForEcma262(DataProvider provider, String propertyName) { final alloc = ffi2.Arena(); final propertyNameSlice = _SliceFfi2Utf8._fromDart(propertyName, alloc); - - final result = _ICU4XCodePointSetData_load_for_ecma262(provider._underlying, - propertyNameSlice._bytes, propertyNameSlice._length); + final result = _ICU4XCodePointSetData_load_for_ecma262(provider._underlying, propertyNameSlice._bytes, propertyNameSlice._length); alloc.releaseAll(); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return CodePointSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCodePointSetData_load_for_ecma262 = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer, - ffi.Pointer, - ffi.Size)>>('ICU4XCodePointSetData_load_for_ecma262') - .asFunction< - _ResultOpaqueInt32 Function(ffi.Pointer, - ffi.Pointer, int)>(isLeaf: true); + static final _ICU4XCodePointSetData_load_for_ecma262 = + _capi, ffi.Pointer, ffi.Size)>>('ICU4XCodePointSetData_load_for_ecma262') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer, ffi.Pointer, int)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/Collator.g.dart b/ffi/capi/dart/package/lib/src/Collator.g.dart index e9b939399c4..bcabc73dda1 100644 --- a/ffi/capi/dart/package/lib/src/Collator.g.dart +++ b/ffi/capi/dart/package/lib/src/Collator.g.dart @@ -20,25 +20,18 @@ final class Collator implements ffi.Finalizable { /// See the [Rust documentation for `try_new`](https://docs.rs/icu/latest/icu/collator/struct.Collator.html#method.try_new) for more information. /// /// Throws [Error] on failure. - factory Collator.v1( - DataProvider provider, Locale locale, CollatorOptionsV1 options) { - final result = _ICU4XCollator_create_v1( - provider._underlying, locale._underlying, options._underlying); + factory Collator.v1(DataProvider provider, Locale locale, CollatorOptionsV1 options) { + final result = _ICU4XCollator_create_v1(provider._underlying, locale._underlying, options._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return Collator._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCollator_create_v1 = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer, - ffi.Pointer, - _CollatorOptionsV1Ffi)>>('ICU4XCollator_create_v1') - .asFunction< - _ResultOpaqueInt32 Function(ffi.Pointer, - ffi.Pointer, _CollatorOptionsV1Ffi)>(isLeaf: true); + static final _ICU4XCollator_create_v1 = + _capi, ffi.Pointer, _CollatorOptionsV1Ffi)>>('ICU4XCollator_create_v1') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer, ffi.Pointer, _CollatorOptionsV1Ffi)>(isLeaf: true); /// Compare guaranteed well-formed UTF-8 strings. /// @@ -50,29 +43,15 @@ final class Collator implements ffi.Finalizable { final alloc = ffi2.Arena(); final leftSlice = _SliceFfi2Utf8._fromDart(left, alloc); final rightSlice = _SliceFfi2Utf8._fromDart(right, alloc); - - final result = _ICU4XCollator_compare_valid_utf8( - _underlying, - leftSlice._bytes, - leftSlice._length, - rightSlice._bytes, - rightSlice._length); + final result = _ICU4XCollator_compare_valid_utf8(_underlying, leftSlice._bytes, leftSlice._length, rightSlice._bytes, rightSlice._length); alloc.releaseAll(); return Ordering.values.firstWhere((v) => v._underlying == result); } // ignore: non_constant_identifier_names - static final _ICU4XCollator_compare_valid_utf8 = _capi< - ffi.NativeFunction< - ffi.Int32 Function( - ffi.Pointer, - ffi.Pointer, - ffi.Size, - ffi.Pointer, - ffi.Size)>>('ICU4XCollator_compare_valid_utf8') - .asFunction< - int Function(ffi.Pointer, ffi.Pointer, int, - ffi.Pointer, int)>(isLeaf: true); + static final _ICU4XCollator_compare_valid_utf8 = + _capi, ffi.Pointer, ffi.Size, ffi.Pointer, ffi.Size)>>('ICU4XCollator_compare_valid_utf8') + .asFunction, ffi.Pointer, int, ffi.Pointer, int)>(isLeaf: true); /// Compare potentially ill-formed UTF-16 strings, with unpaired surrogates /// compared as REPLACEMENT CHARACTER. @@ -82,23 +61,13 @@ final class Collator implements ffi.Finalizable { final alloc = ffi2.Arena(); final leftSlice = _SliceFfiUint16._fromDart(left, alloc); final rightSlice = _SliceFfiUint16._fromDart(right, alloc); - - final result = _ICU4XCollator_compare_utf16(_underlying, leftSlice._bytes, - leftSlice._length, rightSlice._bytes, rightSlice._length); + final result = _ICU4XCollator_compare_utf16(_underlying, leftSlice._bytes, leftSlice._length, rightSlice._bytes, rightSlice._length); alloc.releaseAll(); return Ordering.values.firstWhere((v) => v._underlying == result); } // ignore: non_constant_identifier_names - static final _ICU4XCollator_compare_utf16 = _capi< - ffi.NativeFunction< - ffi.Int32 Function( - ffi.Pointer, - ffi.Pointer, - ffi.Size, - ffi.Pointer, - ffi.Size)>>('ICU4XCollator_compare_utf16') - .asFunction< - int Function(ffi.Pointer, ffi.Pointer, int, - ffi.Pointer, int)>(isLeaf: true); + static final _ICU4XCollator_compare_utf16 = + _capi, ffi.Pointer, ffi.Size, ffi.Pointer, ffi.Size)>>('ICU4XCollator_compare_utf16') + .asFunction, ffi.Pointer, int, ffi.Pointer, int)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/CollatorAlternateHandling.g.dart b/ffi/capi/dart/package/lib/src/CollatorAlternateHandling.g.dart index 54fee26003e..ecef6449a34 100644 --- a/ffi/capi/dart/package/lib/src/CollatorAlternateHandling.g.dart +++ b/ffi/capi/dart/package/lib/src/CollatorAlternateHandling.g.dart @@ -8,6 +8,8 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `AlternateHandling`](https://docs.rs/icu/latest/icu/collator/enum.AlternateHandling.html) for more information. enum CollatorAlternateHandling { auto, + nonIgnorable, + shifted; } diff --git a/ffi/capi/dart/package/lib/src/CollatorBackwardSecondLevel.g.dart b/ffi/capi/dart/package/lib/src/CollatorBackwardSecondLevel.g.dart index 315bda19716..2f081542749 100644 --- a/ffi/capi/dart/package/lib/src/CollatorBackwardSecondLevel.g.dart +++ b/ffi/capi/dart/package/lib/src/CollatorBackwardSecondLevel.g.dart @@ -8,6 +8,8 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `BackwardSecondLevel`](https://docs.rs/icu/latest/icu/collator/enum.BackwardSecondLevel.html) for more information. enum CollatorBackwardSecondLevel { auto, + off, + on; } diff --git a/ffi/capi/dart/package/lib/src/CollatorCaseFirst.g.dart b/ffi/capi/dart/package/lib/src/CollatorCaseFirst.g.dart index 7e2b886cdd8..caca571135c 100644 --- a/ffi/capi/dart/package/lib/src/CollatorCaseFirst.g.dart +++ b/ffi/capi/dart/package/lib/src/CollatorCaseFirst.g.dart @@ -8,7 +8,10 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `CaseFirst`](https://docs.rs/icu/latest/icu/collator/enum.CaseFirst.html) for more information. enum CollatorCaseFirst { auto, + off, + lowerFirst, + upperFirst; } diff --git a/ffi/capi/dart/package/lib/src/CollatorCaseLevel.g.dart b/ffi/capi/dart/package/lib/src/CollatorCaseLevel.g.dart index f133e892827..033e9db670b 100644 --- a/ffi/capi/dart/package/lib/src/CollatorCaseLevel.g.dart +++ b/ffi/capi/dart/package/lib/src/CollatorCaseLevel.g.dart @@ -8,6 +8,8 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `CaseLevel`](https://docs.rs/icu/latest/icu/collator/enum.CaseLevel.html) for more information. enum CollatorCaseLevel { auto, + off, + on; } diff --git a/ffi/capi/dart/package/lib/src/CollatorMaxVariable.g.dart b/ffi/capi/dart/package/lib/src/CollatorMaxVariable.g.dart index 55962c980f2..51b071b46c0 100644 --- a/ffi/capi/dart/package/lib/src/CollatorMaxVariable.g.dart +++ b/ffi/capi/dart/package/lib/src/CollatorMaxVariable.g.dart @@ -8,8 +8,12 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `MaxVariable`](https://docs.rs/icu/latest/icu/collator/enum.MaxVariable.html) for more information. enum CollatorMaxVariable { auto, + space, + punctuation, + symbol, + currency; } diff --git a/ffi/capi/dart/package/lib/src/CollatorNumeric.g.dart b/ffi/capi/dart/package/lib/src/CollatorNumeric.g.dart index 85f41517840..fac5b71df63 100644 --- a/ffi/capi/dart/package/lib/src/CollatorNumeric.g.dart +++ b/ffi/capi/dart/package/lib/src/CollatorNumeric.g.dart @@ -8,6 +8,8 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `Numeric`](https://docs.rs/icu/latest/icu/collator/enum.Numeric.html) for more information. enum CollatorNumeric { auto, + off, + on; } diff --git a/ffi/capi/dart/package/lib/src/CollatorOptionsV1.g.dart b/ffi/capi/dart/package/lib/src/CollatorOptionsV1.g.dart index b4b8869e5d3..590bbb224bd 100644 --- a/ffi/capi/dart/package/lib/src/CollatorOptionsV1.g.dart +++ b/ffi/capi/dart/package/lib/src/CollatorOptionsV1.g.dart @@ -36,32 +36,27 @@ final class CollatorOptionsV1 { return result; } - CollatorStrength get strength => - CollatorStrength.values[_underlying.strength]; + CollatorStrength get strength => CollatorStrength.values[_underlying.strength]; set strength(CollatorStrength strength) { _underlying.strength = strength.index; } - CollatorAlternateHandling get alternateHandling => - CollatorAlternateHandling.values[_underlying.alternateHandling]; + CollatorAlternateHandling get alternateHandling => CollatorAlternateHandling.values[_underlying.alternateHandling]; set alternateHandling(CollatorAlternateHandling alternateHandling) { _underlying.alternateHandling = alternateHandling.index; } - CollatorCaseFirst get caseFirst => - CollatorCaseFirst.values[_underlying.caseFirst]; + CollatorCaseFirst get caseFirst => CollatorCaseFirst.values[_underlying.caseFirst]; set caseFirst(CollatorCaseFirst caseFirst) { _underlying.caseFirst = caseFirst.index; } - CollatorMaxVariable get maxVariable => - CollatorMaxVariable.values[_underlying.maxVariable]; + CollatorMaxVariable get maxVariable => CollatorMaxVariable.values[_underlying.maxVariable]; set maxVariable(CollatorMaxVariable maxVariable) { _underlying.maxVariable = maxVariable.index; } - CollatorCaseLevel get caseLevel => - CollatorCaseLevel.values[_underlying.caseLevel]; + CollatorCaseLevel get caseLevel => CollatorCaseLevel.values[_underlying.caseLevel]; set caseLevel(CollatorCaseLevel caseLevel) { _underlying.caseLevel = caseLevel.index; } @@ -71,8 +66,7 @@ final class CollatorOptionsV1 { _underlying.numeric = numeric.index; } - CollatorBackwardSecondLevel get backwardSecondLevel => - CollatorBackwardSecondLevel.values[_underlying.backwardSecondLevel]; + CollatorBackwardSecondLevel get backwardSecondLevel => CollatorBackwardSecondLevel.values[_underlying.backwardSecondLevel]; set backwardSecondLevel(CollatorBackwardSecondLevel backwardSecondLevel) { _underlying.backwardSecondLevel = backwardSecondLevel.index; } diff --git a/ffi/capi/dart/package/lib/src/CollatorStrength.g.dart b/ffi/capi/dart/package/lib/src/CollatorStrength.g.dart index 72d8c07a434..e9bc7435a71 100644 --- a/ffi/capi/dart/package/lib/src/CollatorStrength.g.dart +++ b/ffi/capi/dart/package/lib/src/CollatorStrength.g.dart @@ -8,9 +8,14 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `Strength`](https://docs.rs/icu/latest/icu/collator/enum.Strength.html) for more information. enum CollatorStrength { auto, + primary, + secondary, + tertiary, + quaternary, + identical; } diff --git a/ffi/capi/dart/package/lib/src/ComposingNormalizer.g.dart b/ffi/capi/dart/package/lib/src/ComposingNormalizer.g.dart index 2f154a3a075..41aa9a6205b 100644 --- a/ffi/capi/dart/package/lib/src/ComposingNormalizer.g.dart +++ b/ffi/capi/dart/package/lib/src/ComposingNormalizer.g.dart @@ -13,8 +13,7 @@ final class ComposingNormalizer implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XComposingNormalizer_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XComposingNormalizer_destroy')); /// Construct a new ICU4XComposingNormalizer instance for NFC /// @@ -28,13 +27,11 @@ final class ComposingNormalizer implements ffi.Finalizable { } return ComposingNormalizer._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XComposingNormalizer_create_nfc = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XComposingNormalizer_create_nfc') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XComposingNormalizer_create_nfc = + _capi)>>('ICU4XComposingNormalizer_create_nfc') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// Construct a new ICU4XComposingNormalizer instance for NFKC /// @@ -48,13 +45,11 @@ final class ComposingNormalizer implements ffi.Finalizable { } return ComposingNormalizer._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XComposingNormalizer_create_nfkc = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XComposingNormalizer_create_nfkc') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XComposingNormalizer_create_nfkc = + _capi)>>('ICU4XComposingNormalizer_create_nfkc') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// Normalize a (potentially ill-formed) UTF8 string /// @@ -66,10 +61,8 @@ final class ComposingNormalizer implements ffi.Finalizable { String normalize(String s) { final alloc = ffi2.Arena(); final sSlice = _SliceFfi2Utf8._fromDart(s, alloc); - final writeable = _Writeable(); - final result = _ICU4XComposingNormalizer_normalize( - _underlying, sSlice._bytes, sSlice._length, writeable._underlying); + final result = _ICU4XComposingNormalizer_normalize(_underlying, sSlice._bytes, sSlice._length, writeable._underlying); alloc.releaseAll(); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); @@ -78,20 +71,9 @@ final class ComposingNormalizer implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XComposingNormalizer_normalize = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function( - ffi.Pointer, - ffi.Pointer, - ffi.Size, - ffi.Pointer)>>( - 'ICU4XComposingNormalizer_normalize') - .asFunction< - _ResultVoidInt32 Function( - ffi.Pointer, - ffi.Pointer, - int, - ffi.Pointer)>(isLeaf: true); + static final _ICU4XComposingNormalizer_normalize = + _capi, ffi.Pointer, ffi.Size, ffi.Pointer)>>('ICU4XComposingNormalizer_normalize') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer, int, ffi.Pointer)>(isLeaf: true); /// Check if a (potentially ill-formed) UTF8 string is normalized /// @@ -101,19 +83,13 @@ final class ComposingNormalizer implements ffi.Finalizable { bool isNormalized(String s) { final alloc = ffi2.Arena(); final sSlice = _SliceFfi2Utf8._fromDart(s, alloc); - - final result = _ICU4XComposingNormalizer_is_normalized( - _underlying, sSlice._bytes, sSlice._length); + final result = _ICU4XComposingNormalizer_is_normalized(_underlying, sSlice._bytes, sSlice._length); alloc.releaseAll(); return result; } // ignore: non_constant_identifier_names - static final _ICU4XComposingNormalizer_is_normalized = _capi< - ffi.NativeFunction< - ffi.Bool Function(ffi.Pointer, ffi.Pointer, - ffi.Size)>>('ICU4XComposingNormalizer_is_normalized') - .asFunction< - bool Function(ffi.Pointer, ffi.Pointer, - int)>(isLeaf: true); + static final _ICU4XComposingNormalizer_is_normalized = + _capi, ffi.Pointer, ffi.Size)>>('ICU4XComposingNormalizer_is_normalized') + .asFunction, ffi.Pointer, int)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/CustomTimeZone.g.dart b/ffi/capi/dart/package/lib/src/CustomTimeZone.g.dart index 9823864a3e5..328d8389d83 100644 --- a/ffi/capi/dart/package/lib/src/CustomTimeZone.g.dart +++ b/ffi/capi/dart/package/lib/src/CustomTimeZone.g.dart @@ -13,8 +13,7 @@ final class CustomTimeZone implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XCustomTimeZone_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XCustomTimeZone_destroy')); /// Creates a time zone from an offset string. /// @@ -24,22 +23,18 @@ final class CustomTimeZone implements ffi.Finalizable { factory CustomTimeZone.fromString(String s) { final alloc = ffi2.Arena(); final sSlice = _SliceFfi2Utf8._fromDart(s, alloc); - - final result = - _ICU4XCustomTimeZone_create_from_string(sSlice._bytes, sSlice._length); + final result = _ICU4XCustomTimeZone_create_from_string(sSlice._bytes, sSlice._length); alloc.releaseAll(); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return CustomTimeZone._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XCustomTimeZone_create_from_string = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer, - ffi.Size)>>('ICU4XCustomTimeZone_create_from_string') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer, int)>( - isLeaf: true); + static final _ICU4XCustomTimeZone_create_from_string = + _capi, ffi.Size)>>('ICU4XCustomTimeZone_create_from_string') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer, int)>(isLeaf: true); /// Creates a time zone with no information. /// @@ -48,11 +43,11 @@ final class CustomTimeZone implements ffi.Finalizable { final result = _ICU4XCustomTimeZone_create_empty(); return CustomTimeZone._(result); } + // ignore: non_constant_identifier_names static final _ICU4XCustomTimeZone_create_empty = - _capi Function()>>( - 'ICU4XCustomTimeZone_create_empty') - .asFunction Function()>(isLeaf: true); + _capi Function()>>('ICU4XCustomTimeZone_create_empty') + .asFunction Function()>(isLeaf: true); /// Creates a time zone for UTC. /// @@ -61,11 +56,11 @@ final class CustomTimeZone implements ffi.Finalizable { final result = _ICU4XCustomTimeZone_create_utc(); return CustomTimeZone._(result); } + // ignore: non_constant_identifier_names static final _ICU4XCustomTimeZone_create_utc = - _capi Function()>>( - 'ICU4XCustomTimeZone_create_utc') - .asFunction Function()>(isLeaf: true); + _capi Function()>>('ICU4XCustomTimeZone_create_utc') + .asFunction Function()>(isLeaf: true); /// Sets the `gmt_offset` field from offset seconds. /// @@ -77,20 +72,16 @@ final class CustomTimeZone implements ffi.Finalizable { /// /// Throws [Error] on failure. void trySetGmtOffsetSeconds(int offsetSeconds) { - final result = _ICU4XCustomTimeZone_try_set_gmt_offset_seconds( - _underlying, offsetSeconds); + final result = _ICU4XCustomTimeZone_try_set_gmt_offset_seconds(_underlying, offsetSeconds); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } } // ignore: non_constant_identifier_names - static final _ICU4XCustomTimeZone_try_set_gmt_offset_seconds = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function(ffi.Pointer, - ffi.Int32)>>('ICU4XCustomTimeZone_try_set_gmt_offset_seconds') - .asFunction<_ResultVoidInt32 Function(ffi.Pointer, int)>( - isLeaf: true); + static final _ICU4XCustomTimeZone_try_set_gmt_offset_seconds = + _capi, ffi.Int32)>>('ICU4XCustomTimeZone_try_set_gmt_offset_seconds') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, int)>(isLeaf: true); /// Clears the `gmt_offset` field. /// @@ -103,9 +94,8 @@ final class CustomTimeZone implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XCustomTimeZone_clear_gmt_offset = - _capi)>>( - 'ICU4XCustomTimeZone_clear_gmt_offset') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XCustomTimeZone_clear_gmt_offset') + .asFunction)>(isLeaf: true); /// Returns the value of the `gmt_offset` field as offset seconds. /// @@ -125,12 +115,9 @@ final class CustomTimeZone implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XCustomTimeZone_gmt_offset_seconds = _capi< - ffi.NativeFunction< - _ResultInt32Int32 Function(ffi.Pointer)>>( - 'ICU4XCustomTimeZone_gmt_offset_seconds') - .asFunction<_ResultInt32Int32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCustomTimeZone_gmt_offset_seconds = + _capi)>>('ICU4XCustomTimeZone_gmt_offset_seconds') + .asFunction<_ResultInt32Int32 Function(ffi.Pointer)>(isLeaf: true); /// Returns whether the `gmt_offset` field is positive. /// @@ -148,12 +135,9 @@ final class CustomTimeZone implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XCustomTimeZone_is_gmt_offset_positive = _capi< - ffi.NativeFunction< - _ResultBoolInt32 Function(ffi.Pointer)>>( - 'ICU4XCustomTimeZone_is_gmt_offset_positive') - .asFunction<_ResultBoolInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCustomTimeZone_is_gmt_offset_positive = + _capi)>>('ICU4XCustomTimeZone_is_gmt_offset_positive') + .asFunction<_ResultBoolInt32 Function(ffi.Pointer)>(isLeaf: true); /// Returns whether the `gmt_offset` field is zero. /// @@ -171,12 +155,9 @@ final class CustomTimeZone implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XCustomTimeZone_is_gmt_offset_zero = _capi< - ffi.NativeFunction< - _ResultBoolInt32 Function(ffi.Pointer)>>( - 'ICU4XCustomTimeZone_is_gmt_offset_zero') - .asFunction<_ResultBoolInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCustomTimeZone_is_gmt_offset_zero = + _capi)>>('ICU4XCustomTimeZone_is_gmt_offset_zero') + .asFunction<_ResultBoolInt32 Function(ffi.Pointer)>(isLeaf: true); /// Returns whether the `gmt_offset` field has nonzero minutes. /// @@ -194,12 +175,9 @@ final class CustomTimeZone implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XCustomTimeZone_gmt_offset_has_minutes = _capi< - ffi.NativeFunction< - _ResultBoolInt32 Function(ffi.Pointer)>>( - 'ICU4XCustomTimeZone_gmt_offset_has_minutes') - .asFunction<_ResultBoolInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCustomTimeZone_gmt_offset_has_minutes = + _capi)>>('ICU4XCustomTimeZone_gmt_offset_has_minutes') + .asFunction<_ResultBoolInt32 Function(ffi.Pointer)>(isLeaf: true); /// Returns whether the `gmt_offset` field has nonzero seconds. /// @@ -217,12 +195,9 @@ final class CustomTimeZone implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XCustomTimeZone_gmt_offset_has_seconds = _capi< - ffi.NativeFunction< - _ResultBoolInt32 Function(ffi.Pointer)>>( - 'ICU4XCustomTimeZone_gmt_offset_has_seconds') - .asFunction<_ResultBoolInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCustomTimeZone_gmt_offset_has_seconds = + _capi)>>('ICU4XCustomTimeZone_gmt_offset_has_seconds') + .asFunction<_ResultBoolInt32 Function(ffi.Pointer)>(isLeaf: true); /// Sets the `time_zone_id` field from a BCP-47 string. /// @@ -236,9 +211,7 @@ final class CustomTimeZone implements ffi.Finalizable { void trySetTimeZoneId(String id) { final alloc = ffi2.Arena(); final idSlice = _SliceFfi2Utf8._fromDart(id, alloc); - - final result = _ICU4XCustomTimeZone_try_set_time_zone_id( - _underlying, idSlice._bytes, idSlice._length); + final result = _ICU4XCustomTimeZone_try_set_time_zone_id(_underlying, idSlice._bytes, idSlice._length); alloc.releaseAll(); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); @@ -246,15 +219,9 @@ final class CustomTimeZone implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XCustomTimeZone_try_set_time_zone_id = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function( - ffi.Pointer, - ffi.Pointer, - ffi.Size)>>('ICU4XCustomTimeZone_try_set_time_zone_id') - .asFunction< - _ResultVoidInt32 Function(ffi.Pointer, - ffi.Pointer, int)>(isLeaf: true); + static final _ICU4XCustomTimeZone_try_set_time_zone_id = + _capi, ffi.Pointer, ffi.Size)>>('ICU4XCustomTimeZone_try_set_time_zone_id') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer, int)>(isLeaf: true); /// Sets the `time_zone_id` field from an IANA string by looking up /// the corresponding BCP-47 string. @@ -267,9 +234,7 @@ final class CustomTimeZone implements ffi.Finalizable { void trySetIanaTimeZoneId(IanaToBcp47Mapper mapper, String id) { final alloc = ffi2.Arena(); final idSlice = _SliceFfi2Utf8._fromDart(id, alloc); - - final result = _ICU4XCustomTimeZone_try_set_iana_time_zone_id( - _underlying, mapper._underlying, idSlice._bytes, idSlice._length); + final result = _ICU4XCustomTimeZone_try_set_iana_time_zone_id(_underlying, mapper._underlying, idSlice._bytes, idSlice._length); alloc.releaseAll(); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); @@ -277,19 +242,9 @@ final class CustomTimeZone implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XCustomTimeZone_try_set_iana_time_zone_id = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function( - ffi.Pointer, - ffi.Pointer, - ffi.Pointer, - ffi.Size)>>('ICU4XCustomTimeZone_try_set_iana_time_zone_id') - .asFunction< - _ResultVoidInt32 Function( - ffi.Pointer, - ffi.Pointer, - ffi.Pointer, - int)>(isLeaf: true); + static final _ICU4XCustomTimeZone_try_set_iana_time_zone_id = + _capi, ffi.Pointer, ffi.Pointer, ffi.Size)>>('ICU4XCustomTimeZone_try_set_iana_time_zone_id') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer, ffi.Pointer, int)>(isLeaf: true); /// Clears the `time_zone_id` field. /// @@ -302,9 +257,8 @@ final class CustomTimeZone implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XCustomTimeZone_clear_time_zone_id = - _capi)>>( - 'ICU4XCustomTimeZone_clear_time_zone_id') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XCustomTimeZone_clear_time_zone_id') + .asFunction)>(isLeaf: true); /// Writes the value of the `time_zone_id` field as a string. /// @@ -317,8 +271,7 @@ final class CustomTimeZone implements ffi.Finalizable { /// Throws [Error] on failure. String get timeZoneId { final writeable = _Writeable(); - final result = - _ICU4XCustomTimeZone_time_zone_id(_underlying, writeable._underlying); + final result = _ICU4XCustomTimeZone_time_zone_id(_underlying, writeable._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } @@ -326,13 +279,9 @@ final class CustomTimeZone implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XCustomTimeZone_time_zone_id = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function(ffi.Pointer, - ffi.Pointer)>>('ICU4XCustomTimeZone_time_zone_id') - .asFunction< - _ResultVoidInt32 Function( - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XCustomTimeZone_time_zone_id = + _capi, ffi.Pointer)>>('ICU4XCustomTimeZone_time_zone_id') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer)>(isLeaf: true); /// Sets the `metazone_id` field from a string. /// @@ -346,9 +295,7 @@ final class CustomTimeZone implements ffi.Finalizable { void trySetMetazoneId(String id) { final alloc = ffi2.Arena(); final idSlice = _SliceFfi2Utf8._fromDart(id, alloc); - - final result = _ICU4XCustomTimeZone_try_set_metazone_id( - _underlying, idSlice._bytes, idSlice._length); + final result = _ICU4XCustomTimeZone_try_set_metazone_id(_underlying, idSlice._bytes, idSlice._length); alloc.releaseAll(); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); @@ -356,15 +303,9 @@ final class CustomTimeZone implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XCustomTimeZone_try_set_metazone_id = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function( - ffi.Pointer, - ffi.Pointer, - ffi.Size)>>('ICU4XCustomTimeZone_try_set_metazone_id') - .asFunction< - _ResultVoidInt32 Function(ffi.Pointer, - ffi.Pointer, int)>(isLeaf: true); + static final _ICU4XCustomTimeZone_try_set_metazone_id = + _capi, ffi.Pointer, ffi.Size)>>('ICU4XCustomTimeZone_try_set_metazone_id') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer, int)>(isLeaf: true); /// Clears the `metazone_id` field. /// @@ -377,9 +318,8 @@ final class CustomTimeZone implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XCustomTimeZone_clear_metazone_id = - _capi)>>( - 'ICU4XCustomTimeZone_clear_metazone_id') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XCustomTimeZone_clear_metazone_id') + .asFunction)>(isLeaf: true); /// Writes the value of the `metazone_id` field as a string. /// @@ -392,8 +332,7 @@ final class CustomTimeZone implements ffi.Finalizable { /// Throws [Error] on failure. String get metazoneId { final writeable = _Writeable(); - final result = - _ICU4XCustomTimeZone_metazone_id(_underlying, writeable._underlying); + final result = _ICU4XCustomTimeZone_metazone_id(_underlying, writeable._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } @@ -401,13 +340,9 @@ final class CustomTimeZone implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XCustomTimeZone_metazone_id = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function(ffi.Pointer, - ffi.Pointer)>>('ICU4XCustomTimeZone_metazone_id') - .asFunction< - _ResultVoidInt32 Function( - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XCustomTimeZone_metazone_id = + _capi, ffi.Pointer)>>('ICU4XCustomTimeZone_metazone_id') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer)>(isLeaf: true); /// Sets the `zone_variant` field from a string. /// @@ -421,9 +356,7 @@ final class CustomTimeZone implements ffi.Finalizable { void trySetZoneVariant(String id) { final alloc = ffi2.Arena(); final idSlice = _SliceFfi2Utf8._fromDart(id, alloc); - - final result = _ICU4XCustomTimeZone_try_set_zone_variant( - _underlying, idSlice._bytes, idSlice._length); + final result = _ICU4XCustomTimeZone_try_set_zone_variant(_underlying, idSlice._bytes, idSlice._length); alloc.releaseAll(); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); @@ -431,15 +364,9 @@ final class CustomTimeZone implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XCustomTimeZone_try_set_zone_variant = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function( - ffi.Pointer, - ffi.Pointer, - ffi.Size)>>('ICU4XCustomTimeZone_try_set_zone_variant') - .asFunction< - _ResultVoidInt32 Function(ffi.Pointer, - ffi.Pointer, int)>(isLeaf: true); + static final _ICU4XCustomTimeZone_try_set_zone_variant = + _capi, ffi.Pointer, ffi.Size)>>('ICU4XCustomTimeZone_try_set_zone_variant') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer, int)>(isLeaf: true); /// Clears the `zone_variant` field. /// @@ -452,9 +379,8 @@ final class CustomTimeZone implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XCustomTimeZone_clear_zone_variant = - _capi)>>( - 'ICU4XCustomTimeZone_clear_zone_variant') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XCustomTimeZone_clear_zone_variant') + .asFunction)>(isLeaf: true); /// Writes the value of the `zone_variant` field as a string. /// @@ -467,8 +393,7 @@ final class CustomTimeZone implements ffi.Finalizable { /// Throws [Error] on failure. String get zoneVariant { final writeable = _Writeable(); - final result = - _ICU4XCustomTimeZone_zone_variant(_underlying, writeable._underlying); + final result = _ICU4XCustomTimeZone_zone_variant(_underlying, writeable._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } @@ -476,13 +401,9 @@ final class CustomTimeZone implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XCustomTimeZone_zone_variant = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function(ffi.Pointer, - ffi.Pointer)>>('ICU4XCustomTimeZone_zone_variant') - .asFunction< - _ResultVoidInt32 Function( - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XCustomTimeZone_zone_variant = + _capi, ffi.Pointer)>>('ICU4XCustomTimeZone_zone_variant') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer)>(isLeaf: true); /// Sets the `zone_variant` field to standard time. /// @@ -495,9 +416,8 @@ final class CustomTimeZone implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XCustomTimeZone_set_standard_time = - _capi)>>( - 'ICU4XCustomTimeZone_set_standard_time') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XCustomTimeZone_set_standard_time') + .asFunction)>(isLeaf: true); /// Sets the `zone_variant` field to daylight time. /// @@ -510,9 +430,8 @@ final class CustomTimeZone implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XCustomTimeZone_set_daylight_time = - _capi)>>( - 'ICU4XCustomTimeZone_set_daylight_time') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XCustomTimeZone_set_daylight_time') + .asFunction)>(isLeaf: true); /// Returns whether the `zone_variant` field is standard time. /// @@ -532,12 +451,9 @@ final class CustomTimeZone implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XCustomTimeZone_is_standard_time = _capi< - ffi.NativeFunction< - _ResultBoolInt32 Function(ffi.Pointer)>>( - 'ICU4XCustomTimeZone_is_standard_time') - .asFunction<_ResultBoolInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCustomTimeZone_is_standard_time = + _capi)>>('ICU4XCustomTimeZone_is_standard_time') + .asFunction<_ResultBoolInt32 Function(ffi.Pointer)>(isLeaf: true); /// Returns whether the `zone_variant` field is daylight time. /// @@ -557,31 +473,21 @@ final class CustomTimeZone implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XCustomTimeZone_is_daylight_time = _capi< - ffi.NativeFunction< - _ResultBoolInt32 Function(ffi.Pointer)>>( - 'ICU4XCustomTimeZone_is_daylight_time') - .asFunction<_ResultBoolInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XCustomTimeZone_is_daylight_time = + _capi)>>('ICU4XCustomTimeZone_is_daylight_time') + .asFunction<_ResultBoolInt32 Function(ffi.Pointer)>(isLeaf: true); /// Sets the metazone based on the time zone and the local timestamp. /// /// See the [Rust documentation for `maybe_calculate_metazone`](https://docs.rs/icu/latest/icu/timezone/struct.CustomTimeZone.html#method.maybe_calculate_metazone) for more information. /// /// Additional information: [1](https://docs.rs/icu/latest/icu/timezone/struct.MetazoneCalculator.html#method.compute_metazone_from_time_zone) - void maybeCalculateMetazone( - MetazoneCalculator metazoneCalculator, IsoDateTime localDatetime) { - _ICU4XCustomTimeZone_maybe_calculate_metazone( - _underlying, metazoneCalculator._underlying, localDatetime._underlying); + void maybeCalculateMetazone(MetazoneCalculator metazoneCalculator, IsoDateTime localDatetime) { + _ICU4XCustomTimeZone_maybe_calculate_metazone(_underlying, metazoneCalculator._underlying, localDatetime._underlying); } // ignore: non_constant_identifier_names - static final _ICU4XCustomTimeZone_maybe_calculate_metazone = _capi< - ffi.NativeFunction< - ffi.Void Function(ffi.Pointer, - ffi.Pointer, ffi.Pointer)>>( - 'ICU4XCustomTimeZone_maybe_calculate_metazone') - .asFunction< - void Function(ffi.Pointer, ffi.Pointer, - ffi.Pointer)>(isLeaf: true); + static final _ICU4XCustomTimeZone_maybe_calculate_metazone = + _capi, ffi.Pointer, ffi.Pointer)>>('ICU4XCustomTimeZone_maybe_calculate_metazone') + .asFunction, ffi.Pointer, ffi.Pointer)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/DataProvider.g.dart b/ffi/capi/dart/package/lib/src/DataProvider.g.dart index fa10e37bfd0..7fcc736fd5f 100644 --- a/ffi/capi/dart/package/lib/src/DataProvider.g.dart +++ b/ffi/capi/dart/package/lib/src/DataProvider.g.dart @@ -15,8 +15,7 @@ final class DataProvider implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XDataProvider_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XDataProvider_destroy')); /// Constructs an [`DataProvider`] that uses compiled data. /// @@ -28,11 +27,11 @@ final class DataProvider implements ffi.Finalizable { final result = _ICU4XDataProvider_create_compiled(); return DataProvider._(result); } + // ignore: non_constant_identifier_names static final _ICU4XDataProvider_create_compiled = - _capi Function()>>( - 'ICU4XDataProvider_create_compiled') - .asFunction Function()>(isLeaf: true); + _capi Function()>>('ICU4XDataProvider_create_compiled') + .asFunction Function()>(isLeaf: true); /// Constructs a `BlobDataProvider` and returns it as an [`DataProvider`]. /// @@ -42,22 +41,18 @@ final class DataProvider implements ffi.Finalizable { factory DataProvider.fromByteSlice(Uint8List blob) { final alloc = ffi2.Arena(); final blobSlice = _SliceFfiUint8._fromDart(blob, alloc); - - final result = _ICU4XDataProvider_create_from_byte_slice( - blobSlice._bytes, blobSlice._length); + final result = _ICU4XDataProvider_create_from_byte_slice(blobSlice._bytes, blobSlice._length); alloc.releaseAll(); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return DataProvider._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XDataProvider_create_from_byte_slice = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer, - ffi.Size)>>('ICU4XDataProvider_create_from_byte_slice') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer, int)>( - isLeaf: true); + static final _ICU4XDataProvider_create_from_byte_slice = + _capi, ffi.Size)>>('ICU4XDataProvider_create_from_byte_slice') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer, int)>(isLeaf: true); /// Constructs an empty [`DataProvider`]. /// @@ -66,11 +61,11 @@ final class DataProvider implements ffi.Finalizable { final result = _ICU4XDataProvider_create_empty(); return DataProvider._(result); } + // ignore: non_constant_identifier_names static final _ICU4XDataProvider_create_empty = - _capi Function()>>( - 'ICU4XDataProvider_create_empty') - .asFunction Function()>(isLeaf: true); + _capi Function()>>('ICU4XDataProvider_create_empty') + .asFunction Function()>(isLeaf: true); /// Creates a provider that tries the current provider and then, if the current provider /// doesn't support the data key, another provider `other`. @@ -85,21 +80,16 @@ final class DataProvider implements ffi.Finalizable { /// /// Throws [Error] on failure. void forkByKey(DataProvider other) { - final result = - _ICU4XDataProvider_fork_by_key(_underlying, other._underlying); + final result = _ICU4XDataProvider_fork_by_key(_underlying, other._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } } // ignore: non_constant_identifier_names - static final _ICU4XDataProvider_fork_by_key = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function(ffi.Pointer, - ffi.Pointer)>>('ICU4XDataProvider_fork_by_key') - .asFunction< - _ResultVoidInt32 Function( - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XDataProvider_fork_by_key = + _capi, ffi.Pointer)>>('ICU4XDataProvider_fork_by_key') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer)>(isLeaf: true); /// Same as `fork_by_key` but forks by locale instead of key. /// @@ -107,21 +97,16 @@ final class DataProvider implements ffi.Finalizable { /// /// Throws [Error] on failure. void forkByLocale(DataProvider other) { - final result = - _ICU4XDataProvider_fork_by_locale(_underlying, other._underlying); + final result = _ICU4XDataProvider_fork_by_locale(_underlying, other._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } } // ignore: non_constant_identifier_names - static final _ICU4XDataProvider_fork_by_locale = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function(ffi.Pointer, - ffi.Pointer)>>('ICU4XDataProvider_fork_by_locale') - .asFunction< - _ResultVoidInt32 Function( - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XDataProvider_fork_by_locale = + _capi, ffi.Pointer)>>('ICU4XDataProvider_fork_by_locale') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer)>(isLeaf: true); /// Enables locale fallbacking for data requests made to this provider. /// @@ -140,12 +125,9 @@ final class DataProvider implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XDataProvider_enable_locale_fallback = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function(ffi.Pointer)>>( - 'ICU4XDataProvider_enable_locale_fallback') - .asFunction<_ResultVoidInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XDataProvider_enable_locale_fallback = + _capi)>>('ICU4XDataProvider_enable_locale_fallback') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `new_with_fallbacker`](https://docs.rs/icu_provider_adapters/latest/icu_provider_adapters/fallback/struct.LocaleFallbackProvider.html#method.new_with_fallbacker) for more information. /// @@ -153,20 +135,14 @@ final class DataProvider implements ffi.Finalizable { /// /// Throws [Error] on failure. void enableLocaleFallbackWith(LocaleFallbacker fallbacker) { - final result = _ICU4XDataProvider_enable_locale_fallback_with( - _underlying, fallbacker._underlying); + final result = _ICU4XDataProvider_enable_locale_fallback_with(_underlying, fallbacker._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } } // ignore: non_constant_identifier_names - static final _ICU4XDataProvider_enable_locale_fallback_with = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function( - ffi.Pointer, ffi.Pointer)>>( - 'ICU4XDataProvider_enable_locale_fallback_with') - .asFunction< - _ResultVoidInt32 Function( - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XDataProvider_enable_locale_fallback_with = + _capi, ffi.Pointer)>>('ICU4XDataProvider_enable_locale_fallback_with') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/Date.g.dart b/ffi/capi/dart/package/lib/src/Date.g.dart index b600c09160f..ff52c7763c0 100644 --- a/ffi/capi/dart/package/lib/src/Date.g.dart +++ b/ffi/capi/dart/package/lib/src/Date.g.dart @@ -23,71 +23,40 @@ final class Date implements ffi.Finalizable { /// See the [Rust documentation for `new_from_iso`](https://docs.rs/icu/latest/icu/calendar/struct.Date.html#method.new_from_iso) for more information. /// /// Throws [Error] on failure. - factory Date.fromIsoInCalendar( - int year, int month, int day, Calendar calendar) { - final result = _ICU4XDate_create_from_iso_in_calendar( - year, month, day, calendar._underlying); + factory Date.fromIsoInCalendar(int year, int month, int day, Calendar calendar) { + final result = _ICU4XDate_create_from_iso_in_calendar(year, month, day, calendar._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return Date._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XDate_create_from_iso_in_calendar = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Int32, ffi.Uint8, ffi.Uint8, - ffi.Pointer)>>( - 'ICU4XDate_create_from_iso_in_calendar') - .asFunction< - _ResultOpaqueInt32 Function( - int, int, int, ffi.Pointer)>(isLeaf: true); + static final _ICU4XDate_create_from_iso_in_calendar = + _capi)>>('ICU4XDate_create_from_iso_in_calendar') + .asFunction<_ResultOpaqueInt32 Function(int, int, int, ffi.Pointer)>(isLeaf: true); /// Creates a new [`Date`] from the given codes, which are interpreted in the given calendar system /// /// See the [Rust documentation for `try_new_from_codes`](https://docs.rs/icu/latest/icu/calendar/struct.Date.html#method.try_new_from_codes) for more information. /// /// Throws [Error] on failure. - factory Date.fromCodesInCalendar( - String eraCode, int year, String monthCode, int day, Calendar calendar) { + factory Date.fromCodesInCalendar(String eraCode, int year, String monthCode, int day, Calendar calendar) { final alloc = ffi2.Arena(); final eraCodeSlice = _SliceFfi2Utf8._fromDart(eraCode, alloc); final monthCodeSlice = _SliceFfi2Utf8._fromDart(monthCode, alloc); - - final result = _ICU4XDate_create_from_codes_in_calendar( - eraCodeSlice._bytes, - eraCodeSlice._length, - year, - monthCodeSlice._bytes, - monthCodeSlice._length, - day, - calendar._underlying); + final result = _ICU4XDate_create_from_codes_in_calendar(eraCodeSlice._bytes, eraCodeSlice._length, year, monthCodeSlice._bytes, monthCodeSlice._length, day, calendar._underlying); alloc.releaseAll(); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return Date._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XDate_create_from_codes_in_calendar = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer, - ffi.Size, - ffi.Int32, - ffi.Pointer, - ffi.Size, - ffi.Uint8, - ffi.Pointer)>>( - 'ICU4XDate_create_from_codes_in_calendar') - .asFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer, - int, - int, - ffi.Pointer, - int, - int, - ffi.Pointer)>(isLeaf: true); + static final _ICU4XDate_create_from_codes_in_calendar = + _capi, ffi.Size, ffi.Int32, ffi.Pointer, ffi.Size, ffi.Uint8, ffi.Pointer)>>('ICU4XDate_create_from_codes_in_calendar') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer, int, int, ffi.Pointer, int, int, ffi.Pointer)>(isLeaf: true); /// Convert this date to one in a different calendar /// @@ -98,13 +67,9 @@ final class Date implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XDate_to_calendar = _capi< - ffi.NativeFunction< - ffi.Pointer Function(ffi.Pointer, - ffi.Pointer)>>('ICU4XDate_to_calendar') - .asFunction< - ffi.Pointer Function( - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XDate_to_calendar = + _capi Function(ffi.Pointer, ffi.Pointer)>>('ICU4XDate_to_calendar') + .asFunction Function(ffi.Pointer, ffi.Pointer)>(isLeaf: true); /// Converts this date to ISO /// @@ -115,12 +80,9 @@ final class Date implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XDate_to_iso = _capi< - ffi.NativeFunction< - ffi.Pointer Function( - ffi.Pointer)>>('ICU4XDate_to_iso') - .asFunction Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XDate_to_iso = + _capi Function(ffi.Pointer)>>('ICU4XDate_to_iso') + .asFunction Function(ffi.Pointer)>(isLeaf: true); /// Returns the 1-indexed day in the month for this date /// @@ -132,9 +94,8 @@ final class Date implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XDate_day_of_month = - _capi)>>( - 'ICU4XDate_day_of_month') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XDate_day_of_month') + .asFunction)>(isLeaf: true); /// Returns the day in the week for this day /// @@ -146,9 +107,8 @@ final class Date implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XDate_day_of_week = - _capi)>>( - 'ICU4XDate_day_of_week') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XDate_day_of_week') + .asFunction)>(isLeaf: true); /// Returns the week number in this month, 1-indexed, based on what /// is considered the first day of the week (often a locale preference). @@ -157,16 +117,13 @@ final class Date implements ffi.Finalizable { /// /// See the [Rust documentation for `week_of_month`](https://docs.rs/icu/latest/icu/calendar/struct.Date.html#method.week_of_month) for more information. int weekOfMonth(IsoWeekday firstWeekday) { - final result = - _ICU4XDate_week_of_month(_underlying, firstWeekday._underlying); + final result = _ICU4XDate_week_of_month(_underlying, firstWeekday._underlying); return result; } // ignore: non_constant_identifier_names - static final _ICU4XDate_week_of_month = _capi< - ffi.NativeFunction< - ffi.Uint32 Function(ffi.Pointer, - ffi.Int32)>>('ICU4XDate_week_of_month') + static final _ICU4XDate_week_of_month = + _capi, ffi.Int32)>>('ICU4XDate_week_of_month') .asFunction, int)>(isLeaf: true); /// Returns the week number in this year, using week data @@ -183,13 +140,9 @@ final class Date implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XDate_week_of_year = _capi< - ffi.NativeFunction< - _ResultWeekOfFfiInt32 Function(ffi.Pointer, - ffi.Pointer)>>('ICU4XDate_week_of_year') - .asFunction< - _ResultWeekOfFfiInt32 Function( - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XDate_week_of_year = + _capi, ffi.Pointer)>>('ICU4XDate_week_of_year') + .asFunction<_ResultWeekOfFfiInt32 Function(ffi.Pointer, ffi.Pointer)>(isLeaf: true); /// Returns 1-indexed number of the month of this date in its year /// @@ -205,9 +158,8 @@ final class Date implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XDate_ordinal_month = - _capi)>>( - 'ICU4XDate_ordinal_month') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XDate_ordinal_month') + .asFunction)>(isLeaf: true); /// Returns the month code for this date. Typically something /// like "M01", "M02", but can be more complicated for lunar calendars. @@ -225,13 +177,9 @@ final class Date implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XDate_month_code = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function(ffi.Pointer, - ffi.Pointer)>>('ICU4XDate_month_code') - .asFunction< - _ResultVoidInt32 Function( - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XDate_month_code = + _capi, ffi.Pointer)>>('ICU4XDate_month_code') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer)>(isLeaf: true); /// Returns the year number in the current era for this date /// @@ -243,9 +191,8 @@ final class Date implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XDate_year_in_era = - _capi)>>( - 'ICU4XDate_year_in_era') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XDate_year_in_era') + .asFunction)>(isLeaf: true); /// Returns the era for this date, /// @@ -264,13 +211,9 @@ final class Date implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XDate_era = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function(ffi.Pointer, - ffi.Pointer)>>('ICU4XDate_era') - .asFunction< - _ResultVoidInt32 Function( - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XDate_era = + _capi, ffi.Pointer)>>('ICU4XDate_era') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer)>(isLeaf: true); /// Returns the number of months in the year represented by this date /// @@ -282,9 +225,8 @@ final class Date implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XDate_months_in_year = - _capi)>>( - 'ICU4XDate_months_in_year') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XDate_months_in_year') + .asFunction)>(isLeaf: true); /// Returns the number of days in the month represented by this date /// @@ -296,9 +238,8 @@ final class Date implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XDate_days_in_month = - _capi)>>( - 'ICU4XDate_days_in_month') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XDate_days_in_month') + .asFunction)>(isLeaf: true); /// Returns the number of days in the year represented by this date /// @@ -310,9 +251,8 @@ final class Date implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XDate_days_in_year = - _capi)>>( - 'ICU4XDate_days_in_year') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XDate_days_in_year') + .asFunction)>(isLeaf: true); /// Returns the [`Calendar`] object backing this date /// @@ -323,10 +263,7 @@ final class Date implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XDate_calendar = _capi< - ffi.NativeFunction< - ffi.Pointer Function( - ffi.Pointer)>>('ICU4XDate_calendar') - .asFunction Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XDate_calendar = + _capi Function(ffi.Pointer)>>('ICU4XDate_calendar') + .asFunction Function(ffi.Pointer)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/DateFormatter.g.dart b/ffi/capi/dart/package/lib/src/DateFormatter.g.dart index 06365fac124..ca28fce8c07 100644 --- a/ffi/capi/dart/package/lib/src/DateFormatter.g.dart +++ b/ffi/capi/dart/package/lib/src/DateFormatter.g.dart @@ -16,33 +16,25 @@ final class DateFormatter implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XDateFormatter_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XDateFormatter_destroy')); /// Creates a new [`DateFormatter`] from locale data. /// /// See the [Rust documentation for `try_new_with_length`](https://docs.rs/icu/latest/icu/datetime/struct.DateFormatter.html#method.try_new_with_length) for more information. /// /// Throws [Error] on failure. - factory DateFormatter.withLength( - DataProvider provider, Locale locale, DateLength dateLength) { - final result = _ICU4XDateFormatter_create_with_length( - provider._underlying, locale._underlying, dateLength.index); + factory DateFormatter.withLength(DataProvider provider, Locale locale, DateLength dateLength) { + final result = _ICU4XDateFormatter_create_with_length(provider._underlying, locale._underlying, dateLength.index); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return DateFormatter._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XDateFormatter_create_with_length = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer, - ffi.Pointer, - ffi.Int32)>>('ICU4XDateFormatter_create_with_length') - .asFunction< - _ResultOpaqueInt32 Function(ffi.Pointer, - ffi.Pointer, int)>(isLeaf: true); + static final _ICU4XDateFormatter_create_with_length = + _capi, ffi.Pointer, ffi.Int32)>>('ICU4XDateFormatter_create_with_length') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer, ffi.Pointer, int)>(isLeaf: true); /// Formats a [`Date`] to a string. /// @@ -51,8 +43,7 @@ final class DateFormatter implements ffi.Finalizable { /// Throws [Error] on failure. String formatDate(Date value) { final writeable = _Writeable(); - final result = _ICU4XDateFormatter_format_date( - _underlying, value._underlying, writeable._underlying); + final result = _ICU4XDateFormatter_format_date(_underlying, value._underlying, writeable._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } @@ -60,15 +51,9 @@ final class DateFormatter implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XDateFormatter_format_date = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function( - ffi.Pointer, - ffi.Pointer, - ffi.Pointer)>>('ICU4XDateFormatter_format_date') - .asFunction< - _ResultVoidInt32 Function(ffi.Pointer, - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XDateFormatter_format_date = + _capi, ffi.Pointer, ffi.Pointer)>>('ICU4XDateFormatter_format_date') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer, ffi.Pointer)>(isLeaf: true); /// Formats a [`IsoDate`] to a string. /// @@ -79,8 +64,7 @@ final class DateFormatter implements ffi.Finalizable { /// Throws [Error] on failure. String formatIsoDate(IsoDate value) { final writeable = _Writeable(); - final result = _ICU4XDateFormatter_format_iso_date( - _underlying, value._underlying, writeable._underlying); + final result = _ICU4XDateFormatter_format_iso_date(_underlying, value._underlying, writeable._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } @@ -88,14 +72,9 @@ final class DateFormatter implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XDateFormatter_format_iso_date = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function(ffi.Pointer, - ffi.Pointer, ffi.Pointer)>>( - 'ICU4XDateFormatter_format_iso_date') - .asFunction< - _ResultVoidInt32 Function(ffi.Pointer, - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XDateFormatter_format_iso_date = + _capi, ffi.Pointer, ffi.Pointer)>>('ICU4XDateFormatter_format_iso_date') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer, ffi.Pointer)>(isLeaf: true); /// Formats a [`DateTime`] to a string. /// @@ -104,8 +83,7 @@ final class DateFormatter implements ffi.Finalizable { /// Throws [Error] on failure. String formatDatetime(DateTime value) { final writeable = _Writeable(); - final result = _ICU4XDateFormatter_format_datetime( - _underlying, value._underlying, writeable._underlying); + final result = _ICU4XDateFormatter_format_datetime(_underlying, value._underlying, writeable._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } @@ -113,14 +91,9 @@ final class DateFormatter implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XDateFormatter_format_datetime = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function(ffi.Pointer, - ffi.Pointer, ffi.Pointer)>>( - 'ICU4XDateFormatter_format_datetime') - .asFunction< - _ResultVoidInt32 Function(ffi.Pointer, - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XDateFormatter_format_datetime = + _capi, ffi.Pointer, ffi.Pointer)>>('ICU4XDateFormatter_format_datetime') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer, ffi.Pointer)>(isLeaf: true); /// Formats a [`IsoDateTime`] to a string. /// @@ -131,8 +104,7 @@ final class DateFormatter implements ffi.Finalizable { /// Throws [Error] on failure. String formatIsoDatetime(IsoDateTime value) { final writeable = _Writeable(); - final result = _ICU4XDateFormatter_format_iso_datetime( - _underlying, value._underlying, writeable._underlying); + final result = _ICU4XDateFormatter_format_iso_datetime(_underlying, value._underlying, writeable._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } @@ -140,12 +112,7 @@ final class DateFormatter implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XDateFormatter_format_iso_datetime = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function(ffi.Pointer, - ffi.Pointer, ffi.Pointer)>>( - 'ICU4XDateFormatter_format_iso_datetime') - .asFunction< - _ResultVoidInt32 Function(ffi.Pointer, - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XDateFormatter_format_iso_datetime = + _capi, ffi.Pointer, ffi.Pointer)>>('ICU4XDateFormatter_format_iso_datetime') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer, ffi.Pointer)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/DateLength.g.dart b/ffi/capi/dart/package/lib/src/DateLength.g.dart index e3780407565..2ef92c67b85 100644 --- a/ffi/capi/dart/package/lib/src/DateLength.g.dart +++ b/ffi/capi/dart/package/lib/src/DateLength.g.dart @@ -8,7 +8,10 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `Date`](https://docs.rs/icu/latest/icu/datetime/options/length/enum.Date.html) for more information. enum DateLength { full, + long, + medium, + short; } diff --git a/ffi/capi/dart/package/lib/src/DateTime.g.dart b/ffi/capi/dart/package/lib/src/DateTime.g.dart index c990998a652..bd87b2a78bc 100644 --- a/ffi/capi/dart/package/lib/src/DateTime.g.dart +++ b/ffi/capi/dart/package/lib/src/DateTime.g.dart @@ -23,116 +23,53 @@ final class DateTime implements ffi.Finalizable { /// See the [Rust documentation for `new_from_iso`](https://docs.rs/icu/latest/icu/struct.DateTime.html#method.new_from_iso) for more information. /// /// Throws [Error] on failure. - factory DateTime.fromIsoInCalendar(int year, int month, int day, int hour, - int minute, int second, int nanosecond, Calendar calendar) { - final result = _ICU4XDateTime_create_from_iso_in_calendar(year, month, day, - hour, minute, second, nanosecond, calendar._underlying); + factory DateTime.fromIsoInCalendar(int year, int month, int day, int hour, int minute, int second, int nanosecond, Calendar calendar) { + final result = _ICU4XDateTime_create_from_iso_in_calendar(year, month, day, hour, minute, second, nanosecond, calendar._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return DateTime._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XDateTime_create_from_iso_in_calendar = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function( - ffi.Int32, - ffi.Uint8, - ffi.Uint8, - ffi.Uint8, - ffi.Uint8, - ffi.Uint8, - ffi.Uint32, - ffi.Pointer)>>( - 'ICU4XDateTime_create_from_iso_in_calendar') - .asFunction< - _ResultOpaqueInt32 Function(int, int, int, int, int, int, int, - ffi.Pointer)>(isLeaf: true); + static final _ICU4XDateTime_create_from_iso_in_calendar = + _capi)>>('ICU4XDateTime_create_from_iso_in_calendar') + .asFunction<_ResultOpaqueInt32 Function(int, int, int, int, int, int, int, ffi.Pointer)>(isLeaf: true); /// Creates a new [`DateTime`] from the given codes, which are interpreted in the given calendar system /// /// See the [Rust documentation for `try_new_from_codes`](https://docs.rs/icu/latest/icu/calendar/struct.DateTime.html#method.try_new_from_codes) for more information. /// /// Throws [Error] on failure. - factory DateTime.fromCodesInCalendar( - String eraCode, - int year, - String monthCode, - int day, - int hour, - int minute, - int second, - int nanosecond, - Calendar calendar) { + factory DateTime.fromCodesInCalendar(String eraCode, int year, String monthCode, int day, int hour, int minute, int second, int nanosecond, Calendar calendar) { final alloc = ffi2.Arena(); final eraCodeSlice = _SliceFfi2Utf8._fromDart(eraCode, alloc); final monthCodeSlice = _SliceFfi2Utf8._fromDart(monthCode, alloc); - - final result = _ICU4XDateTime_create_from_codes_in_calendar( - eraCodeSlice._bytes, - eraCodeSlice._length, - year, - monthCodeSlice._bytes, - monthCodeSlice._length, - day, - hour, - minute, - second, - nanosecond, - calendar._underlying); + final result = _ICU4XDateTime_create_from_codes_in_calendar(eraCodeSlice._bytes, eraCodeSlice._length, year, monthCodeSlice._bytes, monthCodeSlice._length, day, hour, minute, second, nanosecond, calendar._underlying); alloc.releaseAll(); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return DateTime._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XDateTime_create_from_codes_in_calendar = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer, - ffi.Size, - ffi.Int32, - ffi.Pointer, - ffi.Size, - ffi.Uint8, - ffi.Uint8, - ffi.Uint8, - ffi.Uint8, - ffi.Uint32, - ffi.Pointer)>>( - 'ICU4XDateTime_create_from_codes_in_calendar') - .asFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer, - int, - int, - ffi.Pointer, - int, - int, - int, - int, - int, - int, - ffi.Pointer)>(isLeaf: true); + static final _ICU4XDateTime_create_from_codes_in_calendar = + _capi, ffi.Size, ffi.Int32, ffi.Pointer, ffi.Size, ffi.Uint8, ffi.Uint8, ffi.Uint8, ffi.Uint8, ffi.Uint32, ffi.Pointer)>>('ICU4XDateTime_create_from_codes_in_calendar') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer, int, int, ffi.Pointer, int, int, int, int, int, int, ffi.Pointer)>(isLeaf: true); /// Creates a new [`DateTime`] from an [`Date`] and [`Time`] object /// /// See the [Rust documentation for `new`](https://docs.rs/icu/latest/icu/calendar/struct.DateTime.html#method.new) for more information. factory DateTime.fromDateAndTime(Date date, Time time) { - final result = _ICU4XDateTime_create_from_date_and_time( - date._underlying, time._underlying); + final result = _ICU4XDateTime_create_from_date_and_time(date._underlying, time._underlying); return DateTime._(result); } + // ignore: non_constant_identifier_names - static final _ICU4XDateTime_create_from_date_and_time = _capi< - ffi.NativeFunction< - ffi.Pointer Function( - ffi.Pointer, ffi.Pointer)>>( - 'ICU4XDateTime_create_from_date_and_time') - .asFunction< - ffi.Pointer Function( - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XDateTime_create_from_date_and_time = + _capi Function(ffi.Pointer, ffi.Pointer)>>('ICU4XDateTime_create_from_date_and_time') + .asFunction Function(ffi.Pointer, ffi.Pointer)>(isLeaf: true); /// Gets a copy of the date contained in this object /// @@ -143,12 +80,9 @@ final class DateTime implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XDateTime_date = _capi< - ffi.NativeFunction< - ffi.Pointer Function( - ffi.Pointer)>>('ICU4XDateTime_date') - .asFunction Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XDateTime_date = + _capi Function(ffi.Pointer)>>('ICU4XDateTime_date') + .asFunction Function(ffi.Pointer)>(isLeaf: true); /// Gets the time contained in this object /// @@ -159,12 +93,9 @@ final class DateTime implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XDateTime_time = _capi< - ffi.NativeFunction< - ffi.Pointer Function( - ffi.Pointer)>>('ICU4XDateTime_time') - .asFunction Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XDateTime_time = + _capi Function(ffi.Pointer)>>('ICU4XDateTime_time') + .asFunction Function(ffi.Pointer)>(isLeaf: true); /// Converts this date to ISO /// @@ -175,30 +106,22 @@ final class DateTime implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XDateTime_to_iso = _capi< - ffi.NativeFunction< - ffi.Pointer Function( - ffi.Pointer)>>('ICU4XDateTime_to_iso') - .asFunction Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XDateTime_to_iso = + _capi Function(ffi.Pointer)>>('ICU4XDateTime_to_iso') + .asFunction Function(ffi.Pointer)>(isLeaf: true); /// Convert this datetime to one in a different calendar /// /// See the [Rust documentation for `to_calendar`](https://docs.rs/icu/latest/icu/calendar/struct.DateTime.html#method.to_calendar) for more information. DateTime toCalendar(Calendar calendar) { - final result = - _ICU4XDateTime_to_calendar(_underlying, calendar._underlying); + final result = _ICU4XDateTime_to_calendar(_underlying, calendar._underlying); return DateTime._(result); } // ignore: non_constant_identifier_names - static final _ICU4XDateTime_to_calendar = _capi< - ffi.NativeFunction< - ffi.Pointer Function(ffi.Pointer, - ffi.Pointer)>>('ICU4XDateTime_to_calendar') - .asFunction< - ffi.Pointer Function( - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XDateTime_to_calendar = + _capi Function(ffi.Pointer, ffi.Pointer)>>('ICU4XDateTime_to_calendar') + .asFunction Function(ffi.Pointer, ffi.Pointer)>(isLeaf: true); /// Returns the hour in this time /// @@ -210,9 +133,8 @@ final class DateTime implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XDateTime_hour = - _capi)>>( - 'ICU4XDateTime_hour') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XDateTime_hour') + .asFunction)>(isLeaf: true); /// Returns the minute in this time /// @@ -224,9 +146,8 @@ final class DateTime implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XDateTime_minute = - _capi)>>( - 'ICU4XDateTime_minute') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XDateTime_minute') + .asFunction)>(isLeaf: true); /// Returns the second in this time /// @@ -238,9 +159,8 @@ final class DateTime implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XDateTime_second = - _capi)>>( - 'ICU4XDateTime_second') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XDateTime_second') + .asFunction)>(isLeaf: true); /// Returns the nanosecond in this time /// @@ -252,9 +172,8 @@ final class DateTime implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XDateTime_nanosecond = - _capi)>>( - 'ICU4XDateTime_nanosecond') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XDateTime_nanosecond') + .asFunction)>(isLeaf: true); /// Returns the 1-indexed day in the month for this date /// @@ -266,9 +185,8 @@ final class DateTime implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XDateTime_day_of_month = - _capi)>>( - 'ICU4XDateTime_day_of_month') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XDateTime_day_of_month') + .asFunction)>(isLeaf: true); /// Returns the day in the week for this day /// @@ -280,9 +198,8 @@ final class DateTime implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XDateTime_day_of_week = - _capi)>>( - 'ICU4XDateTime_day_of_week') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XDateTime_day_of_week') + .asFunction)>(isLeaf: true); /// Returns the week number in this month, 1-indexed, based on what /// is considered the first day of the week (often a locale preference). @@ -291,16 +208,13 @@ final class DateTime implements ffi.Finalizable { /// /// See the [Rust documentation for `week_of_month`](https://docs.rs/icu/latest/icu/calendar/struct.Date.html#method.week_of_month) for more information. int weekOfMonth(IsoWeekday firstWeekday) { - final result = - _ICU4XDateTime_week_of_month(_underlying, firstWeekday._underlying); + final result = _ICU4XDateTime_week_of_month(_underlying, firstWeekday._underlying); return result; } // ignore: non_constant_identifier_names - static final _ICU4XDateTime_week_of_month = _capi< - ffi.NativeFunction< - ffi.Uint32 Function(ffi.Pointer, - ffi.Int32)>>('ICU4XDateTime_week_of_month') + static final _ICU4XDateTime_week_of_month = + _capi, ffi.Int32)>>('ICU4XDateTime_week_of_month') .asFunction, int)>(isLeaf: true); /// Returns the week number in this year, using week data @@ -309,8 +223,7 @@ final class DateTime implements ffi.Finalizable { /// /// Throws [Error] on failure. WeekOf weekOfYear(WeekCalculator calculator) { - final result = - _ICU4XDateTime_week_of_year(_underlying, calculator._underlying); + final result = _ICU4XDateTime_week_of_year(_underlying, calculator._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } @@ -318,13 +231,9 @@ final class DateTime implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XDateTime_week_of_year = _capi< - ffi.NativeFunction< - _ResultWeekOfFfiInt32 Function(ffi.Pointer, - ffi.Pointer)>>('ICU4XDateTime_week_of_year') - .asFunction< - _ResultWeekOfFfiInt32 Function( - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XDateTime_week_of_year = + _capi, ffi.Pointer)>>('ICU4XDateTime_week_of_year') + .asFunction<_ResultWeekOfFfiInt32 Function(ffi.Pointer, ffi.Pointer)>(isLeaf: true); /// Returns 1-indexed number of the month of this date in its year /// @@ -340,9 +249,8 @@ final class DateTime implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XDateTime_ordinal_month = - _capi)>>( - 'ICU4XDateTime_ordinal_month') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XDateTime_ordinal_month') + .asFunction)>(isLeaf: true); /// Returns the month code for this date. Typically something /// like "M01", "M02", but can be more complicated for lunar calendars. @@ -352,8 +260,7 @@ final class DateTime implements ffi.Finalizable { /// Throws [Error] on failure. String get monthCode { final writeable = _Writeable(); - final result = - _ICU4XDateTime_month_code(_underlying, writeable._underlying); + final result = _ICU4XDateTime_month_code(_underlying, writeable._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } @@ -361,13 +268,9 @@ final class DateTime implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XDateTime_month_code = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function(ffi.Pointer, - ffi.Pointer)>>('ICU4XDateTime_month_code') - .asFunction< - _ResultVoidInt32 Function( - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XDateTime_month_code = + _capi, ffi.Pointer)>>('ICU4XDateTime_month_code') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer)>(isLeaf: true); /// Returns the year number in the current era for this date /// @@ -379,9 +282,8 @@ final class DateTime implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XDateTime_year_in_era = - _capi)>>( - 'ICU4XDateTime_year_in_era') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XDateTime_year_in_era') + .asFunction)>(isLeaf: true); /// Returns the era for this date, /// @@ -398,13 +300,9 @@ final class DateTime implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XDateTime_era = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function(ffi.Pointer, - ffi.Pointer)>>('ICU4XDateTime_era') - .asFunction< - _ResultVoidInt32 Function( - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XDateTime_era = + _capi, ffi.Pointer)>>('ICU4XDateTime_era') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer)>(isLeaf: true); /// Returns the number of months in the year represented by this date /// @@ -416,9 +314,8 @@ final class DateTime implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XDateTime_months_in_year = - _capi)>>( - 'ICU4XDateTime_months_in_year') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XDateTime_months_in_year') + .asFunction)>(isLeaf: true); /// Returns the number of days in the month represented by this date /// @@ -430,9 +327,8 @@ final class DateTime implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XDateTime_days_in_month = - _capi)>>( - 'ICU4XDateTime_days_in_month') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XDateTime_days_in_month') + .asFunction)>(isLeaf: true); /// Returns the number of days in the year represented by this date /// @@ -444,9 +340,8 @@ final class DateTime implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XDateTime_days_in_year = - _capi)>>( - 'ICU4XDateTime_days_in_year') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XDateTime_days_in_year') + .asFunction)>(isLeaf: true); /// Returns the [`Calendar`] object backing this date /// @@ -457,10 +352,7 @@ final class DateTime implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XDateTime_calendar = _capi< - ffi.NativeFunction< - ffi.Pointer Function( - ffi.Pointer)>>('ICU4XDateTime_calendar') - .asFunction Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XDateTime_calendar = + _capi Function(ffi.Pointer)>>('ICU4XDateTime_calendar') + .asFunction Function(ffi.Pointer)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/DateTimeFormatter.g.dart b/ffi/capi/dart/package/lib/src/DateTimeFormatter.g.dart index 1c8e0466b5f..307b7c590b1 100644 --- a/ffi/capi/dart/package/lib/src/DateTimeFormatter.g.dart +++ b/ffi/capi/dart/package/lib/src/DateTimeFormatter.g.dart @@ -16,37 +16,25 @@ final class DateTimeFormatter implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XDateTimeFormatter_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XDateTimeFormatter_destroy')); /// Creates a new [`DateTimeFormatter`] from locale data. /// /// See the [Rust documentation for `try_new`](https://docs.rs/icu/latest/icu/datetime/struct.DateTimeFormatter.html#method.try_new) for more information. /// /// Throws [Error] on failure. - factory DateTimeFormatter.withLengths(DataProvider provider, Locale locale, - DateLength dateLength, TimeLength timeLength) { - final result = _ICU4XDateTimeFormatter_create_with_lengths( - provider._underlying, - locale._underlying, - dateLength.index, - timeLength.index); + factory DateTimeFormatter.withLengths(DataProvider provider, Locale locale, DateLength dateLength, TimeLength timeLength) { + final result = _ICU4XDateTimeFormatter_create_with_lengths(provider._underlying, locale._underlying, dateLength.index, timeLength.index); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return DateTimeFormatter._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XDateTimeFormatter_create_with_lengths = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer, - ffi.Pointer, - ffi.Int32, - ffi.Int32)>>('ICU4XDateTimeFormatter_create_with_lengths') - .asFunction< - _ResultOpaqueInt32 Function(ffi.Pointer, - ffi.Pointer, int, int)>(isLeaf: true); + static final _ICU4XDateTimeFormatter_create_with_lengths = + _capi, ffi.Pointer, ffi.Int32, ffi.Int32)>>('ICU4XDateTimeFormatter_create_with_lengths') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer, ffi.Pointer, int, int)>(isLeaf: true); /// Formats a [`DateTime`] to a string. /// @@ -55,8 +43,7 @@ final class DateTimeFormatter implements ffi.Finalizable { /// Throws [Error] on failure. String formatDatetime(DateTime value) { final writeable = _Writeable(); - final result = _ICU4XDateTimeFormatter_format_datetime( - _underlying, value._underlying, writeable._underlying); + final result = _ICU4XDateTimeFormatter_format_datetime(_underlying, value._underlying, writeable._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } @@ -64,14 +51,9 @@ final class DateTimeFormatter implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XDateTimeFormatter_format_datetime = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function(ffi.Pointer, - ffi.Pointer, ffi.Pointer)>>( - 'ICU4XDateTimeFormatter_format_datetime') - .asFunction< - _ResultVoidInt32 Function(ffi.Pointer, - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XDateTimeFormatter_format_datetime = + _capi, ffi.Pointer, ffi.Pointer)>>('ICU4XDateTimeFormatter_format_datetime') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer, ffi.Pointer)>(isLeaf: true); /// Formats a [`IsoDateTime`] to a string. /// @@ -82,8 +64,7 @@ final class DateTimeFormatter implements ffi.Finalizable { /// Throws [Error] on failure. String formatIsoDatetime(IsoDateTime value) { final writeable = _Writeable(); - final result = _ICU4XDateTimeFormatter_format_iso_datetime( - _underlying, value._underlying, writeable._underlying); + final result = _ICU4XDateTimeFormatter_format_iso_datetime(_underlying, value._underlying, writeable._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } @@ -91,12 +72,7 @@ final class DateTimeFormatter implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XDateTimeFormatter_format_iso_datetime = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function(ffi.Pointer, - ffi.Pointer, ffi.Pointer)>>( - 'ICU4XDateTimeFormatter_format_iso_datetime') - .asFunction< - _ResultVoidInt32 Function(ffi.Pointer, - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XDateTimeFormatter_format_iso_datetime = + _capi, ffi.Pointer, ffi.Pointer)>>('ICU4XDateTimeFormatter_format_iso_datetime') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer, ffi.Pointer)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/DecomposingNormalizer.g.dart b/ffi/capi/dart/package/lib/src/DecomposingNormalizer.g.dart index 312ed3ddb1f..7c118658812 100644 --- a/ffi/capi/dart/package/lib/src/DecomposingNormalizer.g.dart +++ b/ffi/capi/dart/package/lib/src/DecomposingNormalizer.g.dart @@ -13,8 +13,7 @@ final class DecomposingNormalizer implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XDecomposingNormalizer_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XDecomposingNormalizer_destroy')); /// Construct a new ICU4XDecomposingNormalizer instance for NFC /// @@ -28,13 +27,11 @@ final class DecomposingNormalizer implements ffi.Finalizable { } return DecomposingNormalizer._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XDecomposingNormalizer_create_nfd = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XDecomposingNormalizer_create_nfd') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XDecomposingNormalizer_create_nfd = + _capi)>>('ICU4XDecomposingNormalizer_create_nfd') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// Construct a new ICU4XDecomposingNormalizer instance for NFKC /// @@ -42,20 +39,17 @@ final class DecomposingNormalizer implements ffi.Finalizable { /// /// Throws [Error] on failure. factory DecomposingNormalizer.nfkd(DataProvider provider) { - final result = - _ICU4XDecomposingNormalizer_create_nfkd(provider._underlying); + final result = _ICU4XDecomposingNormalizer_create_nfkd(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return DecomposingNormalizer._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XDecomposingNormalizer_create_nfkd = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XDecomposingNormalizer_create_nfkd') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XDecomposingNormalizer_create_nfkd = + _capi)>>('ICU4XDecomposingNormalizer_create_nfkd') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// Normalize a (potentially ill-formed) UTF8 string /// @@ -67,10 +61,8 @@ final class DecomposingNormalizer implements ffi.Finalizable { String normalize(String s) { final alloc = ffi2.Arena(); final sSlice = _SliceFfi2Utf8._fromDart(s, alloc); - final writeable = _Writeable(); - final result = _ICU4XDecomposingNormalizer_normalize( - _underlying, sSlice._bytes, sSlice._length, writeable._underlying); + final result = _ICU4XDecomposingNormalizer_normalize(_underlying, sSlice._bytes, sSlice._length, writeable._underlying); alloc.releaseAll(); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); @@ -79,20 +71,9 @@ final class DecomposingNormalizer implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XDecomposingNormalizer_normalize = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function( - ffi.Pointer, - ffi.Pointer, - ffi.Size, - ffi.Pointer)>>( - 'ICU4XDecomposingNormalizer_normalize') - .asFunction< - _ResultVoidInt32 Function( - ffi.Pointer, - ffi.Pointer, - int, - ffi.Pointer)>(isLeaf: true); + static final _ICU4XDecomposingNormalizer_normalize = + _capi, ffi.Pointer, ffi.Size, ffi.Pointer)>>('ICU4XDecomposingNormalizer_normalize') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer, int, ffi.Pointer)>(isLeaf: true); /// Check if a (potentially ill-formed) UTF8 string is normalized /// @@ -102,19 +83,13 @@ final class DecomposingNormalizer implements ffi.Finalizable { bool isNormalized(String s) { final alloc = ffi2.Arena(); final sSlice = _SliceFfi2Utf8._fromDart(s, alloc); - - final result = _ICU4XDecomposingNormalizer_is_normalized( - _underlying, sSlice._bytes, sSlice._length); + final result = _ICU4XDecomposingNormalizer_is_normalized(_underlying, sSlice._bytes, sSlice._length); alloc.releaseAll(); return result; } // ignore: non_constant_identifier_names - static final _ICU4XDecomposingNormalizer_is_normalized = _capi< - ffi.NativeFunction< - ffi.Bool Function(ffi.Pointer, ffi.Pointer, - ffi.Size)>>('ICU4XDecomposingNormalizer_is_normalized') - .asFunction< - bool Function(ffi.Pointer, ffi.Pointer, - int)>(isLeaf: true); + static final _ICU4XDecomposingNormalizer_is_normalized = + _capi, ffi.Pointer, ffi.Size)>>('ICU4XDecomposingNormalizer_is_normalized') + .asFunction, ffi.Pointer, int)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/DisplayNamesFallback.g.dart b/ffi/capi/dart/package/lib/src/DisplayNamesFallback.g.dart index 663fff5c01c..baa65196e07 100644 --- a/ffi/capi/dart/package/lib/src/DisplayNamesFallback.g.dart +++ b/ffi/capi/dart/package/lib/src/DisplayNamesFallback.g.dart @@ -8,5 +8,6 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `Fallback`](https://docs.rs/icu/latest/icu/displaynames/options/enum.Fallback.html) for more information. enum DisplayNamesFallback { code, + none; } diff --git a/ffi/capi/dart/package/lib/src/DisplayNamesOptionsV1.g.dart b/ffi/capi/dart/package/lib/src/DisplayNamesOptionsV1.g.dart index f9219835a47..2d649dc6118 100644 --- a/ffi/capi/dart/package/lib/src/DisplayNamesOptionsV1.g.dart +++ b/ffi/capi/dart/package/lib/src/DisplayNamesOptionsV1.g.dart @@ -33,14 +33,12 @@ final class DisplayNamesOptionsV1 { _underlying.style = style.index; } - DisplayNamesFallback get fallback => - DisplayNamesFallback.values[_underlying.fallback]; + DisplayNamesFallback get fallback => DisplayNamesFallback.values[_underlying.fallback]; set fallback(DisplayNamesFallback fallback) { _underlying.fallback = fallback.index; } - LanguageDisplay get languageDisplay => - LanguageDisplay.values[_underlying.languageDisplay]; + LanguageDisplay get languageDisplay => LanguageDisplay.values[_underlying.languageDisplay]; set languageDisplay(LanguageDisplay languageDisplay) { _underlying.languageDisplay = languageDisplay.index; } diff --git a/ffi/capi/dart/package/lib/src/DisplayNamesStyle.g.dart b/ffi/capi/dart/package/lib/src/DisplayNamesStyle.g.dart index 83fe3d4098b..6c10b5c255e 100644 --- a/ffi/capi/dart/package/lib/src/DisplayNamesStyle.g.dart +++ b/ffi/capi/dart/package/lib/src/DisplayNamesStyle.g.dart @@ -8,8 +8,12 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `Style`](https://docs.rs/icu/latest/icu/displaynames/options/enum.Style.html) for more information. enum DisplayNamesStyle { auto, + narrow, + short, + long, + menu; } diff --git a/ffi/capi/dart/package/lib/src/Error.g.dart b/ffi/capi/dart/package/lib/src/Error.g.dart index 1c3a95e5e50..b6b544d8827 100644 --- a/ffi/capi/dart/package/lib/src/Error.g.dart +++ b/ffi/capi/dart/package/lib/src/Error.g.dart @@ -19,20 +19,35 @@ enum Error { /// Typically found when not enough space is allocated /// Most APIs that return a string may return this error writeableError, + outOfBoundsError, + dataMissingDataKeyError, + dataMissingVariantError, + dataMissingLocaleError, + dataNeedsVariantError, + dataNeedsLocaleError, + dataExtraneousLocaleError, + dataFilteredResourceError, + dataMismatchedTypeError, + dataMissingPayloadError, + dataInvalidStateError, + dataCustomError, + dataIoError, + dataUnavailableBufferFormatError, + dataMismatchedAnyBufferError, /// The subtag being requested was not set @@ -40,43 +55,78 @@ enum Error { /// The locale or subtag string failed to parse localeParserLanguageError, + localeParserSubtagError, + localeParserExtensionError, /// Attempted to construct an invalid data struct dataStructValidityError, + propertyUnknownScriptIdError, + propertyUnknownGeneralCategoryGroupError, + propertyUnexpectedPropertyNameError, + fixedDecimalLimitError, + fixedDecimalSyntaxError, + pluralsParserError, + calendarParseError, + calendarOverflowError, + calendarUnderflowError, + calendarOutOfRangeError, + calendarUnknownEraError, + calendarUnknownMonthCodeError, + calendarMissingInputError, + calendarUnknownKindError, + calendarMissingError, + dateTimePatternError, + dateTimeMissingInputFieldError, + dateTimeSkeletonError, + dateTimeUnsupportedFieldError, + dateTimeUnsupportedOptionsError, + dateTimeMissingWeekdaySymbolError, + dateTimeMissingMonthSymbolError, + dateTimeFixedDecimalError, + dateTimeMismatchedCalendarError, + tinyStrTooLargeError, + tinyStrContainsNullError, + tinyStrNonAsciiError, + timeZoneOffsetOutOfBoundsError, + timeZoneInvalidOffsetError, + timeZoneMissingInputError, + timeZoneInvalidIdError, + normalizerFutureExtensionError, + normalizerValidationError; int get _underlying { diff --git a/ffi/capi/dart/package/lib/src/FixedDecimal.g.dart b/ffi/capi/dart/package/lib/src/FixedDecimal.g.dart index e134afca3f5..7e62e9f450f 100644 --- a/ffi/capi/dart/package/lib/src/FixedDecimal.g.dart +++ b/ffi/capi/dart/package/lib/src/FixedDecimal.g.dart @@ -13,8 +13,7 @@ final class FixedDecimal implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XFixedDecimal_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XFixedDecimal_destroy')); /// Construct an [`FixedDecimal`] from an integer. /// @@ -23,11 +22,11 @@ final class FixedDecimal implements ffi.Finalizable { final result = _ICU4XFixedDecimal_create_from_i64(v); return FixedDecimal._(result); } + // ignore: non_constant_identifier_names static final _ICU4XFixedDecimal_create_from_i64 = - _capi Function(ffi.Int64)>>( - 'ICU4XFixedDecimal_create_from_i64') - .asFunction Function(int)>(isLeaf: true); + _capi Function(ffi.Int64)>>('ICU4XFixedDecimal_create_from_i64') + .asFunction Function(int)>(isLeaf: true); /// Construct an [`FixedDecimal`] from an float, with a given power of 10 for the lower magnitude /// @@ -37,18 +36,16 @@ final class FixedDecimal implements ffi.Finalizable { /// /// Throws [Error] on failure. factory FixedDecimal.fromDoubleWithLowerMagnitude(double f, int magnitude) { - final result = - _ICU4XFixedDecimal_create_from_f64_with_lower_magnitude(f, magnitude); + final result = _ICU4XFixedDecimal_create_from_f64_with_lower_magnitude(f, magnitude); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return FixedDecimal._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XFixedDecimal_create_from_f64_with_lower_magnitude = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Double, ffi.Int16)>>( - 'ICU4XFixedDecimal_create_from_f64_with_lower_magnitude') + static final _ICU4XFixedDecimal_create_from_f64_with_lower_magnitude = + _capi>('ICU4XFixedDecimal_create_from_f64_with_lower_magnitude') .asFunction<_ResultOpaqueInt32 Function(double, int)>(isLeaf: true); /// Construct an [`FixedDecimal`] from an float, for a given number of significant digits @@ -59,20 +56,17 @@ final class FixedDecimal implements ffi.Finalizable { /// /// Throws [Error] on failure. factory FixedDecimal.fromDoubleWithSignificantDigits(double f, int digits) { - final result = - _ICU4XFixedDecimal_create_from_f64_with_significant_digits(f, digits); + final result = _ICU4XFixedDecimal_create_from_f64_with_significant_digits(f, digits); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return FixedDecimal._(result.union.ok); } + // ignore: non_constant_identifier_names static final _ICU4XFixedDecimal_create_from_f64_with_significant_digits = - _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Double, ffi.Uint8)>>( - 'ICU4XFixedDecimal_create_from_f64_with_significant_digits') - .asFunction<_ResultOpaqueInt32 Function(double, int)>(isLeaf: true); + _capi>('ICU4XFixedDecimal_create_from_f64_with_significant_digits') + .asFunction<_ResultOpaqueInt32 Function(double, int)>(isLeaf: true); /// Construct an [`FixedDecimal`] from an float, with enough digits to recover /// the original floating point in IEEE 754 without needing trailing zeros @@ -83,18 +77,17 @@ final class FixedDecimal implements ffi.Finalizable { /// /// Throws [Error] on failure. factory FixedDecimal.fromDoubleWithDoublePrecision(double f) { - final result = - _ICU4XFixedDecimal_create_from_f64_with_floating_precision(f); + final result = _ICU4XFixedDecimal_create_from_f64_with_floating_precision(f); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return FixedDecimal._(result.union.ok); } + // ignore: non_constant_identifier_names static final _ICU4XFixedDecimal_create_from_f64_with_floating_precision = - _capi>( - 'ICU4XFixedDecimal_create_from_f64_with_floating_precision') - .asFunction<_ResultOpaqueInt32 Function(double)>(isLeaf: true); + _capi>('ICU4XFixedDecimal_create_from_f64_with_floating_precision') + .asFunction<_ResultOpaqueInt32 Function(double)>(isLeaf: true); /// Construct an [`FixedDecimal`] from a string. /// @@ -104,22 +97,18 @@ final class FixedDecimal implements ffi.Finalizable { factory FixedDecimal.fromString(String v) { final alloc = ffi2.Arena(); final vSlice = _SliceFfi2Utf8._fromDart(v, alloc); - - final result = - _ICU4XFixedDecimal_create_from_string(vSlice._bytes, vSlice._length); + final result = _ICU4XFixedDecimal_create_from_string(vSlice._bytes, vSlice._length); alloc.releaseAll(); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return FixedDecimal._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XFixedDecimal_create_from_string = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer, - ffi.Size)>>('ICU4XFixedDecimal_create_from_string') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer, int)>( - isLeaf: true); + static final _ICU4XFixedDecimal_create_from_string = + _capi, ffi.Size)>>('ICU4XFixedDecimal_create_from_string') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer, int)>(isLeaf: true); /// See the [Rust documentation for `digit_at`](https://docs.rs/fixed_decimal/latest/fixed_decimal/struct.FixedDecimal.html#method.digit_at) for more information. int digitAt(int magnitude) { @@ -128,10 +117,8 @@ final class FixedDecimal implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XFixedDecimal_digit_at = _capi< - ffi.NativeFunction< - ffi.Uint8 Function(ffi.Pointer, - ffi.Int16)>>('ICU4XFixedDecimal_digit_at') + static final _ICU4XFixedDecimal_digit_at = + _capi, ffi.Int16)>>('ICU4XFixedDecimal_digit_at') .asFunction, int)>(isLeaf: true); /// See the [Rust documentation for `magnitude_range`](https://docs.rs/fixed_decimal/latest/fixed_decimal/struct.FixedDecimal.html#method.magnitude_range) for more information. @@ -142,9 +129,8 @@ final class FixedDecimal implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XFixedDecimal_magnitude_start = - _capi)>>( - 'ICU4XFixedDecimal_magnitude_start') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XFixedDecimal_magnitude_start') + .asFunction)>(isLeaf: true); /// See the [Rust documentation for `magnitude_range`](https://docs.rs/fixed_decimal/latest/fixed_decimal/struct.FixedDecimal.html#method.magnitude_range) for more information. int get magnitudeEnd { @@ -154,9 +140,8 @@ final class FixedDecimal implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XFixedDecimal_magnitude_end = - _capi)>>( - 'ICU4XFixedDecimal_magnitude_end') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XFixedDecimal_magnitude_end') + .asFunction)>(isLeaf: true); /// See the [Rust documentation for `nonzero_magnitude_start`](https://docs.rs/fixed_decimal/latest/fixed_decimal/struct.FixedDecimal.html#method.nonzero_magnitude_start) for more information. int get nonzeroMagnitudeStart { @@ -166,9 +151,8 @@ final class FixedDecimal implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XFixedDecimal_nonzero_magnitude_start = - _capi)>>( - 'ICU4XFixedDecimal_nonzero_magnitude_start') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XFixedDecimal_nonzero_magnitude_start') + .asFunction)>(isLeaf: true); /// See the [Rust documentation for `nonzero_magnitude_end`](https://docs.rs/fixed_decimal/latest/fixed_decimal/struct.FixedDecimal.html#method.nonzero_magnitude_end) for more information. int get nonzeroMagnitudeEnd { @@ -178,9 +162,8 @@ final class FixedDecimal implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XFixedDecimal_nonzero_magnitude_end = - _capi)>>( - 'ICU4XFixedDecimal_nonzero_magnitude_end') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XFixedDecimal_nonzero_magnitude_end') + .asFunction)>(isLeaf: true); /// See the [Rust documentation for `is_zero`](https://docs.rs/fixed_decimal/latest/fixed_decimal/struct.FixedDecimal.html#method.is_zero) for more information. bool get isZero { @@ -190,9 +173,8 @@ final class FixedDecimal implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XFixedDecimal_is_zero = - _capi)>>( - 'ICU4XFixedDecimal_is_zero') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XFixedDecimal_is_zero') + .asFunction)>(isLeaf: true); /// Multiply the [`FixedDecimal`] by a given power of ten. /// @@ -202,10 +184,8 @@ final class FixedDecimal implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XFixedDecimal_multiply_pow10 = _capi< - ffi.NativeFunction< - ffi.Void Function(ffi.Pointer, - ffi.Int16)>>('ICU4XFixedDecimal_multiply_pow10') + static final _ICU4XFixedDecimal_multiply_pow10 = + _capi, ffi.Int16)>>('ICU4XFixedDecimal_multiply_pow10') .asFunction, int)>(isLeaf: true); /// See the [Rust documentation for `sign`](https://docs.rs/fixed_decimal/latest/fixed_decimal/struct.FixedDecimal.html#method.sign) for more information. @@ -216,9 +196,8 @@ final class FixedDecimal implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XFixedDecimal_sign = - _capi)>>( - 'ICU4XFixedDecimal_sign') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XFixedDecimal_sign') + .asFunction)>(isLeaf: true); /// Set the sign of the [`FixedDecimal`]. /// @@ -228,10 +207,8 @@ final class FixedDecimal implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XFixedDecimal_set_sign = _capi< - ffi.NativeFunction< - ffi.Void Function(ffi.Pointer, - ffi.Int32)>>('ICU4XFixedDecimal_set_sign') + static final _ICU4XFixedDecimal_set_sign = + _capi, ffi.Int32)>>('ICU4XFixedDecimal_set_sign') .asFunction, int)>(isLeaf: true); /// See the [Rust documentation for `apply_sign_display`](https://docs.rs/fixed_decimal/latest/fixed_decimal/struct.FixedDecimal.html#method.apply_sign_display) for more information. @@ -240,10 +217,8 @@ final class FixedDecimal implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XFixedDecimal_apply_sign_display = _capi< - ffi.NativeFunction< - ffi.Void Function(ffi.Pointer, - ffi.Int32)>>('ICU4XFixedDecimal_apply_sign_display') + static final _ICU4XFixedDecimal_apply_sign_display = + _capi, ffi.Int32)>>('ICU4XFixedDecimal_apply_sign_display') .asFunction, int)>(isLeaf: true); /// See the [Rust documentation for `trim_start`](https://docs.rs/fixed_decimal/latest/fixed_decimal/struct.FixedDecimal.html#method.trim_start) for more information. @@ -253,9 +228,8 @@ final class FixedDecimal implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XFixedDecimal_trim_start = - _capi)>>( - 'ICU4XFixedDecimal_trim_start') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XFixedDecimal_trim_start') + .asFunction)>(isLeaf: true); /// See the [Rust documentation for `trim_end`](https://docs.rs/fixed_decimal/latest/fixed_decimal/struct.FixedDecimal.html#method.trim_end) for more information. void trimEnd() { @@ -264,9 +238,8 @@ final class FixedDecimal implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XFixedDecimal_trim_end = - _capi)>>( - 'ICU4XFixedDecimal_trim_end') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XFixedDecimal_trim_end') + .asFunction)>(isLeaf: true); /// Zero-pad the [`FixedDecimal`] on the left to a particular position /// @@ -276,10 +249,8 @@ final class FixedDecimal implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XFixedDecimal_pad_start = _capi< - ffi.NativeFunction< - ffi.Void Function(ffi.Pointer, - ffi.Int16)>>('ICU4XFixedDecimal_pad_start') + static final _ICU4XFixedDecimal_pad_start = + _capi, ffi.Int16)>>('ICU4XFixedDecimal_pad_start') .asFunction, int)>(isLeaf: true); /// Zero-pad the [`FixedDecimal`] on the right to a particular position @@ -290,10 +261,8 @@ final class FixedDecimal implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XFixedDecimal_pad_end = _capi< - ffi.NativeFunction< - ffi.Void Function(ffi.Pointer, - ffi.Int16)>>('ICU4XFixedDecimal_pad_end') + static final _ICU4XFixedDecimal_pad_end = + _capi, ffi.Int16)>>('ICU4XFixedDecimal_pad_end') .asFunction, int)>(isLeaf: true); /// Truncate the [`FixedDecimal`] on the left to a particular position, deleting digits if necessary. This is useful for, e.g. abbreviating years @@ -305,10 +274,8 @@ final class FixedDecimal implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XFixedDecimal_set_max_position = _capi< - ffi.NativeFunction< - ffi.Void Function(ffi.Pointer, - ffi.Int16)>>('ICU4XFixedDecimal_set_max_position') + static final _ICU4XFixedDecimal_set_max_position = + _capi, ffi.Int16)>>('ICU4XFixedDecimal_set_max_position') .asFunction, int)>(isLeaf: true); /// See the [Rust documentation for `trunc`](https://docs.rs/fixed_decimal/latest/fixed_decimal/struct.FixedDecimal.html#method.trunc) for more information. @@ -317,10 +284,8 @@ final class FixedDecimal implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XFixedDecimal_trunc = _capi< - ffi.NativeFunction< - ffi.Void Function(ffi.Pointer, - ffi.Int16)>>('ICU4XFixedDecimal_trunc') + static final _ICU4XFixedDecimal_trunc = + _capi, ffi.Int16)>>('ICU4XFixedDecimal_trunc') .asFunction, int)>(isLeaf: true); /// See the [Rust documentation for `half_trunc`](https://docs.rs/fixed_decimal/latest/fixed_decimal/struct.FixedDecimal.html#method.half_trunc) for more information. @@ -329,10 +294,8 @@ final class FixedDecimal implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XFixedDecimal_half_trunc = _capi< - ffi.NativeFunction< - ffi.Void Function(ffi.Pointer, - ffi.Int16)>>('ICU4XFixedDecimal_half_trunc') + static final _ICU4XFixedDecimal_half_trunc = + _capi, ffi.Int16)>>('ICU4XFixedDecimal_half_trunc') .asFunction, int)>(isLeaf: true); /// See the [Rust documentation for `expand`](https://docs.rs/fixed_decimal/latest/fixed_decimal/struct.FixedDecimal.html#method.expand) for more information. @@ -341,10 +304,8 @@ final class FixedDecimal implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XFixedDecimal_expand = _capi< - ffi.NativeFunction< - ffi.Void Function(ffi.Pointer, - ffi.Int16)>>('ICU4XFixedDecimal_expand') + static final _ICU4XFixedDecimal_expand = + _capi, ffi.Int16)>>('ICU4XFixedDecimal_expand') .asFunction, int)>(isLeaf: true); /// See the [Rust documentation for `half_expand`](https://docs.rs/fixed_decimal/latest/fixed_decimal/struct.FixedDecimal.html#method.half_expand) for more information. @@ -353,10 +314,8 @@ final class FixedDecimal implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XFixedDecimal_half_expand = _capi< - ffi.NativeFunction< - ffi.Void Function(ffi.Pointer, - ffi.Int16)>>('ICU4XFixedDecimal_half_expand') + static final _ICU4XFixedDecimal_half_expand = + _capi, ffi.Int16)>>('ICU4XFixedDecimal_half_expand') .asFunction, int)>(isLeaf: true); /// See the [Rust documentation for `ceil`](https://docs.rs/fixed_decimal/latest/fixed_decimal/struct.FixedDecimal.html#method.ceil) for more information. @@ -365,10 +324,8 @@ final class FixedDecimal implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XFixedDecimal_ceil = _capi< - ffi.NativeFunction< - ffi.Void Function(ffi.Pointer, - ffi.Int16)>>('ICU4XFixedDecimal_ceil') + static final _ICU4XFixedDecimal_ceil = + _capi, ffi.Int16)>>('ICU4XFixedDecimal_ceil') .asFunction, int)>(isLeaf: true); /// See the [Rust documentation for `half_ceil`](https://docs.rs/fixed_decimal/latest/fixed_decimal/struct.FixedDecimal.html#method.half_ceil) for more information. @@ -377,10 +334,8 @@ final class FixedDecimal implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XFixedDecimal_half_ceil = _capi< - ffi.NativeFunction< - ffi.Void Function(ffi.Pointer, - ffi.Int16)>>('ICU4XFixedDecimal_half_ceil') + static final _ICU4XFixedDecimal_half_ceil = + _capi, ffi.Int16)>>('ICU4XFixedDecimal_half_ceil') .asFunction, int)>(isLeaf: true); /// See the [Rust documentation for `floor`](https://docs.rs/fixed_decimal/latest/fixed_decimal/struct.FixedDecimal.html#method.floor) for more information. @@ -389,10 +344,8 @@ final class FixedDecimal implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XFixedDecimal_floor = _capi< - ffi.NativeFunction< - ffi.Void Function(ffi.Pointer, - ffi.Int16)>>('ICU4XFixedDecimal_floor') + static final _ICU4XFixedDecimal_floor = + _capi, ffi.Int16)>>('ICU4XFixedDecimal_floor') .asFunction, int)>(isLeaf: true); /// See the [Rust documentation for `half_floor`](https://docs.rs/fixed_decimal/latest/fixed_decimal/struct.FixedDecimal.html#method.half_floor) for more information. @@ -401,10 +354,8 @@ final class FixedDecimal implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XFixedDecimal_half_floor = _capi< - ffi.NativeFunction< - ffi.Void Function(ffi.Pointer, - ffi.Int16)>>('ICU4XFixedDecimal_half_floor') + static final _ICU4XFixedDecimal_half_floor = + _capi, ffi.Int16)>>('ICU4XFixedDecimal_half_floor') .asFunction, int)>(isLeaf: true); /// See the [Rust documentation for `half_even`](https://docs.rs/fixed_decimal/latest/fixed_decimal/struct.FixedDecimal.html#method.half_even) for more information. @@ -413,10 +364,8 @@ final class FixedDecimal implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XFixedDecimal_half_even = _capi< - ffi.NativeFunction< - ffi.Void Function(ffi.Pointer, - ffi.Int16)>>('ICU4XFixedDecimal_half_even') + static final _ICU4XFixedDecimal_half_even = + _capi, ffi.Int16)>>('ICU4XFixedDecimal_half_even') .asFunction, int)>(isLeaf: true); /// Concatenates `other` to the end of `self`. @@ -429,22 +378,16 @@ final class FixedDecimal implements ffi.Finalizable { /// /// Throws [VoidError] on failure. void concatenateEnd(FixedDecimal other) { - final result = - _ICU4XFixedDecimal_concatenate_end(_underlying, other._underlying); + final result = _ICU4XFixedDecimal_concatenate_end(_underlying, other._underlying); if (!result.isOk) { throw VoidError(); } } // ignore: non_constant_identifier_names - static final _ICU4XFixedDecimal_concatenate_end = _capi< - ffi.NativeFunction< - _ResultVoidVoid Function( - ffi.Pointer, ffi.Pointer)>>( - 'ICU4XFixedDecimal_concatenate_end') - .asFunction< - _ResultVoidVoid Function( - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XFixedDecimal_concatenate_end = + _capi, ffi.Pointer)>>('ICU4XFixedDecimal_concatenate_end') + .asFunction<_ResultVoidVoid Function(ffi.Pointer, ffi.Pointer)>(isLeaf: true); /// Format the [`FixedDecimal`] as a string. /// @@ -457,11 +400,7 @@ final class FixedDecimal implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XFixedDecimal_to_string = _capi< - ffi.NativeFunction< - ffi.Void Function(ffi.Pointer, - ffi.Pointer)>>('ICU4XFixedDecimal_to_string') - .asFunction< - void Function( - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XFixedDecimal_to_string = + _capi, ffi.Pointer)>>('ICU4XFixedDecimal_to_string') + .asFunction, ffi.Pointer)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/FixedDecimalFormatter.g.dart b/ffi/capi/dart/package/lib/src/FixedDecimalFormatter.g.dart index 64532d33c2f..fbf3c91e4b3 100644 --- a/ffi/capi/dart/package/lib/src/FixedDecimalFormatter.g.dart +++ b/ffi/capi/dart/package/lib/src/FixedDecimalFormatter.g.dart @@ -15,33 +15,25 @@ final class FixedDecimalFormatter implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XFixedDecimalFormatter_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XFixedDecimalFormatter_destroy')); /// Creates a new [`FixedDecimalFormatter`] from locale data. /// /// See the [Rust documentation for `try_new`](https://docs.rs/icu/latest/icu/decimal/struct.FixedDecimalFormatter.html#method.try_new) for more information. /// /// Throws [Error] on failure. - factory FixedDecimalFormatter.withGroupingStrategy(DataProvider provider, - Locale locale, FixedDecimalGroupingStrategy groupingStrategy) { - final result = _ICU4XFixedDecimalFormatter_create_with_grouping_strategy( - provider._underlying, locale._underlying, groupingStrategy.index); + factory FixedDecimalFormatter.withGroupingStrategy(DataProvider provider, Locale locale, FixedDecimalGroupingStrategy groupingStrategy) { + final result = _ICU4XFixedDecimalFormatter_create_with_grouping_strategy(provider._underlying, locale._underlying, groupingStrategy.index); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return FixedDecimalFormatter._(result.union.ok); } + // ignore: non_constant_identifier_names static final _ICU4XFixedDecimalFormatter_create_with_grouping_strategy = - _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer, - ffi.Pointer, ffi.Int32)>>( - 'ICU4XFixedDecimalFormatter_create_with_grouping_strategy') - .asFunction< - _ResultOpaqueInt32 Function(ffi.Pointer, - ffi.Pointer, int)>(isLeaf: true); + _capi, ffi.Pointer, ffi.Int32)>>('ICU4XFixedDecimalFormatter_create_with_grouping_strategy') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer, ffi.Pointer, int)>(isLeaf: true); /// Formats a [`FixedDecimal`] to a string. /// @@ -50,8 +42,7 @@ final class FixedDecimalFormatter implements ffi.Finalizable { /// Throws [Error] on failure. String format(FixedDecimal value) { final writeable = _Writeable(); - final result = _ICU4XFixedDecimalFormatter_format( - _underlying, value._underlying, writeable._underlying); + final result = _ICU4XFixedDecimalFormatter_format(_underlying, value._underlying, writeable._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } @@ -59,12 +50,7 @@ final class FixedDecimalFormatter implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XFixedDecimalFormatter_format = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function(ffi.Pointer, - ffi.Pointer, ffi.Pointer)>>( - 'ICU4XFixedDecimalFormatter_format') - .asFunction< - _ResultVoidInt32 Function(ffi.Pointer, - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XFixedDecimalFormatter_format = + _capi, ffi.Pointer, ffi.Pointer)>>('ICU4XFixedDecimalFormatter_format') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer, ffi.Pointer)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/FixedDecimalGroupingStrategy.g.dart b/ffi/capi/dart/package/lib/src/FixedDecimalGroupingStrategy.g.dart index 533df3af0fa..40bf429f4b4 100644 --- a/ffi/capi/dart/package/lib/src/FixedDecimalGroupingStrategy.g.dart +++ b/ffi/capi/dart/package/lib/src/FixedDecimalGroupingStrategy.g.dart @@ -8,7 +8,10 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `GroupingStrategy`](https://docs.rs/icu/latest/icu/decimal/options/enum.GroupingStrategy.html) for more information. enum FixedDecimalGroupingStrategy { auto, + never, + always, + min2; } diff --git a/ffi/capi/dart/package/lib/src/FixedDecimalSignDisplay.g.dart b/ffi/capi/dart/package/lib/src/FixedDecimalSignDisplay.g.dart index 72e29ec8438..a3e46b5a080 100644 --- a/ffi/capi/dart/package/lib/src/FixedDecimalSignDisplay.g.dart +++ b/ffi/capi/dart/package/lib/src/FixedDecimalSignDisplay.g.dart @@ -10,8 +10,12 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `SignDisplay`](https://docs.rs/fixed_decimal/latest/fixed_decimal/enum.SignDisplay.html) for more information. enum FixedDecimalSignDisplay { auto, + never, + always, + exceptZero, + negative; } diff --git a/ffi/capi/dart/package/lib/src/GeneralCategoryNameToMaskMapper.g.dart b/ffi/capi/dart/package/lib/src/GeneralCategoryNameToMaskMapper.g.dart index 5df98e8b7f4..e59be600c5b 100644 --- a/ffi/capi/dart/package/lib/src/GeneralCategoryNameToMaskMapper.g.dart +++ b/ffi/capi/dart/package/lib/src/GeneralCategoryNameToMaskMapper.g.dart @@ -17,8 +17,7 @@ final class GeneralCategoryNameToMaskMapper implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = ffi.NativeFinalizer( - _capi('ICU4XGeneralCategoryNameToMaskMapper_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XGeneralCategoryNameToMaskMapper_destroy')); /// Get the mask value matching the given name, using strict matching /// @@ -26,23 +25,15 @@ final class GeneralCategoryNameToMaskMapper implements ffi.Finalizable { int getStrict(String name) { final alloc = ffi2.Arena(); final nameSlice = _SliceFfi2Utf8._fromDart(name, alloc); - - final result = _ICU4XGeneralCategoryNameToMaskMapper_get_strict( - _underlying, nameSlice._bytes, nameSlice._length); + final result = _ICU4XGeneralCategoryNameToMaskMapper_get_strict(_underlying, nameSlice._bytes, nameSlice._length); alloc.releaseAll(); return result; } // ignore: non_constant_identifier_names - static final _ICU4XGeneralCategoryNameToMaskMapper_get_strict = _capi< - ffi.NativeFunction< - ffi.Uint32 Function( - ffi.Pointer, - ffi.Pointer, - ffi.Size)>>('ICU4XGeneralCategoryNameToMaskMapper_get_strict') - .asFunction< - int Function(ffi.Pointer, ffi.Pointer, - int)>(isLeaf: true); + static final _ICU4XGeneralCategoryNameToMaskMapper_get_strict = + _capi, ffi.Pointer, ffi.Size)>>('ICU4XGeneralCategoryNameToMaskMapper_get_strict') + .asFunction, ffi.Pointer, int)>(isLeaf: true); /// Get the mask value matching the given name, using loose matching /// @@ -50,40 +41,29 @@ final class GeneralCategoryNameToMaskMapper implements ffi.Finalizable { int getLoose(String name) { final alloc = ffi2.Arena(); final nameSlice = _SliceFfi2Utf8._fromDart(name, alloc); - - final result = _ICU4XGeneralCategoryNameToMaskMapper_get_loose( - _underlying, nameSlice._bytes, nameSlice._length); + final result = _ICU4XGeneralCategoryNameToMaskMapper_get_loose(_underlying, nameSlice._bytes, nameSlice._length); alloc.releaseAll(); return result; } // ignore: non_constant_identifier_names - static final _ICU4XGeneralCategoryNameToMaskMapper_get_loose = _capi< - ffi.NativeFunction< - ffi.Uint32 Function( - ffi.Pointer, - ffi.Pointer, - ffi.Size)>>('ICU4XGeneralCategoryNameToMaskMapper_get_loose') - .asFunction< - int Function(ffi.Pointer, ffi.Pointer, - int)>(isLeaf: true); + static final _ICU4XGeneralCategoryNameToMaskMapper_get_loose = + _capi, ffi.Pointer, ffi.Size)>>('ICU4XGeneralCategoryNameToMaskMapper_get_loose') + .asFunction, ffi.Pointer, int)>(isLeaf: true); /// See the [Rust documentation for `get_name_to_enum_mapper`](https://docs.rs/icu/latest/icu/properties/struct.GeneralCategoryGroup.html#method.get_name_to_enum_mapper) for more information. /// /// Throws [Error] on failure. factory GeneralCategoryNameToMaskMapper.load(DataProvider provider) { - final result = - _ICU4XGeneralCategoryNameToMaskMapper_load(provider._underlying); + final result = _ICU4XGeneralCategoryNameToMaskMapper_load(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return GeneralCategoryNameToMaskMapper._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XGeneralCategoryNameToMaskMapper_load = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XGeneralCategoryNameToMaskMapper_load') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XGeneralCategoryNameToMaskMapper_load = + _capi)>>('ICU4XGeneralCategoryNameToMaskMapper_load') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/GraphemeClusterBreakIteratorLatin1.g.dart b/ffi/capi/dart/package/lib/src/GraphemeClusterBreakIteratorLatin1.g.dart index 6d6bcd346c6..a7f5275b791 100644 --- a/ffi/capi/dart/package/lib/src/GraphemeClusterBreakIteratorLatin1.g.dart +++ b/ffi/capi/dart/package/lib/src/GraphemeClusterBreakIteratorLatin1.g.dart @@ -13,8 +13,7 @@ final class GraphemeClusterBreakIteratorLatin1 implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = ffi.NativeFinalizer( - _capi('ICU4XGraphemeClusterBreakIteratorLatin1_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XGraphemeClusterBreakIteratorLatin1_destroy')); /// Finds the next breakpoint. Returns -1 if at the end of the string or if the index is /// out of range of a 32-bit signed integer. @@ -27,7 +26,6 @@ final class GraphemeClusterBreakIteratorLatin1 implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XGraphemeClusterBreakIteratorLatin1_next = - _capi)>>( - 'ICU4XGraphemeClusterBreakIteratorLatin1_next') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XGraphemeClusterBreakIteratorLatin1_next') + .asFunction)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/GraphemeClusterBreakIteratorUtf16.g.dart b/ffi/capi/dart/package/lib/src/GraphemeClusterBreakIteratorUtf16.g.dart index 86a561c1576..94a8b6feaed 100644 --- a/ffi/capi/dart/package/lib/src/GraphemeClusterBreakIteratorUtf16.g.dart +++ b/ffi/capi/dart/package/lib/src/GraphemeClusterBreakIteratorUtf16.g.dart @@ -13,8 +13,7 @@ final class GraphemeClusterBreakIteratorUtf16 implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = ffi.NativeFinalizer( - _capi('ICU4XGraphemeClusterBreakIteratorUtf16_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XGraphemeClusterBreakIteratorUtf16_destroy')); /// Finds the next breakpoint. Returns -1 if at the end of the string or if the index is /// out of range of a 32-bit signed integer. @@ -27,7 +26,6 @@ final class GraphemeClusterBreakIteratorUtf16 implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XGraphemeClusterBreakIteratorUtf16_next = - _capi)>>( - 'ICU4XGraphemeClusterBreakIteratorUtf16_next') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XGraphemeClusterBreakIteratorUtf16_next') + .asFunction)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/GraphemeClusterBreakIteratorUtf8.g.dart b/ffi/capi/dart/package/lib/src/GraphemeClusterBreakIteratorUtf8.g.dart index a55f6ba2aee..0695c96ac65 100644 --- a/ffi/capi/dart/package/lib/src/GraphemeClusterBreakIteratorUtf8.g.dart +++ b/ffi/capi/dart/package/lib/src/GraphemeClusterBreakIteratorUtf8.g.dart @@ -13,8 +13,7 @@ final class GraphemeClusterBreakIteratorUtf8 implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = ffi.NativeFinalizer( - _capi('ICU4XGraphemeClusterBreakIteratorUtf8_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XGraphemeClusterBreakIteratorUtf8_destroy')); /// Finds the next breakpoint. Returns -1 if at the end of the string or if the index is /// out of range of a 32-bit signed integer. @@ -27,7 +26,6 @@ final class GraphemeClusterBreakIteratorUtf8 implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XGraphemeClusterBreakIteratorUtf8_next = - _capi)>>( - 'ICU4XGraphemeClusterBreakIteratorUtf8_next') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XGraphemeClusterBreakIteratorUtf8_next') + .asFunction)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/GraphemeClusterSegmenter.g.dart b/ffi/capi/dart/package/lib/src/GraphemeClusterSegmenter.g.dart index c041b923838..aa258302364 100644 --- a/ffi/capi/dart/package/lib/src/GraphemeClusterSegmenter.g.dart +++ b/ffi/capi/dart/package/lib/src/GraphemeClusterSegmenter.g.dart @@ -16,8 +16,7 @@ final class GraphemeClusterSegmenter implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XGraphemeClusterSegmenter_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XGraphemeClusterSegmenter_destroy')); /// Construct an [`GraphemeClusterSegmenter`]. /// @@ -31,13 +30,11 @@ final class GraphemeClusterSegmenter implements ffi.Finalizable { } return GraphemeClusterSegmenter._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XGraphemeClusterSegmenter_create = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XGraphemeClusterSegmenter_create') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XGraphemeClusterSegmenter_create = + _capi)>>('ICU4XGraphemeClusterSegmenter_create') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// Segments a (potentially ill-formed) UTF-8 string. /// @@ -45,23 +42,15 @@ final class GraphemeClusterSegmenter implements ffi.Finalizable { GraphemeClusterBreakIteratorUtf8 segmentUtf8(String input) { final alloc = ffi2.Arena(); final inputSlice = _SliceFfi2Utf8._fromDart(input, alloc); - - final result = _ICU4XGraphemeClusterSegmenter_segment_utf8( - _underlying, inputSlice._bytes, inputSlice._length); + final result = _ICU4XGraphemeClusterSegmenter_segment_utf8(_underlying, inputSlice._bytes, inputSlice._length); alloc.releaseAll(); return GraphemeClusterBreakIteratorUtf8._(result); } // ignore: non_constant_identifier_names - static final _ICU4XGraphemeClusterSegmenter_segment_utf8 = _capi< - ffi.NativeFunction< - ffi.Pointer Function( - ffi.Pointer, - ffi.Pointer, - ffi.Size)>>('ICU4XGraphemeClusterSegmenter_segment_utf8') - .asFunction< - ffi.Pointer Function(ffi.Pointer, - ffi.Pointer, int)>(isLeaf: true); + static final _ICU4XGraphemeClusterSegmenter_segment_utf8 = + _capi Function(ffi.Pointer, ffi.Pointer, ffi.Size)>>('ICU4XGraphemeClusterSegmenter_segment_utf8') + .asFunction Function(ffi.Pointer, ffi.Pointer, int)>(isLeaf: true); /// Segments a UTF-16 string. /// @@ -69,23 +58,15 @@ final class GraphemeClusterSegmenter implements ffi.Finalizable { GraphemeClusterBreakIteratorUtf16 segmentUtf16(Uint16List input) { final alloc = ffi2.Arena(); final inputSlice = _SliceFfiUint16._fromDart(input, alloc); - - final result = _ICU4XGraphemeClusterSegmenter_segment_utf16( - _underlying, inputSlice._bytes, inputSlice._length); + final result = _ICU4XGraphemeClusterSegmenter_segment_utf16(_underlying, inputSlice._bytes, inputSlice._length); alloc.releaseAll(); return GraphemeClusterBreakIteratorUtf16._(result); } // ignore: non_constant_identifier_names - static final _ICU4XGraphemeClusterSegmenter_segment_utf16 = _capi< - ffi.NativeFunction< - ffi.Pointer Function( - ffi.Pointer, - ffi.Pointer, - ffi.Size)>>('ICU4XGraphemeClusterSegmenter_segment_utf16') - .asFunction< - ffi.Pointer Function(ffi.Pointer, - ffi.Pointer, int)>(isLeaf: true); + static final _ICU4XGraphemeClusterSegmenter_segment_utf16 = + _capi Function(ffi.Pointer, ffi.Pointer, ffi.Size)>>('ICU4XGraphemeClusterSegmenter_segment_utf16') + .asFunction Function(ffi.Pointer, ffi.Pointer, int)>(isLeaf: true); /// Segments a Latin-1 string. /// @@ -93,21 +74,13 @@ final class GraphemeClusterSegmenter implements ffi.Finalizable { GraphemeClusterBreakIteratorLatin1 segmentLatin1(Uint8List input) { final alloc = ffi2.Arena(); final inputSlice = _SliceFfiUint8._fromDart(input, alloc); - - final result = _ICU4XGraphemeClusterSegmenter_segment_latin1( - _underlying, inputSlice._bytes, inputSlice._length); + final result = _ICU4XGraphemeClusterSegmenter_segment_latin1(_underlying, inputSlice._bytes, inputSlice._length); alloc.releaseAll(); return GraphemeClusterBreakIteratorLatin1._(result); } // ignore: non_constant_identifier_names - static final _ICU4XGraphemeClusterSegmenter_segment_latin1 = _capi< - ffi.NativeFunction< - ffi.Pointer Function( - ffi.Pointer, - ffi.Pointer, - ffi.Size)>>('ICU4XGraphemeClusterSegmenter_segment_latin1') - .asFunction< - ffi.Pointer Function(ffi.Pointer, - ffi.Pointer, int)>(isLeaf: true); + static final _ICU4XGraphemeClusterSegmenter_segment_latin1 = + _capi Function(ffi.Pointer, ffi.Pointer, ffi.Size)>>('ICU4XGraphemeClusterSegmenter_segment_latin1') + .asFunction Function(ffi.Pointer, ffi.Pointer, int)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/GregorianDateFormatter.g.dart b/ffi/capi/dart/package/lib/src/GregorianDateFormatter.g.dart index a784513841d..3d9e3b1fd80 100644 --- a/ffi/capi/dart/package/lib/src/GregorianDateFormatter.g.dart +++ b/ffi/capi/dart/package/lib/src/GregorianDateFormatter.g.dart @@ -16,33 +16,25 @@ final class GregorianDateFormatter implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XGregorianDateFormatter_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XGregorianDateFormatter_destroy')); /// Creates a new [`GregorianDateFormatter`] from locale data. /// /// See the [Rust documentation for `try_new_with_length`](https://docs.rs/icu/latest/icu/datetime/struct.TypedDateFormatter.html#method.try_new_with_length) for more information. /// /// Throws [Error] on failure. - factory GregorianDateFormatter.withLength( - DataProvider provider, Locale locale, DateLength length) { - final result = _ICU4XGregorianDateFormatter_create_with_length( - provider._underlying, locale._underlying, length.index); + factory GregorianDateFormatter.withLength(DataProvider provider, Locale locale, DateLength length) { + final result = _ICU4XGregorianDateFormatter_create_with_length(provider._underlying, locale._underlying, length.index); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return GregorianDateFormatter._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XGregorianDateFormatter_create_with_length = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer, - ffi.Pointer, - ffi.Int32)>>('ICU4XGregorianDateFormatter_create_with_length') - .asFunction< - _ResultOpaqueInt32 Function(ffi.Pointer, - ffi.Pointer, int)>(isLeaf: true); + static final _ICU4XGregorianDateFormatter_create_with_length = + _capi, ffi.Pointer, ffi.Int32)>>('ICU4XGregorianDateFormatter_create_with_length') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer, ffi.Pointer, int)>(isLeaf: true); /// Formats a [`IsoDate`] to a string. /// @@ -51,8 +43,7 @@ final class GregorianDateFormatter implements ffi.Finalizable { /// Throws [Error] on failure. String formatIsoDate(IsoDate value) { final writeable = _Writeable(); - final result = _ICU4XGregorianDateFormatter_format_iso_date( - _underlying, value._underlying, writeable._underlying); + final result = _ICU4XGregorianDateFormatter_format_iso_date(_underlying, value._underlying, writeable._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } @@ -60,14 +51,9 @@ final class GregorianDateFormatter implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XGregorianDateFormatter_format_iso_date = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function(ffi.Pointer, - ffi.Pointer, ffi.Pointer)>>( - 'ICU4XGregorianDateFormatter_format_iso_date') - .asFunction< - _ResultVoidInt32 Function(ffi.Pointer, - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XGregorianDateFormatter_format_iso_date = + _capi, ffi.Pointer, ffi.Pointer)>>('ICU4XGregorianDateFormatter_format_iso_date') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer, ffi.Pointer)>(isLeaf: true); /// Formats a [`IsoDateTime`] to a string. /// @@ -76,8 +62,7 @@ final class GregorianDateFormatter implements ffi.Finalizable { /// Throws [Error] on failure. String formatIsoDatetime(IsoDateTime value) { final writeable = _Writeable(); - final result = _ICU4XGregorianDateFormatter_format_iso_datetime( - _underlying, value._underlying, writeable._underlying); + final result = _ICU4XGregorianDateFormatter_format_iso_datetime(_underlying, value._underlying, writeable._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } @@ -85,12 +70,7 @@ final class GregorianDateFormatter implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XGregorianDateFormatter_format_iso_datetime = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function(ffi.Pointer, - ffi.Pointer, ffi.Pointer)>>( - 'ICU4XGregorianDateFormatter_format_iso_datetime') - .asFunction< - _ResultVoidInt32 Function(ffi.Pointer, - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XGregorianDateFormatter_format_iso_datetime = + _capi, ffi.Pointer, ffi.Pointer)>>('ICU4XGregorianDateFormatter_format_iso_datetime') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer, ffi.Pointer)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/GregorianDateTimeFormatter.g.dart b/ffi/capi/dart/package/lib/src/GregorianDateTimeFormatter.g.dart index bb0a1c293ac..ef264f831c2 100644 --- a/ffi/capi/dart/package/lib/src/GregorianDateTimeFormatter.g.dart +++ b/ffi/capi/dart/package/lib/src/GregorianDateTimeFormatter.g.dart @@ -16,35 +16,25 @@ final class GregorianDateTimeFormatter implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XGregorianDateTimeFormatter_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XGregorianDateTimeFormatter_destroy')); /// Creates a new [`GregorianDateFormatter`] from locale data. /// /// See the [Rust documentation for `try_new`](https://docs.rs/icu/latest/icu/datetime/struct.TypedDateTimeFormatter.html#method.try_new) for more information. /// /// Throws [Error] on failure. - factory GregorianDateTimeFormatter.withLengths(DataProvider provider, - Locale locale, DateLength dateLength, TimeLength timeLength) { - final result = _ICU4XGregorianDateTimeFormatter_create_with_lengths( - provider._underlying, - locale._underlying, - dateLength.index, - timeLength.index); + factory GregorianDateTimeFormatter.withLengths(DataProvider provider, Locale locale, DateLength dateLength, TimeLength timeLength) { + final result = _ICU4XGregorianDateTimeFormatter_create_with_lengths(provider._underlying, locale._underlying, dateLength.index, timeLength.index); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return GregorianDateTimeFormatter._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XGregorianDateTimeFormatter_create_with_lengths = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer, - ffi.Pointer, ffi.Int32, ffi.Int32)>>( - 'ICU4XGregorianDateTimeFormatter_create_with_lengths') - .asFunction< - _ResultOpaqueInt32 Function(ffi.Pointer, - ffi.Pointer, int, int)>(isLeaf: true); + static final _ICU4XGregorianDateTimeFormatter_create_with_lengths = + _capi, ffi.Pointer, ffi.Int32, ffi.Int32)>>('ICU4XGregorianDateTimeFormatter_create_with_lengths') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer, ffi.Pointer, int, int)>(isLeaf: true); /// Formats a [`IsoDateTime`] to a string. /// @@ -53,8 +43,7 @@ final class GregorianDateTimeFormatter implements ffi.Finalizable { /// Throws [Error] on failure. String formatIsoDatetime(IsoDateTime value) { final writeable = _Writeable(); - final result = _ICU4XGregorianDateTimeFormatter_format_iso_datetime( - _underlying, value._underlying, writeable._underlying); + final result = _ICU4XGregorianDateTimeFormatter_format_iso_datetime(_underlying, value._underlying, writeable._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } @@ -62,12 +51,7 @@ final class GregorianDateTimeFormatter implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XGregorianDateTimeFormatter_format_iso_datetime = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function(ffi.Pointer, - ffi.Pointer, ffi.Pointer)>>( - 'ICU4XGregorianDateTimeFormatter_format_iso_datetime') - .asFunction< - _ResultVoidInt32 Function(ffi.Pointer, - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XGregorianDateTimeFormatter_format_iso_datetime = + _capi, ffi.Pointer, ffi.Pointer)>>('ICU4XGregorianDateTimeFormatter_format_iso_datetime') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer, ffi.Pointer)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/GregorianZonedDateTimeFormatter.g.dart b/ffi/capi/dart/package/lib/src/GregorianZonedDateTimeFormatter.g.dart index c74785f6e0f..bacdb42e34c 100644 --- a/ffi/capi/dart/package/lib/src/GregorianZonedDateTimeFormatter.g.dart +++ b/ffi/capi/dart/package/lib/src/GregorianZonedDateTimeFormatter.g.dart @@ -15,8 +15,7 @@ final class GregorianZonedDateTimeFormatter implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = ffi.NativeFinalizer( - _capi('ICU4XGregorianZonedDateTimeFormatter_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XGregorianZonedDateTimeFormatter_destroy')); /// Creates a new [`GregorianZonedDateTimeFormatter`] from locale data. /// @@ -26,28 +25,18 @@ final class GregorianZonedDateTimeFormatter implements ffi.Finalizable { /// See the [Rust documentation for `try_new`](https://docs.rs/icu/latest/icu/datetime/struct.TypedZonedDateTimeFormatter.html#method.try_new) for more information. /// /// Throws [Error] on failure. - factory GregorianZonedDateTimeFormatter.withLengths(DataProvider provider, - Locale locale, DateLength dateLength, TimeLength timeLength) { - final result = _ICU4XGregorianZonedDateTimeFormatter_create_with_lengths( - provider._underlying, - locale._underlying, - dateLength.index, - timeLength.index); + factory GregorianZonedDateTimeFormatter.withLengths(DataProvider provider, Locale locale, DateLength dateLength, TimeLength timeLength) { + final result = _ICU4XGregorianZonedDateTimeFormatter_create_with_lengths(provider._underlying, locale._underlying, dateLength.index, timeLength.index); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return GregorianZonedDateTimeFormatter._(result.union.ok); } + // ignore: non_constant_identifier_names static final _ICU4XGregorianZonedDateTimeFormatter_create_with_lengths = - _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer, - ffi.Pointer, ffi.Int32, ffi.Int32)>>( - 'ICU4XGregorianZonedDateTimeFormatter_create_with_lengths') - .asFunction< - _ResultOpaqueInt32 Function(ffi.Pointer, - ffi.Pointer, int, int)>(isLeaf: true); + _capi, ffi.Pointer, ffi.Int32, ffi.Int32)>>('ICU4XGregorianZonedDateTimeFormatter_create_with_lengths') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer, ffi.Pointer, int, int)>(isLeaf: true); /// Creates a new [`GregorianZonedDateTimeFormatter`] from locale data. /// @@ -57,57 +46,27 @@ final class GregorianZonedDateTimeFormatter implements ffi.Finalizable { /// See the [Rust documentation for `try_new`](https://docs.rs/icu/latest/icu/datetime/struct.TypedZonedDateTimeFormatter.html#method.try_new) for more information. /// /// Throws [Error] on failure. - factory GregorianZonedDateTimeFormatter.withLengthsAndIso8601TimeZoneFallback( - DataProvider provider, - Locale locale, - DateLength dateLength, - TimeLength timeLength, - IsoTimeZoneOptions zoneOptions) { - final result = - _ICU4XGregorianZonedDateTimeFormatter_create_with_lengths_and_iso_8601_time_zone_fallback( - provider._underlying, - locale._underlying, - dateLength.index, - timeLength.index, - zoneOptions._underlying); + factory GregorianZonedDateTimeFormatter.withLengthsAndIso8601TimeZoneFallback(DataProvider provider, Locale locale, DateLength dateLength, TimeLength timeLength, IsoTimeZoneOptions zoneOptions) { + final result = _ICU4XGregorianZonedDateTimeFormatter_create_with_lengths_and_iso_8601_time_zone_fallback(provider._underlying, locale._underlying, dateLength.index, timeLength.index, zoneOptions._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return GregorianZonedDateTimeFormatter._(result.union.ok); } + // ignore: non_constant_identifier_names static final _ICU4XGregorianZonedDateTimeFormatter_create_with_lengths_and_iso_8601_time_zone_fallback = - _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer, - ffi.Pointer, - ffi.Int32, - ffi.Int32, - _IsoTimeZoneOptionsFfi)>>( - 'ICU4XGregorianZonedDateTimeFormatter_create_with_lengths_and_iso_8601_time_zone_fallback') - .asFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer, - ffi.Pointer, - int, - int, - _IsoTimeZoneOptionsFfi)>(isLeaf: true); + _capi, ffi.Pointer, ffi.Int32, ffi.Int32, _IsoTimeZoneOptionsFfi)>>('ICU4XGregorianZonedDateTimeFormatter_create_with_lengths_and_iso_8601_time_zone_fallback') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer, ffi.Pointer, int, int, _IsoTimeZoneOptionsFfi)>(isLeaf: true); /// Formats a [`IsoDateTime`] and [`CustomTimeZone`] to a string. /// /// See the [Rust documentation for `format`](https://docs.rs/icu/latest/icu/datetime/struct.TypedZonedDateTimeFormatter.html#method.format) for more information. /// /// Throws [Error] on failure. - String formatIsoDatetimeWithCustomTimeZone( - IsoDateTime datetime, CustomTimeZone timeZone) { + String formatIsoDatetimeWithCustomTimeZone(IsoDateTime datetime, CustomTimeZone timeZone) { final writeable = _Writeable(); - final result = - _ICU4XGregorianZonedDateTimeFormatter_format_iso_datetime_with_custom_time_zone( - _underlying, - datetime._underlying, - timeZone._underlying, - writeable._underlying); + final result = _ICU4XGregorianZonedDateTimeFormatter_format_iso_datetime_with_custom_time_zone(_underlying, datetime._underlying, timeZone._underlying, writeable._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } @@ -116,18 +75,6 @@ final class GregorianZonedDateTimeFormatter implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XGregorianZonedDateTimeFormatter_format_iso_datetime_with_custom_time_zone = - _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function( - ffi.Pointer, - ffi.Pointer, - ffi.Pointer, - ffi.Pointer)>>( - 'ICU4XGregorianZonedDateTimeFormatter_format_iso_datetime_with_custom_time_zone') - .asFunction< - _ResultVoidInt32 Function( - ffi.Pointer, - ffi.Pointer, - ffi.Pointer, - ffi.Pointer)>(isLeaf: true); + _capi, ffi.Pointer, ffi.Pointer, ffi.Pointer)>>('ICU4XGregorianZonedDateTimeFormatter_format_iso_datetime_with_custom_time_zone') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer, ffi.Pointer, ffi.Pointer)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/IanaToBcp47Mapper.g.dart b/ffi/capi/dart/package/lib/src/IanaToBcp47Mapper.g.dart index b11becbb53c..86dc79f0d2a 100644 --- a/ffi/capi/dart/package/lib/src/IanaToBcp47Mapper.g.dart +++ b/ffi/capi/dart/package/lib/src/IanaToBcp47Mapper.g.dart @@ -19,8 +19,7 @@ final class IanaToBcp47Mapper implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XIanaToBcp47Mapper_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XIanaToBcp47Mapper_destroy')); /// See the [Rust documentation for `new`](https://docs.rs/icu/latest/icu/timezone/struct.IanaToBcp47Mapper.html#method.new) for more information. /// @@ -32,11 +31,9 @@ final class IanaToBcp47Mapper implements ffi.Finalizable { } return IanaToBcp47Mapper._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XIanaToBcp47Mapper_create = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer)>>('ICU4XIanaToBcp47Mapper_create') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XIanaToBcp47Mapper_create = + _capi)>>('ICU4XIanaToBcp47Mapper_create') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/IsoDate.g.dart b/ffi/capi/dart/package/lib/src/IsoDate.g.dart index 94efefdf72b..a2641080c22 100644 --- a/ffi/capi/dart/package/lib/src/IsoDate.g.dart +++ b/ffi/capi/dart/package/lib/src/IsoDate.g.dart @@ -29,11 +29,10 @@ final class IsoDate implements ffi.Finalizable { } return IsoDate._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XIsoDate_create = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function( - ffi.Int32, ffi.Uint8, ffi.Uint8)>>('ICU4XIsoDate_create') + static final _ICU4XIsoDate_create = + _capi>('ICU4XIsoDate_create') .asFunction<_ResultOpaqueInt32 Function(int, int, int)>(isLeaf: true); /// Creates a new [`IsoDate`] representing January 1, 1970. @@ -43,11 +42,11 @@ final class IsoDate implements ffi.Finalizable { final result = _ICU4XIsoDate_create_for_unix_epoch(); return IsoDate._(result); } + // ignore: non_constant_identifier_names static final _ICU4XIsoDate_create_for_unix_epoch = - _capi Function()>>( - 'ICU4XIsoDate_create_for_unix_epoch') - .asFunction Function()>(isLeaf: true); + _capi Function()>>('ICU4XIsoDate_create_for_unix_epoch') + .asFunction Function()>(isLeaf: true); /// Convert this date to one in a different calendar /// @@ -58,13 +57,9 @@ final class IsoDate implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XIsoDate_to_calendar = _capi< - ffi.NativeFunction< - ffi.Pointer Function(ffi.Pointer, - ffi.Pointer)>>('ICU4XIsoDate_to_calendar') - .asFunction< - ffi.Pointer Function( - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XIsoDate_to_calendar = + _capi Function(ffi.Pointer, ffi.Pointer)>>('ICU4XIsoDate_to_calendar') + .asFunction Function(ffi.Pointer, ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `to_any`](https://docs.rs/icu/latest/icu/calendar/struct.Date.html#method.to_any) for more information. Date toAny() { @@ -73,12 +68,9 @@ final class IsoDate implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XIsoDate_to_any = _capi< - ffi.NativeFunction< - ffi.Pointer Function( - ffi.Pointer)>>('ICU4XIsoDate_to_any') - .asFunction Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XIsoDate_to_any = + _capi Function(ffi.Pointer)>>('ICU4XIsoDate_to_any') + .asFunction Function(ffi.Pointer)>(isLeaf: true); /// Returns the 1-indexed day in the month for this date /// @@ -90,9 +82,8 @@ final class IsoDate implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XIsoDate_day_of_month = - _capi)>>( - 'ICU4XIsoDate_day_of_month') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XIsoDate_day_of_month') + .asFunction)>(isLeaf: true); /// Returns the day in the week for this day /// @@ -104,9 +95,8 @@ final class IsoDate implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XIsoDate_day_of_week = - _capi)>>( - 'ICU4XIsoDate_day_of_week') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XIsoDate_day_of_week') + .asFunction)>(isLeaf: true); /// Returns the week number in this month, 1-indexed, based on what /// is considered the first day of the week (often a locale preference). @@ -115,16 +105,13 @@ final class IsoDate implements ffi.Finalizable { /// /// See the [Rust documentation for `week_of_month`](https://docs.rs/icu/latest/icu/calendar/struct.Date.html#method.week_of_month) for more information. int weekOfMonth(IsoWeekday firstWeekday) { - final result = - _ICU4XIsoDate_week_of_month(_underlying, firstWeekday._underlying); + final result = _ICU4XIsoDate_week_of_month(_underlying, firstWeekday._underlying); return result; } // ignore: non_constant_identifier_names - static final _ICU4XIsoDate_week_of_month = _capi< - ffi.NativeFunction< - ffi.Uint32 Function(ffi.Pointer, - ffi.Int32)>>('ICU4XIsoDate_week_of_month') + static final _ICU4XIsoDate_week_of_month = + _capi, ffi.Int32)>>('ICU4XIsoDate_week_of_month') .asFunction, int)>(isLeaf: true); /// Returns the week number in this year, using week data @@ -133,8 +120,7 @@ final class IsoDate implements ffi.Finalizable { /// /// Throws [Error] on failure. WeekOf weekOfYear(WeekCalculator calculator) { - final result = - _ICU4XIsoDate_week_of_year(_underlying, calculator._underlying); + final result = _ICU4XIsoDate_week_of_year(_underlying, calculator._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } @@ -142,13 +128,9 @@ final class IsoDate implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XIsoDate_week_of_year = _capi< - ffi.NativeFunction< - _ResultWeekOfFfiInt32 Function(ffi.Pointer, - ffi.Pointer)>>('ICU4XIsoDate_week_of_year') - .asFunction< - _ResultWeekOfFfiInt32 Function( - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XIsoDate_week_of_year = + _capi, ffi.Pointer)>>('ICU4XIsoDate_week_of_year') + .asFunction<_ResultWeekOfFfiInt32 Function(ffi.Pointer, ffi.Pointer)>(isLeaf: true); /// Returns 1-indexed number of the month of this date in its year /// @@ -160,9 +142,8 @@ final class IsoDate implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XIsoDate_month = - _capi)>>( - 'ICU4XIsoDate_month') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XIsoDate_month') + .asFunction)>(isLeaf: true); /// Returns the year number for this date /// @@ -174,9 +155,8 @@ final class IsoDate implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XIsoDate_year = - _capi)>>( - 'ICU4XIsoDate_year') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XIsoDate_year') + .asFunction)>(isLeaf: true); /// Returns if the year is a leap year for this date /// @@ -188,9 +168,8 @@ final class IsoDate implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XIsoDate_is_in_leap_year = - _capi)>>( - 'ICU4XIsoDate_is_in_leap_year') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XIsoDate_is_in_leap_year') + .asFunction)>(isLeaf: true); /// Returns the number of months in the year represented by this date /// @@ -202,9 +181,8 @@ final class IsoDate implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XIsoDate_months_in_year = - _capi)>>( - 'ICU4XIsoDate_months_in_year') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XIsoDate_months_in_year') + .asFunction)>(isLeaf: true); /// Returns the number of days in the month represented by this date /// @@ -216,9 +194,8 @@ final class IsoDate implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XIsoDate_days_in_month = - _capi)>>( - 'ICU4XIsoDate_days_in_month') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XIsoDate_days_in_month') + .asFunction)>(isLeaf: true); /// Returns the number of days in the year represented by this date /// @@ -230,7 +207,6 @@ final class IsoDate implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XIsoDate_days_in_year = - _capi)>>( - 'ICU4XIsoDate_days_in_year') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XIsoDate_days_in_year') + .asFunction)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/IsoDateTime.g.dart b/ffi/capi/dart/package/lib/src/IsoDateTime.g.dart index 87e1dc6ad5f..09492956fcc 100644 --- a/ffi/capi/dart/package/lib/src/IsoDateTime.g.dart +++ b/ffi/capi/dart/package/lib/src/IsoDateTime.g.dart @@ -15,69 +15,51 @@ final class IsoDateTime implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XIsoDateTime_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XIsoDateTime_destroy')); /// Creates a new [`IsoDateTime`] from the specified date and time. /// /// See the [Rust documentation for `try_new_iso_datetime`](https://docs.rs/icu/latest/icu/calendar/struct.DateTime.html#method.try_new_iso_datetime) for more information. /// /// Throws [Error] on failure. - factory IsoDateTime(int year, int month, int day, int hour, int minute, - int second, int nanosecond) { - final result = _ICU4XIsoDateTime_create( - year, month, day, hour, minute, second, nanosecond); + factory IsoDateTime(int year, int month, int day, int hour, int minute, int second, int nanosecond) { + final result = _ICU4XIsoDateTime_create(year, month, day, hour, minute, second, nanosecond); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return IsoDateTime._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XIsoDateTime_create = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function( - ffi.Int32, - ffi.Uint8, - ffi.Uint8, - ffi.Uint8, - ffi.Uint8, - ffi.Uint8, - ffi.Uint32)>>('ICU4XIsoDateTime_create') - .asFunction< - _ResultOpaqueInt32 Function( - int, int, int, int, int, int, int)>(isLeaf: true); + static final _ICU4XIsoDateTime_create = + _capi>('ICU4XIsoDateTime_create') + .asFunction<_ResultOpaqueInt32 Function(int, int, int, int, int, int, int)>(isLeaf: true); /// Creates a new [`IsoDateTime`] from an [`IsoDate`] and [`Time`] object /// /// See the [Rust documentation for `new`](https://docs.rs/icu/latest/icu/calendar/struct.DateTime.html#method.new) for more information. factory IsoDateTime.fromDateAndTime(IsoDate date, Time time) { - final result = _ICU4XIsoDateTime_crate_from_date_and_time( - date._underlying, time._underlying); + final result = _ICU4XIsoDateTime_crate_from_date_and_time(date._underlying, time._underlying); return IsoDateTime._(result); } + // ignore: non_constant_identifier_names - static final _ICU4XIsoDateTime_crate_from_date_and_time = _capi< - ffi.NativeFunction< - ffi.Pointer Function( - ffi.Pointer, ffi.Pointer)>>( - 'ICU4XIsoDateTime_crate_from_date_and_time') - .asFunction< - ffi.Pointer Function( - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XIsoDateTime_crate_from_date_and_time = + _capi Function(ffi.Pointer, ffi.Pointer)>>('ICU4XIsoDateTime_crate_from_date_and_time') + .asFunction Function(ffi.Pointer, ffi.Pointer)>(isLeaf: true); /// Construct from the minutes since the local unix epoch for this date (Jan 1 1970, 00:00) /// /// See the [Rust documentation for `from_minutes_since_local_unix_epoch`](https://docs.rs/icu/latest/icu/calendar/struct.DateTime.html#method.from_minutes_since_local_unix_epoch) for more information. factory IsoDateTime.fromMinutesSinceLocalUnixEpoch(int minutes) { - final result = - _ICU4XIsoDateTime_create_from_minutes_since_local_unix_epoch(minutes); + final result = _ICU4XIsoDateTime_create_from_minutes_since_local_unix_epoch(minutes); return IsoDateTime._(result); } + // ignore: non_constant_identifier_names static final _ICU4XIsoDateTime_create_from_minutes_since_local_unix_epoch = - _capi Function(ffi.Int32)>>( - 'ICU4XIsoDateTime_create_from_minutes_since_local_unix_epoch') - .asFunction Function(int)>(isLeaf: true); + _capi Function(ffi.Int32)>>('ICU4XIsoDateTime_create_from_minutes_since_local_unix_epoch') + .asFunction Function(int)>(isLeaf: true); /// Gets the date contained in this object /// @@ -88,12 +70,9 @@ final class IsoDateTime implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XIsoDateTime_date = _capi< - ffi.NativeFunction< - ffi.Pointer Function( - ffi.Pointer)>>('ICU4XIsoDateTime_date') - .asFunction Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XIsoDateTime_date = + _capi Function(ffi.Pointer)>>('ICU4XIsoDateTime_date') + .asFunction Function(ffi.Pointer)>(isLeaf: true); /// Gets the time contained in this object /// @@ -104,12 +83,9 @@ final class IsoDateTime implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XIsoDateTime_time = _capi< - ffi.NativeFunction< - ffi.Pointer Function( - ffi.Pointer)>>('ICU4XIsoDateTime_time') - .asFunction Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XIsoDateTime_time = + _capi Function(ffi.Pointer)>>('ICU4XIsoDateTime_time') + .asFunction Function(ffi.Pointer)>(isLeaf: true); /// Converts this to an [`DateTime`] capable of being mixed with dates of /// other calendars @@ -121,45 +97,35 @@ final class IsoDateTime implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XIsoDateTime_to_any = _capi< - ffi.NativeFunction< - ffi.Pointer Function( - ffi.Pointer)>>('ICU4XIsoDateTime_to_any') - .asFunction Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XIsoDateTime_to_any = + _capi Function(ffi.Pointer)>>('ICU4XIsoDateTime_to_any') + .asFunction Function(ffi.Pointer)>(isLeaf: true); /// Gets the minutes since the local unix epoch for this date (Jan 1 1970, 00:00) /// /// See the [Rust documentation for `minutes_since_local_unix_epoch`](https://docs.rs/icu/latest/icu/calendar/struct.DateTime.html#method.minutes_since_local_unix_epoch) for more information. int get minutesSinceLocalUnixEpoch { - final result = - _ICU4XIsoDateTime_minutes_since_local_unix_epoch(_underlying); + final result = _ICU4XIsoDateTime_minutes_since_local_unix_epoch(_underlying); return result; } // ignore: non_constant_identifier_names static final _ICU4XIsoDateTime_minutes_since_local_unix_epoch = - _capi)>>( - 'ICU4XIsoDateTime_minutes_since_local_unix_epoch') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XIsoDateTime_minutes_since_local_unix_epoch') + .asFunction)>(isLeaf: true); /// Convert this datetime to one in a different calendar /// /// See the [Rust documentation for `to_calendar`](https://docs.rs/icu/latest/icu/calendar/struct.DateTime.html#method.to_calendar) for more information. DateTime toCalendar(Calendar calendar) { - final result = - _ICU4XIsoDateTime_to_calendar(_underlying, calendar._underlying); + final result = _ICU4XIsoDateTime_to_calendar(_underlying, calendar._underlying); return DateTime._(result); } // ignore: non_constant_identifier_names - static final _ICU4XIsoDateTime_to_calendar = _capi< - ffi.NativeFunction< - ffi.Pointer Function(ffi.Pointer, - ffi.Pointer)>>('ICU4XIsoDateTime_to_calendar') - .asFunction< - ffi.Pointer Function( - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XIsoDateTime_to_calendar = + _capi Function(ffi.Pointer, ffi.Pointer)>>('ICU4XIsoDateTime_to_calendar') + .asFunction Function(ffi.Pointer, ffi.Pointer)>(isLeaf: true); /// Returns the hour in this time /// @@ -171,9 +137,8 @@ final class IsoDateTime implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XIsoDateTime_hour = - _capi)>>( - 'ICU4XIsoDateTime_hour') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XIsoDateTime_hour') + .asFunction)>(isLeaf: true); /// Returns the minute in this time /// @@ -185,9 +150,8 @@ final class IsoDateTime implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XIsoDateTime_minute = - _capi)>>( - 'ICU4XIsoDateTime_minute') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XIsoDateTime_minute') + .asFunction)>(isLeaf: true); /// Returns the second in this time /// @@ -199,9 +163,8 @@ final class IsoDateTime implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XIsoDateTime_second = - _capi)>>( - 'ICU4XIsoDateTime_second') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XIsoDateTime_second') + .asFunction)>(isLeaf: true); /// Returns the nanosecond in this time /// @@ -213,9 +176,8 @@ final class IsoDateTime implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XIsoDateTime_nanosecond = - _capi)>>( - 'ICU4XIsoDateTime_nanosecond') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XIsoDateTime_nanosecond') + .asFunction)>(isLeaf: true); /// Returns the 1-indexed day in the month for this date /// @@ -227,9 +189,8 @@ final class IsoDateTime implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XIsoDateTime_day_of_month = - _capi)>>( - 'ICU4XIsoDateTime_day_of_month') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XIsoDateTime_day_of_month') + .asFunction)>(isLeaf: true); /// Returns the day in the week for this day /// @@ -241,9 +202,8 @@ final class IsoDateTime implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XIsoDateTime_day_of_week = - _capi)>>( - 'ICU4XIsoDateTime_day_of_week') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XIsoDateTime_day_of_week') + .asFunction)>(isLeaf: true); /// Returns the week number in this month, 1-indexed, based on what /// is considered the first day of the week (often a locale preference). @@ -252,16 +212,13 @@ final class IsoDateTime implements ffi.Finalizable { /// /// See the [Rust documentation for `week_of_month`](https://docs.rs/icu/latest/icu/calendar/struct.Date.html#method.week_of_month) for more information. int weekOfMonth(IsoWeekday firstWeekday) { - final result = - _ICU4XIsoDateTime_week_of_month(_underlying, firstWeekday._underlying); + final result = _ICU4XIsoDateTime_week_of_month(_underlying, firstWeekday._underlying); return result; } // ignore: non_constant_identifier_names - static final _ICU4XIsoDateTime_week_of_month = _capi< - ffi.NativeFunction< - ffi.Uint32 Function(ffi.Pointer, - ffi.Int32)>>('ICU4XIsoDateTime_week_of_month') + static final _ICU4XIsoDateTime_week_of_month = + _capi, ffi.Int32)>>('ICU4XIsoDateTime_week_of_month') .asFunction, int)>(isLeaf: true); /// Returns the week number in this year, using week data @@ -270,8 +227,7 @@ final class IsoDateTime implements ffi.Finalizable { /// /// Throws [Error] on failure. WeekOf weekOfYear(WeekCalculator calculator) { - final result = - _ICU4XIsoDateTime_week_of_year(_underlying, calculator._underlying); + final result = _ICU4XIsoDateTime_week_of_year(_underlying, calculator._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } @@ -279,13 +235,9 @@ final class IsoDateTime implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XIsoDateTime_week_of_year = _capi< - ffi.NativeFunction< - _ResultWeekOfFfiInt32 Function(ffi.Pointer, - ffi.Pointer)>>('ICU4XIsoDateTime_week_of_year') - .asFunction< - _ResultWeekOfFfiInt32 Function( - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XIsoDateTime_week_of_year = + _capi, ffi.Pointer)>>('ICU4XIsoDateTime_week_of_year') + .asFunction<_ResultWeekOfFfiInt32 Function(ffi.Pointer, ffi.Pointer)>(isLeaf: true); /// Returns 1-indexed number of the month of this date in its year /// @@ -297,9 +249,8 @@ final class IsoDateTime implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XIsoDateTime_month = - _capi)>>( - 'ICU4XIsoDateTime_month') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XIsoDateTime_month') + .asFunction)>(isLeaf: true); /// Returns the year number for this date /// @@ -311,9 +262,8 @@ final class IsoDateTime implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XIsoDateTime_year = - _capi)>>( - 'ICU4XIsoDateTime_year') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XIsoDateTime_year') + .asFunction)>(isLeaf: true); /// Returns whether this date is in a leap year /// @@ -325,9 +275,8 @@ final class IsoDateTime implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XIsoDateTime_is_in_leap_year = - _capi)>>( - 'ICU4XIsoDateTime_is_in_leap_year') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XIsoDateTime_is_in_leap_year') + .asFunction)>(isLeaf: true); /// Returns the number of months in the year represented by this date /// @@ -339,9 +288,8 @@ final class IsoDateTime implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XIsoDateTime_months_in_year = - _capi)>>( - 'ICU4XIsoDateTime_months_in_year') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XIsoDateTime_months_in_year') + .asFunction)>(isLeaf: true); /// Returns the number of days in the month represented by this date /// @@ -353,9 +301,8 @@ final class IsoDateTime implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XIsoDateTime_days_in_month = - _capi)>>( - 'ICU4XIsoDateTime_days_in_month') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XIsoDateTime_days_in_month') + .asFunction)>(isLeaf: true); /// Returns the number of days in the year represented by this date /// @@ -367,7 +314,6 @@ final class IsoDateTime implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XIsoDateTime_days_in_year = - _capi)>>( - 'ICU4XIsoDateTime_days_in_year') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XIsoDateTime_days_in_year') + .asFunction)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/IsoTimeZoneFormat.g.dart b/ffi/capi/dart/package/lib/src/IsoTimeZoneFormat.g.dart index 1deadaef7d4..49d429b0982 100644 --- a/ffi/capi/dart/package/lib/src/IsoTimeZoneFormat.g.dart +++ b/ffi/capi/dart/package/lib/src/IsoTimeZoneFormat.g.dart @@ -8,7 +8,10 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `IsoFormat`](https://docs.rs/icu/latest/icu/datetime/time_zone/enum.IsoFormat.html) for more information. enum IsoTimeZoneFormat { basic, + extended, + utcBasic, + utcExtended; } diff --git a/ffi/capi/dart/package/lib/src/IsoTimeZoneMinuteDisplay.g.dart b/ffi/capi/dart/package/lib/src/IsoTimeZoneMinuteDisplay.g.dart index 9ae84c55cdd..150a1915c91 100644 --- a/ffi/capi/dart/package/lib/src/IsoTimeZoneMinuteDisplay.g.dart +++ b/ffi/capi/dart/package/lib/src/IsoTimeZoneMinuteDisplay.g.dart @@ -8,5 +8,6 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `IsoMinutes`](https://docs.rs/icu/latest/icu/datetime/time_zone/enum.IsoMinutes.html) for more information. enum IsoTimeZoneMinuteDisplay { required, + optional; } diff --git a/ffi/capi/dart/package/lib/src/IsoTimeZoneOptions.g.dart b/ffi/capi/dart/package/lib/src/IsoTimeZoneOptions.g.dart index 7eccab5d62b..f3bb47e3f71 100644 --- a/ffi/capi/dart/package/lib/src/IsoTimeZoneOptions.g.dart +++ b/ffi/capi/dart/package/lib/src/IsoTimeZoneOptions.g.dart @@ -32,14 +32,12 @@ final class IsoTimeZoneOptions { _underlying.format = format.index; } - IsoTimeZoneMinuteDisplay get minutes => - IsoTimeZoneMinuteDisplay.values[_underlying.minutes]; + IsoTimeZoneMinuteDisplay get minutes => IsoTimeZoneMinuteDisplay.values[_underlying.minutes]; set minutes(IsoTimeZoneMinuteDisplay minutes) { _underlying.minutes = minutes.index; } - IsoTimeZoneSecondDisplay get seconds => - IsoTimeZoneSecondDisplay.values[_underlying.seconds]; + IsoTimeZoneSecondDisplay get seconds => IsoTimeZoneSecondDisplay.values[_underlying.seconds]; set seconds(IsoTimeZoneSecondDisplay seconds) { _underlying.seconds = seconds.index; } diff --git a/ffi/capi/dart/package/lib/src/IsoTimeZoneSecondDisplay.g.dart b/ffi/capi/dart/package/lib/src/IsoTimeZoneSecondDisplay.g.dart index 1bdf476b284..6792a42c3c8 100644 --- a/ffi/capi/dart/package/lib/src/IsoTimeZoneSecondDisplay.g.dart +++ b/ffi/capi/dart/package/lib/src/IsoTimeZoneSecondDisplay.g.dart @@ -8,5 +8,6 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `IsoSeconds`](https://docs.rs/icu/latest/icu/datetime/time_zone/enum.IsoSeconds.html) for more information. enum IsoTimeZoneSecondDisplay { optional, + never; } diff --git a/ffi/capi/dart/package/lib/src/IsoWeekday.g.dart b/ffi/capi/dart/package/lib/src/IsoWeekday.g.dart index 8c836cc7efc..bd543822d98 100644 --- a/ffi/capi/dart/package/lib/src/IsoWeekday.g.dart +++ b/ffi/capi/dart/package/lib/src/IsoWeekday.g.dart @@ -7,11 +7,17 @@ part of 'lib.g.dart'; enum IsoWeekday { monday, + tuesday, + wednesday, + thursday, + friday, + saturday, + sunday; int get _underlying { diff --git a/ffi/capi/dart/package/lib/src/LanguageDisplay.g.dart b/ffi/capi/dart/package/lib/src/LanguageDisplay.g.dart index 6206f2a3b45..2aad6e18952 100644 --- a/ffi/capi/dart/package/lib/src/LanguageDisplay.g.dart +++ b/ffi/capi/dart/package/lib/src/LanguageDisplay.g.dart @@ -8,5 +8,6 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `LanguageDisplay`](https://docs.rs/icu/latest/icu/displaynames/options/enum.LanguageDisplay.html) for more information. enum LanguageDisplay { dialect, + standard; } diff --git a/ffi/capi/dart/package/lib/src/LeadingAdjustment.g.dart b/ffi/capi/dart/package/lib/src/LeadingAdjustment.g.dart index e6782532751..8a3ec43c5aa 100644 --- a/ffi/capi/dart/package/lib/src/LeadingAdjustment.g.dart +++ b/ffi/capi/dart/package/lib/src/LeadingAdjustment.g.dart @@ -8,6 +8,8 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `LeadingAdjustment`](https://docs.rs/icu/latest/icu/casemap/titlecase/enum.LeadingAdjustment.html) for more information. enum LeadingAdjustment { auto, + none, + toCased; } diff --git a/ffi/capi/dart/package/lib/src/LineBreakIteratorLatin1.g.dart b/ffi/capi/dart/package/lib/src/LineBreakIteratorLatin1.g.dart index a8727563bcd..64e9ec580fc 100644 --- a/ffi/capi/dart/package/lib/src/LineBreakIteratorLatin1.g.dart +++ b/ffi/capi/dart/package/lib/src/LineBreakIteratorLatin1.g.dart @@ -15,8 +15,7 @@ final class LineBreakIteratorLatin1 implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XLineBreakIteratorLatin1_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XLineBreakIteratorLatin1_destroy')); /// Finds the next breakpoint. Returns -1 if at the end of the string or if the index is /// out of range of a 32-bit signed integer. @@ -29,7 +28,6 @@ final class LineBreakIteratorLatin1 implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XLineBreakIteratorLatin1_next = - _capi)>>( - 'ICU4XLineBreakIteratorLatin1_next') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XLineBreakIteratorLatin1_next') + .asFunction)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/LineBreakIteratorUtf16.g.dart b/ffi/capi/dart/package/lib/src/LineBreakIteratorUtf16.g.dart index 977f7b992b0..fc753ff4e4e 100644 --- a/ffi/capi/dart/package/lib/src/LineBreakIteratorUtf16.g.dart +++ b/ffi/capi/dart/package/lib/src/LineBreakIteratorUtf16.g.dart @@ -15,8 +15,7 @@ final class LineBreakIteratorUtf16 implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XLineBreakIteratorUtf16_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XLineBreakIteratorUtf16_destroy')); /// Finds the next breakpoint. Returns -1 if at the end of the string or if the index is /// out of range of a 32-bit signed integer. @@ -29,7 +28,6 @@ final class LineBreakIteratorUtf16 implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XLineBreakIteratorUtf16_next = - _capi)>>( - 'ICU4XLineBreakIteratorUtf16_next') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XLineBreakIteratorUtf16_next') + .asFunction)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/LineBreakIteratorUtf8.g.dart b/ffi/capi/dart/package/lib/src/LineBreakIteratorUtf8.g.dart index 4048fb8716f..dfa8e3e5993 100644 --- a/ffi/capi/dart/package/lib/src/LineBreakIteratorUtf8.g.dart +++ b/ffi/capi/dart/package/lib/src/LineBreakIteratorUtf8.g.dart @@ -15,8 +15,7 @@ final class LineBreakIteratorUtf8 implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XLineBreakIteratorUtf8_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XLineBreakIteratorUtf8_destroy')); /// Finds the next breakpoint. Returns -1 if at the end of the string or if the index is /// out of range of a 32-bit signed integer. @@ -29,7 +28,6 @@ final class LineBreakIteratorUtf8 implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XLineBreakIteratorUtf8_next = - _capi)>>( - 'ICU4XLineBreakIteratorUtf8_next') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XLineBreakIteratorUtf8_next') + .asFunction)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/LineBreakOptionsV1.g.dart b/ffi/capi/dart/package/lib/src/LineBreakOptionsV1.g.dart index 164c1c6fa22..35ad1ec5eb5 100644 --- a/ffi/capi/dart/package/lib/src/LineBreakOptionsV1.g.dart +++ b/ffi/capi/dart/package/lib/src/LineBreakOptionsV1.g.dart @@ -28,14 +28,12 @@ final class LineBreakOptionsV1 { return result; } - LineBreakStrictness get strictness => - LineBreakStrictness.values[_underlying.strictness]; + LineBreakStrictness get strictness => LineBreakStrictness.values[_underlying.strictness]; set strictness(LineBreakStrictness strictness) { _underlying.strictness = strictness.index; } - LineBreakWordOption get wordOption => - LineBreakWordOption.values[_underlying.wordOption]; + LineBreakWordOption get wordOption => LineBreakWordOption.values[_underlying.wordOption]; set wordOption(LineBreakWordOption wordOption) { _underlying.wordOption = wordOption.index; } diff --git a/ffi/capi/dart/package/lib/src/LineBreakStrictness.g.dart b/ffi/capi/dart/package/lib/src/LineBreakStrictness.g.dart index f34eb0db468..9b9e9efd218 100644 --- a/ffi/capi/dart/package/lib/src/LineBreakStrictness.g.dart +++ b/ffi/capi/dart/package/lib/src/LineBreakStrictness.g.dart @@ -8,7 +8,10 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `LineBreakStrictness`](https://docs.rs/icu/latest/icu/segmenter/enum.LineBreakStrictness.html) for more information. enum LineBreakStrictness { loose, + normal, + strict, + anywhere; } diff --git a/ffi/capi/dart/package/lib/src/LineBreakWordOption.g.dart b/ffi/capi/dart/package/lib/src/LineBreakWordOption.g.dart index a7478baa674..a6a59f8e1ee 100644 --- a/ffi/capi/dart/package/lib/src/LineBreakWordOption.g.dart +++ b/ffi/capi/dart/package/lib/src/LineBreakWordOption.g.dart @@ -8,6 +8,8 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `LineBreakWordOption`](https://docs.rs/icu/latest/icu/segmenter/enum.LineBreakWordOption.html) for more information. enum LineBreakWordOption { normal, + breakAll, + keepAll; } diff --git a/ffi/capi/dart/package/lib/src/LineSegmenter.g.dart b/ffi/capi/dart/package/lib/src/LineSegmenter.g.dart index 0d6c51adfd2..effd4983f56 100644 --- a/ffi/capi/dart/package/lib/src/LineSegmenter.g.dart +++ b/ffi/capi/dart/package/lib/src/LineSegmenter.g.dart @@ -15,8 +15,7 @@ final class LineSegmenter implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XLineSegmenter_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XLineSegmenter_destroy')); /// Construct a [`LineSegmenter`] with default options. It automatically loads the best /// available payload data for Burmese, Khmer, Lao, and Thai. @@ -31,13 +30,11 @@ final class LineSegmenter implements ffi.Finalizable { } return LineSegmenter._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XLineSegmenter_create_auto = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer)>>('ICU4XLineSegmenter_create_auto') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XLineSegmenter_create_auto = + _capi)>>('ICU4XLineSegmenter_create_auto') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// Construct a [`LineSegmenter`] with default options and LSTM payload data for /// Burmese, Khmer, Lao, and Thai. @@ -52,13 +49,11 @@ final class LineSegmenter implements ffi.Finalizable { } return LineSegmenter._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XLineSegmenter_create_lstm = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer)>>('ICU4XLineSegmenter_create_lstm') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XLineSegmenter_create_lstm = + _capi)>>('ICU4XLineSegmenter_create_lstm') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// Construct a [`LineSegmenter`] with default options and dictionary payload data for /// Burmese, Khmer, Lao, and Thai.. @@ -73,13 +68,11 @@ final class LineSegmenter implements ffi.Finalizable { } return LineSegmenter._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XLineSegmenter_create_dictionary = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XLineSegmenter_create_dictionary') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XLineSegmenter_create_dictionary = + _capi)>>('ICU4XLineSegmenter_create_dictionary') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// Construct a [`LineSegmenter`] with custom options. It automatically loads the best /// available payload data for Burmese, Khmer, Lao, and Thai. @@ -87,24 +80,18 @@ final class LineSegmenter implements ffi.Finalizable { /// See the [Rust documentation for `new_auto_with_options`](https://docs.rs/icu/latest/icu/segmenter/struct.LineSegmenter.html#method.new_auto_with_options) for more information. /// /// Throws [Error] on failure. - factory LineSegmenter.autoWithOptionsV1( - DataProvider provider, LineBreakOptionsV1 options) { - final result = _ICU4XLineSegmenter_create_auto_with_options_v1( - provider._underlying, options._underlying); + factory LineSegmenter.autoWithOptionsV1(DataProvider provider, LineBreakOptionsV1 options) { + final result = _ICU4XLineSegmenter_create_auto_with_options_v1(provider._underlying, options._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return LineSegmenter._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XLineSegmenter_create_auto_with_options_v1 = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer, _LineBreakOptionsV1Ffi)>>( - 'ICU4XLineSegmenter_create_auto_with_options_v1') - .asFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer, _LineBreakOptionsV1Ffi)>(isLeaf: true); + static final _ICU4XLineSegmenter_create_auto_with_options_v1 = + _capi, _LineBreakOptionsV1Ffi)>>('ICU4XLineSegmenter_create_auto_with_options_v1') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer, _LineBreakOptionsV1Ffi)>(isLeaf: true); /// Construct a [`LineSegmenter`] with custom options and LSTM payload data for /// Burmese, Khmer, Lao, and Thai. @@ -112,24 +99,18 @@ final class LineSegmenter implements ffi.Finalizable { /// See the [Rust documentation for `new_lstm_with_options`](https://docs.rs/icu/latest/icu/segmenter/struct.LineSegmenter.html#method.new_lstm_with_options) for more information. /// /// Throws [Error] on failure. - factory LineSegmenter.lstmWithOptionsV1( - DataProvider provider, LineBreakOptionsV1 options) { - final result = _ICU4XLineSegmenter_create_lstm_with_options_v1( - provider._underlying, options._underlying); + factory LineSegmenter.lstmWithOptionsV1(DataProvider provider, LineBreakOptionsV1 options) { + final result = _ICU4XLineSegmenter_create_lstm_with_options_v1(provider._underlying, options._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return LineSegmenter._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XLineSegmenter_create_lstm_with_options_v1 = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer, _LineBreakOptionsV1Ffi)>>( - 'ICU4XLineSegmenter_create_lstm_with_options_v1') - .asFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer, _LineBreakOptionsV1Ffi)>(isLeaf: true); + static final _ICU4XLineSegmenter_create_lstm_with_options_v1 = + _capi, _LineBreakOptionsV1Ffi)>>('ICU4XLineSegmenter_create_lstm_with_options_v1') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer, _LineBreakOptionsV1Ffi)>(isLeaf: true); /// Construct a [`LineSegmenter`] with custom options and dictionary payload data for /// Burmese, Khmer, Lao, and Thai. @@ -137,24 +118,18 @@ final class LineSegmenter implements ffi.Finalizable { /// See the [Rust documentation for `new_dictionary_with_options`](https://docs.rs/icu/latest/icu/segmenter/struct.LineSegmenter.html#method.new_dictionary_with_options) for more information. /// /// Throws [Error] on failure. - factory LineSegmenter.dictionaryWithOptionsV1( - DataProvider provider, LineBreakOptionsV1 options) { - final result = _ICU4XLineSegmenter_create_dictionary_with_options_v1( - provider._underlying, options._underlying); + factory LineSegmenter.dictionaryWithOptionsV1(DataProvider provider, LineBreakOptionsV1 options) { + final result = _ICU4XLineSegmenter_create_dictionary_with_options_v1(provider._underlying, options._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return LineSegmenter._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XLineSegmenter_create_dictionary_with_options_v1 = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer, _LineBreakOptionsV1Ffi)>>( - 'ICU4XLineSegmenter_create_dictionary_with_options_v1') - .asFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer, _LineBreakOptionsV1Ffi)>(isLeaf: true); + static final _ICU4XLineSegmenter_create_dictionary_with_options_v1 = + _capi, _LineBreakOptionsV1Ffi)>>('ICU4XLineSegmenter_create_dictionary_with_options_v1') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer, _LineBreakOptionsV1Ffi)>(isLeaf: true); /// Segments a (potentially ill-formed) UTF-8 string. /// @@ -162,23 +137,15 @@ final class LineSegmenter implements ffi.Finalizable { LineBreakIteratorUtf8 segmentUtf8(String input) { final alloc = ffi2.Arena(); final inputSlice = _SliceFfi2Utf8._fromDart(input, alloc); - - final result = _ICU4XLineSegmenter_segment_utf8( - _underlying, inputSlice._bytes, inputSlice._length); + final result = _ICU4XLineSegmenter_segment_utf8(_underlying, inputSlice._bytes, inputSlice._length); alloc.releaseAll(); return LineBreakIteratorUtf8._(result); } // ignore: non_constant_identifier_names - static final _ICU4XLineSegmenter_segment_utf8 = _capi< - ffi.NativeFunction< - ffi.Pointer Function( - ffi.Pointer, - ffi.Pointer, - ffi.Size)>>('ICU4XLineSegmenter_segment_utf8') - .asFunction< - ffi.Pointer Function(ffi.Pointer, - ffi.Pointer, int)>(isLeaf: true); + static final _ICU4XLineSegmenter_segment_utf8 = + _capi Function(ffi.Pointer, ffi.Pointer, ffi.Size)>>('ICU4XLineSegmenter_segment_utf8') + .asFunction Function(ffi.Pointer, ffi.Pointer, int)>(isLeaf: true); /// Segments a UTF-16 string. /// @@ -186,23 +153,15 @@ final class LineSegmenter implements ffi.Finalizable { LineBreakIteratorUtf16 segmentUtf16(Uint16List input) { final alloc = ffi2.Arena(); final inputSlice = _SliceFfiUint16._fromDart(input, alloc); - - final result = _ICU4XLineSegmenter_segment_utf16( - _underlying, inputSlice._bytes, inputSlice._length); + final result = _ICU4XLineSegmenter_segment_utf16(_underlying, inputSlice._bytes, inputSlice._length); alloc.releaseAll(); return LineBreakIteratorUtf16._(result); } // ignore: non_constant_identifier_names - static final _ICU4XLineSegmenter_segment_utf16 = _capi< - ffi.NativeFunction< - ffi.Pointer Function( - ffi.Pointer, - ffi.Pointer, - ffi.Size)>>('ICU4XLineSegmenter_segment_utf16') - .asFunction< - ffi.Pointer Function(ffi.Pointer, - ffi.Pointer, int)>(isLeaf: true); + static final _ICU4XLineSegmenter_segment_utf16 = + _capi Function(ffi.Pointer, ffi.Pointer, ffi.Size)>>('ICU4XLineSegmenter_segment_utf16') + .asFunction Function(ffi.Pointer, ffi.Pointer, int)>(isLeaf: true); /// Segments a Latin-1 string. /// @@ -210,21 +169,13 @@ final class LineSegmenter implements ffi.Finalizable { LineBreakIteratorLatin1 segmentLatin1(Uint8List input) { final alloc = ffi2.Arena(); final inputSlice = _SliceFfiUint8._fromDart(input, alloc); - - final result = _ICU4XLineSegmenter_segment_latin1( - _underlying, inputSlice._bytes, inputSlice._length); + final result = _ICU4XLineSegmenter_segment_latin1(_underlying, inputSlice._bytes, inputSlice._length); alloc.releaseAll(); return LineBreakIteratorLatin1._(result); } // ignore: non_constant_identifier_names - static final _ICU4XLineSegmenter_segment_latin1 = _capi< - ffi.NativeFunction< - ffi.Pointer Function( - ffi.Pointer, - ffi.Pointer, - ffi.Size)>>('ICU4XLineSegmenter_segment_latin1') - .asFunction< - ffi.Pointer Function(ffi.Pointer, - ffi.Pointer, int)>(isLeaf: true); + static final _ICU4XLineSegmenter_segment_latin1 = + _capi Function(ffi.Pointer, ffi.Pointer, ffi.Size)>>('ICU4XLineSegmenter_segment_latin1') + .asFunction Function(ffi.Pointer, ffi.Pointer, int)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/List.g.dart b/ffi/capi/dart/package/lib/src/List.g.dart index 802dab7a157..45096e7bd8a 100644 --- a/ffi/capi/dart/package/lib/src/List.g.dart +++ b/ffi/capi/dart/package/lib/src/List.g.dart @@ -20,11 +20,11 @@ final class List implements ffi.Finalizable { final result = _ICU4XList_create(); return List._(result); } + // ignore: non_constant_identifier_names static final _ICU4XList_create = - _capi Function()>>( - 'ICU4XList_create') - .asFunction Function()>(isLeaf: true); + _capi Function()>>('ICU4XList_create') + .asFunction Function()>(isLeaf: true); /// Create a new list of strings with preallocated space to hold /// at least `capacity` elements @@ -32,11 +32,11 @@ final class List implements ffi.Finalizable { final result = _ICU4XList_create_with_capacity(capacity); return List._(result); } + // ignore: non_constant_identifier_names static final _ICU4XList_create_with_capacity = - _capi Function(ffi.Size)>>( - 'ICU4XList_create_with_capacity') - .asFunction Function(int)>(isLeaf: true); + _capi Function(ffi.Size)>>('ICU4XList_create_with_capacity') + .asFunction Function(int)>(isLeaf: true); /// Push a string to the list /// @@ -45,19 +45,14 @@ final class List implements ffi.Finalizable { void push(String val) { final alloc = ffi2.Arena(); final valSlice = _SliceFfi2Utf8._fromDart(val, alloc); - _ICU4XList_push(_underlying, valSlice._bytes, valSlice._length); alloc.releaseAll(); } // ignore: non_constant_identifier_names - static final _ICU4XList_push = _capi< - ffi.NativeFunction< - ffi.Void Function(ffi.Pointer, ffi.Pointer, - ffi.Size)>>('ICU4XList_push') - .asFunction< - void Function(ffi.Pointer, ffi.Pointer, - int)>(isLeaf: true); + static final _ICU4XList_push = + _capi, ffi.Pointer, ffi.Size)>>('ICU4XList_push') + .asFunction, ffi.Pointer, int)>(isLeaf: true); /// The number of elements in this list int get length { @@ -67,7 +62,6 @@ final class List implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XList_len = - _capi)>>( - 'ICU4XList_len') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XList_len') + .asFunction)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/ListFormatter.g.dart b/ffi/capi/dart/package/lib/src/ListFormatter.g.dart index f8273092e51..3b18137755b 100644 --- a/ffi/capi/dart/package/lib/src/ListFormatter.g.dart +++ b/ffi/capi/dart/package/lib/src/ListFormatter.g.dart @@ -13,91 +13,68 @@ final class ListFormatter implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XListFormatter_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XListFormatter_destroy')); /// Construct a new ICU4XListFormatter instance for And patterns /// /// See the [Rust documentation for `try_new_and_with_length`](https://docs.rs/icu/latest/icu/list/struct.ListFormatter.html#method.try_new_and_with_length) for more information. /// /// Throws [Error] on failure. - factory ListFormatter.andWithLength( - DataProvider provider, Locale locale, ListLength length) { - final result = _ICU4XListFormatter_create_and_with_length( - provider._underlying, locale._underlying, length.index); + factory ListFormatter.andWithLength(DataProvider provider, Locale locale, ListLength length) { + final result = _ICU4XListFormatter_create_and_with_length(provider._underlying, locale._underlying, length.index); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return ListFormatter._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XListFormatter_create_and_with_length = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer, - ffi.Pointer, - ffi.Int32)>>('ICU4XListFormatter_create_and_with_length') - .asFunction< - _ResultOpaqueInt32 Function(ffi.Pointer, - ffi.Pointer, int)>(isLeaf: true); + static final _ICU4XListFormatter_create_and_with_length = + _capi, ffi.Pointer, ffi.Int32)>>('ICU4XListFormatter_create_and_with_length') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer, ffi.Pointer, int)>(isLeaf: true); /// Construct a new ICU4XListFormatter instance for And patterns /// /// See the [Rust documentation for `try_new_or_with_length`](https://docs.rs/icu/latest/icu/list/struct.ListFormatter.html#method.try_new_or_with_length) for more information. /// /// Throws [Error] on failure. - factory ListFormatter.orWithLength( - DataProvider provider, Locale locale, ListLength length) { - final result = _ICU4XListFormatter_create_or_with_length( - provider._underlying, locale._underlying, length.index); + factory ListFormatter.orWithLength(DataProvider provider, Locale locale, ListLength length) { + final result = _ICU4XListFormatter_create_or_with_length(provider._underlying, locale._underlying, length.index); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return ListFormatter._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XListFormatter_create_or_with_length = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer, - ffi.Pointer, - ffi.Int32)>>('ICU4XListFormatter_create_or_with_length') - .asFunction< - _ResultOpaqueInt32 Function(ffi.Pointer, - ffi.Pointer, int)>(isLeaf: true); + static final _ICU4XListFormatter_create_or_with_length = + _capi, ffi.Pointer, ffi.Int32)>>('ICU4XListFormatter_create_or_with_length') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer, ffi.Pointer, int)>(isLeaf: true); /// Construct a new ICU4XListFormatter instance for And patterns /// /// See the [Rust documentation for `try_new_unit_with_length`](https://docs.rs/icu/latest/icu/list/struct.ListFormatter.html#method.try_new_unit_with_length) for more information. /// /// Throws [Error] on failure. - factory ListFormatter.unitWithLength( - DataProvider provider, Locale locale, ListLength length) { - final result = _ICU4XListFormatter_create_unit_with_length( - provider._underlying, locale._underlying, length.index); + factory ListFormatter.unitWithLength(DataProvider provider, Locale locale, ListLength length) { + final result = _ICU4XListFormatter_create_unit_with_length(provider._underlying, locale._underlying, length.index); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return ListFormatter._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XListFormatter_create_unit_with_length = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer, - ffi.Pointer, - ffi.Int32)>>('ICU4XListFormatter_create_unit_with_length') - .asFunction< - _ResultOpaqueInt32 Function(ffi.Pointer, - ffi.Pointer, int)>(isLeaf: true); + static final _ICU4XListFormatter_create_unit_with_length = + _capi, ffi.Pointer, ffi.Int32)>>('ICU4XListFormatter_create_unit_with_length') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer, ffi.Pointer, int)>(isLeaf: true); /// See the [Rust documentation for `format`](https://docs.rs/icu/latest/icu/list/struct.ListFormatter.html#method.format) for more information. /// /// Throws [Error] on failure. String format(List list) { final writeable = _Writeable(); - final result = _ICU4XListFormatter_format( - _underlying, list._underlying, writeable._underlying); + final result = _ICU4XListFormatter_format(_underlying, list._underlying, writeable._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } @@ -105,13 +82,7 @@ final class ListFormatter implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XListFormatter_format = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function( - ffi.Pointer, - ffi.Pointer, - ffi.Pointer)>>('ICU4XListFormatter_format') - .asFunction< - _ResultVoidInt32 Function(ffi.Pointer, - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XListFormatter_format = + _capi, ffi.Pointer, ffi.Pointer)>>('ICU4XListFormatter_format') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer, ffi.Pointer)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/ListLength.g.dart b/ffi/capi/dart/package/lib/src/ListLength.g.dart index 4725c07f770..c97bbc771c4 100644 --- a/ffi/capi/dart/package/lib/src/ListLength.g.dart +++ b/ffi/capi/dart/package/lib/src/ListLength.g.dart @@ -8,6 +8,8 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `ListLength`](https://docs.rs/icu/latest/icu/list/enum.ListLength.html) for more information. enum ListLength { wide, + short, + narrow; } diff --git a/ffi/capi/dart/package/lib/src/Locale.g.dart b/ffi/capi/dart/package/lib/src/Locale.g.dart index 563fd6c4491..bd3f096e496 100644 --- a/ffi/capi/dart/package/lib/src/Locale.g.dart +++ b/ffi/capi/dart/package/lib/src/Locale.g.dart @@ -29,22 +29,18 @@ final class Locale implements ffi.Finalizable { factory Locale.fromString(String name) { final alloc = ffi2.Arena(); final nameSlice = _SliceFfi2Utf8._fromDart(name, alloc); - - final result = - _ICU4XLocale_create_from_string(nameSlice._bytes, nameSlice._length); + final result = _ICU4XLocale_create_from_string(nameSlice._bytes, nameSlice._length); alloc.releaseAll(); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return Locale._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XLocale_create_from_string = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer, - ffi.Size)>>('ICU4XLocale_create_from_string') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer, int)>( - isLeaf: true); + static final _ICU4XLocale_create_from_string = + _capi, ffi.Size)>>('ICU4XLocale_create_from_string') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer, int)>(isLeaf: true); /// Construct a default undefined [`Locale`] "und". /// @@ -53,11 +49,11 @@ final class Locale implements ffi.Finalizable { final result = _ICU4XLocale_create_und(); return Locale._(result); } + // ignore: non_constant_identifier_names static final _ICU4XLocale_create_und = - _capi Function()>>( - 'ICU4XLocale_create_und') - .asFunction Function()>(isLeaf: true); + _capi Function()>>('ICU4XLocale_create_und') + .asFunction Function()>(isLeaf: true); /// Clones the [`Locale`]. /// @@ -68,12 +64,9 @@ final class Locale implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XLocale_clone = _capi< - ffi.NativeFunction< - ffi.Pointer Function( - ffi.Pointer)>>('ICU4XLocale_clone') - .asFunction Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XLocale_clone = + _capi Function(ffi.Pointer)>>('ICU4XLocale_clone') + .asFunction Function(ffi.Pointer)>(isLeaf: true); /// Write a string representation of the `LanguageIdentifier` part of /// [`Locale`] to `write`. @@ -91,13 +84,9 @@ final class Locale implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XLocale_basename = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function(ffi.Pointer, - ffi.Pointer)>>('ICU4XLocale_basename') - .asFunction< - _ResultVoidInt32 Function( - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XLocale_basename = + _capi, ffi.Pointer)>>('ICU4XLocale_basename') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer)>(isLeaf: true); /// Write a string representation of the unicode extension to `write` /// @@ -107,10 +96,8 @@ final class Locale implements ffi.Finalizable { String getUnicodeExtension(String bytes) { final alloc = ffi2.Arena(); final bytesSlice = _SliceFfi2Utf8._fromDart(bytes, alloc); - final writeable = _Writeable(); - final result = _ICU4XLocale_get_unicode_extension(_underlying, - bytesSlice._bytes, bytesSlice._length, writeable._underlying); + final result = _ICU4XLocale_get_unicode_extension(_underlying, bytesSlice._bytes, bytesSlice._length, writeable._underlying); alloc.releaseAll(); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); @@ -119,20 +106,9 @@ final class Locale implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XLocale_get_unicode_extension = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function( - ffi.Pointer, - ffi.Pointer, - ffi.Size, - ffi.Pointer)>>( - 'ICU4XLocale_get_unicode_extension') - .asFunction< - _ResultVoidInt32 Function( - ffi.Pointer, - ffi.Pointer, - int, - ffi.Pointer)>(isLeaf: true); + static final _ICU4XLocale_get_unicode_extension = + _capi, ffi.Pointer, ffi.Size, ffi.Pointer)>>('ICU4XLocale_get_unicode_extension') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer, int, ffi.Pointer)>(isLeaf: true); /// Write a string representation of [`Locale`] language to `write` /// @@ -149,13 +125,9 @@ final class Locale implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XLocale_language = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function(ffi.Pointer, - ffi.Pointer)>>('ICU4XLocale_language') - .asFunction< - _ResultVoidInt32 Function( - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XLocale_language = + _capi, ffi.Pointer)>>('ICU4XLocale_language') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer)>(isLeaf: true); /// Set the language part of the [`Locale`]. /// @@ -165,9 +137,7 @@ final class Locale implements ffi.Finalizable { set language(String bytes) { final alloc = ffi2.Arena(); final bytesSlice = _SliceFfi2Utf8._fromDart(bytes, alloc); - - final result = _ICU4XLocale_set_language( - _underlying, bytesSlice._bytes, bytesSlice._length); + final result = _ICU4XLocale_set_language(_underlying, bytesSlice._bytes, bytesSlice._length); alloc.releaseAll(); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); @@ -175,15 +145,9 @@ final class Locale implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XLocale_set_language = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function( - ffi.Pointer, - ffi.Pointer, - ffi.Size)>>('ICU4XLocale_set_language') - .asFunction< - _ResultVoidInt32 Function(ffi.Pointer, - ffi.Pointer, int)>(isLeaf: true); + static final _ICU4XLocale_set_language = + _capi, ffi.Pointer, ffi.Size)>>('ICU4XLocale_set_language') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer, int)>(isLeaf: true); /// Write a string representation of [`Locale`] region to `write` /// @@ -200,13 +164,9 @@ final class Locale implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XLocale_region = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function(ffi.Pointer, - ffi.Pointer)>>('ICU4XLocale_region') - .asFunction< - _ResultVoidInt32 Function( - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XLocale_region = + _capi, ffi.Pointer)>>('ICU4XLocale_region') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer)>(isLeaf: true); /// Set the region part of the [`Locale`]. /// @@ -216,9 +176,7 @@ final class Locale implements ffi.Finalizable { set region(String bytes) { final alloc = ffi2.Arena(); final bytesSlice = _SliceFfi2Utf8._fromDart(bytes, alloc); - - final result = _ICU4XLocale_set_region( - _underlying, bytesSlice._bytes, bytesSlice._length); + final result = _ICU4XLocale_set_region(_underlying, bytesSlice._bytes, bytesSlice._length); alloc.releaseAll(); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); @@ -226,13 +184,9 @@ final class Locale implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XLocale_set_region = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function(ffi.Pointer, - ffi.Pointer, ffi.Size)>>('ICU4XLocale_set_region') - .asFunction< - _ResultVoidInt32 Function(ffi.Pointer, - ffi.Pointer, int)>(isLeaf: true); + static final _ICU4XLocale_set_region = + _capi, ffi.Pointer, ffi.Size)>>('ICU4XLocale_set_region') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer, int)>(isLeaf: true); /// Write a string representation of [`Locale`] script to `write` /// @@ -249,13 +203,9 @@ final class Locale implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XLocale_script = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function(ffi.Pointer, - ffi.Pointer)>>('ICU4XLocale_script') - .asFunction< - _ResultVoidInt32 Function( - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XLocale_script = + _capi, ffi.Pointer)>>('ICU4XLocale_script') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer)>(isLeaf: true); /// Set the script part of the [`Locale`]. Pass an empty string to remove the script. /// @@ -265,9 +215,7 @@ final class Locale implements ffi.Finalizable { set script(String bytes) { final alloc = ffi2.Arena(); final bytesSlice = _SliceFfi2Utf8._fromDart(bytes, alloc); - - final result = _ICU4XLocale_set_script( - _underlying, bytesSlice._bytes, bytesSlice._length); + final result = _ICU4XLocale_set_script(_underlying, bytesSlice._bytes, bytesSlice._length); alloc.releaseAll(); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); @@ -275,13 +223,9 @@ final class Locale implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XLocale_set_script = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function(ffi.Pointer, - ffi.Pointer, ffi.Size)>>('ICU4XLocale_set_script') - .asFunction< - _ResultVoidInt32 Function(ffi.Pointer, - ffi.Pointer, int)>(isLeaf: true); + static final _ICU4XLocale_set_script = + _capi, ffi.Pointer, ffi.Size)>>('ICU4XLocale_set_script') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer, int)>(isLeaf: true); /// Best effort locale canonicalizer that doesn't need any data /// @@ -293,10 +237,8 @@ final class Locale implements ffi.Finalizable { static String canonicalize(String bytes) { final alloc = ffi2.Arena(); final bytesSlice = _SliceFfi2Utf8._fromDart(bytes, alloc); - final writeable = _Writeable(); - final result = _ICU4XLocale_canonicalize( - bytesSlice._bytes, bytesSlice._length, writeable._underlying); + final result = _ICU4XLocale_canonicalize(bytesSlice._bytes, bytesSlice._length, writeable._underlying); alloc.releaseAll(); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); @@ -305,13 +247,9 @@ final class Locale implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XLocale_canonicalize = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function(ffi.Pointer, ffi.Size, - ffi.Pointer)>>('ICU4XLocale_canonicalize') - .asFunction< - _ResultVoidInt32 Function(ffi.Pointer, int, - ffi.Pointer)>(isLeaf: true); + static final _ICU4XLocale_canonicalize = + _capi, ffi.Size, ffi.Pointer)>>('ICU4XLocale_canonicalize') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, int, ffi.Pointer)>(isLeaf: true); /// Write a string representation of [`Locale`] to `write` /// @@ -329,51 +267,35 @@ final class Locale implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XLocale_to_string = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function(ffi.Pointer, - ffi.Pointer)>>('ICU4XLocale_to_string') - .asFunction< - _ResultVoidInt32 Function( - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XLocale_to_string = + _capi, ffi.Pointer)>>('ICU4XLocale_to_string') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `normalizing_eq`](https://docs.rs/icu/latest/icu/locid/struct.Locale.html#method.normalizing_eq) for more information. bool normalizingEq(String other) { final alloc = ffi2.Arena(); final otherSlice = _SliceFfi2Utf8._fromDart(other, alloc); - - final result = _ICU4XLocale_normalizing_eq( - _underlying, otherSlice._bytes, otherSlice._length); + final result = _ICU4XLocale_normalizing_eq(_underlying, otherSlice._bytes, otherSlice._length); alloc.releaseAll(); return result; } // ignore: non_constant_identifier_names - static final _ICU4XLocale_normalizing_eq = _capi< - ffi.NativeFunction< - ffi.Bool Function(ffi.Pointer, ffi.Pointer, - ffi.Size)>>('ICU4XLocale_normalizing_eq') - .asFunction< - bool Function(ffi.Pointer, ffi.Pointer, - int)>(isLeaf: true); + static final _ICU4XLocale_normalizing_eq = + _capi, ffi.Pointer, ffi.Size)>>('ICU4XLocale_normalizing_eq') + .asFunction, ffi.Pointer, int)>(isLeaf: true); /// See the [Rust documentation for `strict_cmp`](https://docs.rs/icu/latest/icu/locid/struct.Locale.html#method.strict_cmp) for more information. Ordering strictCmp(String other) { final alloc = ffi2.Arena(); final otherSlice = _SliceFfi2Utf8._fromDart(other, alloc); - - final result = _ICU4XLocale_strict_cmp( - _underlying, otherSlice._bytes, otherSlice._length); + final result = _ICU4XLocale_strict_cmp(_underlying, otherSlice._bytes, otherSlice._length); alloc.releaseAll(); return Ordering.values.firstWhere((v) => v._underlying == result); } // ignore: non_constant_identifier_names - static final _ICU4XLocale_strict_cmp = _capi< - ffi.NativeFunction< - ffi.Int32 Function(ffi.Pointer, - ffi.Pointer, ffi.Size)>>('ICU4XLocale_strict_cmp') - .asFunction< - int Function(ffi.Pointer, ffi.Pointer, - int)>(isLeaf: true); + static final _ICU4XLocale_strict_cmp = + _capi, ffi.Pointer, ffi.Size)>>('ICU4XLocale_strict_cmp') + .asFunction, ffi.Pointer, int)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/LocaleCanonicalizer.g.dart b/ffi/capi/dart/package/lib/src/LocaleCanonicalizer.g.dart index 5c7cae7e872..9dcef698ccc 100644 --- a/ffi/capi/dart/package/lib/src/LocaleCanonicalizer.g.dart +++ b/ffi/capi/dart/package/lib/src/LocaleCanonicalizer.g.dart @@ -15,8 +15,7 @@ final class LocaleCanonicalizer implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XLocaleCanonicalizer_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XLocaleCanonicalizer_destroy')); /// Create a new [`LocaleCanonicalizer`]. /// @@ -30,13 +29,11 @@ final class LocaleCanonicalizer implements ffi.Finalizable { } return LocaleCanonicalizer._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XLocaleCanonicalizer_create = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer)>>('ICU4XLocaleCanonicalizer_create') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XLocaleCanonicalizer_create = + _capi)>>('ICU4XLocaleCanonicalizer_create') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// Create a new [`LocaleCanonicalizer`] with extended data. /// @@ -44,37 +41,28 @@ final class LocaleCanonicalizer implements ffi.Finalizable { /// /// Throws [Error] on failure. factory LocaleCanonicalizer.extended(DataProvider provider) { - final result = - _ICU4XLocaleCanonicalizer_create_extended(provider._underlying); + final result = _ICU4XLocaleCanonicalizer_create_extended(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return LocaleCanonicalizer._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XLocaleCanonicalizer_create_extended = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XLocaleCanonicalizer_create_extended') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XLocaleCanonicalizer_create_extended = + _capi)>>('ICU4XLocaleCanonicalizer_create_extended') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// FFI version of `LocaleCanonicalizer::canonicalize()`. /// /// See the [Rust documentation for `canonicalize`](https://docs.rs/icu/latest/icu/locid_transform/struct.LocaleCanonicalizer.html#method.canonicalize) for more information. TransformResult canonicalize(Locale locale) { - final result = - _ICU4XLocaleCanonicalizer_canonicalize(_underlying, locale._underlying); + final result = _ICU4XLocaleCanonicalizer_canonicalize(_underlying, locale._underlying); return TransformResult.values[result]; } // ignore: non_constant_identifier_names - static final _ICU4XLocaleCanonicalizer_canonicalize = _capi< - ffi.NativeFunction< - ffi.Int32 Function( - ffi.Pointer, ffi.Pointer)>>( - 'ICU4XLocaleCanonicalizer_canonicalize') - .asFunction< - int Function( - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XLocaleCanonicalizer_canonicalize = + _capi, ffi.Pointer)>>('ICU4XLocaleCanonicalizer_canonicalize') + .asFunction, ffi.Pointer)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/LocaleDirection.g.dart b/ffi/capi/dart/package/lib/src/LocaleDirection.g.dart index d11e2904b6c..338eae42d8f 100644 --- a/ffi/capi/dart/package/lib/src/LocaleDirection.g.dart +++ b/ffi/capi/dart/package/lib/src/LocaleDirection.g.dart @@ -8,6 +8,8 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `Direction`](https://docs.rs/icu/latest/icu/locid_transform/enum.Direction.html) for more information. enum LocaleDirection { leftToRight, + rightToLeft, + unknown; } diff --git a/ffi/capi/dart/package/lib/src/LocaleDirectionality.g.dart b/ffi/capi/dart/package/lib/src/LocaleDirectionality.g.dart index d154558b77e..097f993c333 100644 --- a/ffi/capi/dart/package/lib/src/LocaleDirectionality.g.dart +++ b/ffi/capi/dart/package/lib/src/LocaleDirectionality.g.dart @@ -13,8 +13,7 @@ final class LocaleDirectionality implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XLocaleDirectionality_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XLocaleDirectionality_destroy')); /// Construct a new ICU4XLocaleDirectionality instance /// @@ -28,85 +27,60 @@ final class LocaleDirectionality implements ffi.Finalizable { } return LocaleDirectionality._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XLocaleDirectionality_create = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer)>>('ICU4XLocaleDirectionality_create') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XLocaleDirectionality_create = + _capi)>>('ICU4XLocaleDirectionality_create') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// Construct a new ICU4XLocaleDirectionality instance with a custom expander /// /// See the [Rust documentation for `new_with_expander`](https://docs.rs/icu/latest/icu/locid_transform/struct.LocaleDirectionality.html#method.new_with_expander) for more information. /// /// Throws [Error] on failure. - factory LocaleDirectionality.withExpander( - DataProvider provider, LocaleExpander expander) { - final result = _ICU4XLocaleDirectionality_create_with_expander( - provider._underlying, expander._underlying); + factory LocaleDirectionality.withExpander(DataProvider provider, LocaleExpander expander) { + final result = _ICU4XLocaleDirectionality_create_with_expander(provider._underlying, expander._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return LocaleDirectionality._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XLocaleDirectionality_create_with_expander = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer, ffi.Pointer)>>( - 'ICU4XLocaleDirectionality_create_with_expander') - .asFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XLocaleDirectionality_create_with_expander = + _capi, ffi.Pointer)>>('ICU4XLocaleDirectionality_create_with_expander') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer, ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `get`](https://docs.rs/icu/latest/icu/locid_transform/struct.LocaleDirectionality.html#method.get) for more information. LocaleDirection operator [](Locale locale) { - final result = - _ICU4XLocaleDirectionality_get(_underlying, locale._underlying); + final result = _ICU4XLocaleDirectionality_get(_underlying, locale._underlying); return LocaleDirection.values[result]; } // ignore: non_constant_identifier_names - static final _ICU4XLocaleDirectionality_get = _capi< - ffi.NativeFunction< - ffi.Int32 Function(ffi.Pointer, - ffi.Pointer)>>('ICU4XLocaleDirectionality_get') - .asFunction< - int Function( - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XLocaleDirectionality_get = + _capi, ffi.Pointer)>>('ICU4XLocaleDirectionality_get') + .asFunction, ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `is_left_to_right`](https://docs.rs/icu/latest/icu/locid_transform/struct.LocaleDirectionality.html#method.is_left_to_right) for more information. bool isLeftToRight(Locale locale) { - final result = _ICU4XLocaleDirectionality_is_left_to_right( - _underlying, locale._underlying); + final result = _ICU4XLocaleDirectionality_is_left_to_right(_underlying, locale._underlying); return result; } // ignore: non_constant_identifier_names - static final _ICU4XLocaleDirectionality_is_left_to_right = _capi< - ffi.NativeFunction< - ffi.Bool Function( - ffi.Pointer, ffi.Pointer)>>( - 'ICU4XLocaleDirectionality_is_left_to_right') - .asFunction< - bool Function( - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XLocaleDirectionality_is_left_to_right = + _capi, ffi.Pointer)>>('ICU4XLocaleDirectionality_is_left_to_right') + .asFunction, ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `is_right_to_left`](https://docs.rs/icu/latest/icu/locid_transform/struct.LocaleDirectionality.html#method.is_right_to_left) for more information. bool isRightToLeft(Locale locale) { - final result = _ICU4XLocaleDirectionality_is_right_to_left( - _underlying, locale._underlying); + final result = _ICU4XLocaleDirectionality_is_right_to_left(_underlying, locale._underlying); return result; } // ignore: non_constant_identifier_names - static final _ICU4XLocaleDirectionality_is_right_to_left = _capi< - ffi.NativeFunction< - ffi.Bool Function( - ffi.Pointer, ffi.Pointer)>>( - 'ICU4XLocaleDirectionality_is_right_to_left') - .asFunction< - bool Function( - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XLocaleDirectionality_is_right_to_left = + _capi, ffi.Pointer)>>('ICU4XLocaleDirectionality_is_right_to_left') + .asFunction, ffi.Pointer)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/LocaleDisplayNamesFormatter.g.dart b/ffi/capi/dart/package/lib/src/LocaleDisplayNamesFormatter.g.dart index 5b6a89cf95f..31c9699c356 100644 --- a/ffi/capi/dart/package/lib/src/LocaleDisplayNamesFormatter.g.dart +++ b/ffi/capi/dart/package/lib/src/LocaleDisplayNamesFormatter.g.dart @@ -13,34 +13,25 @@ final class LocaleDisplayNamesFormatter implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XLocaleDisplayNamesFormatter_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XLocaleDisplayNamesFormatter_destroy')); /// Creates a new `LocaleDisplayNamesFormatter` from locale data and an options bag. /// /// See the [Rust documentation for `try_new`](https://docs.rs/icu/latest/icu/displaynames/struct.LocaleDisplayNamesFormatter.html#method.try_new) for more information. /// /// Throws [Error] on failure. - factory LocaleDisplayNamesFormatter( - DataProvider provider, Locale locale, DisplayNamesOptionsV1 options) { - final result = _ICU4XLocaleDisplayNamesFormatter_create( - provider._underlying, locale._underlying, options._underlying); + factory LocaleDisplayNamesFormatter(DataProvider provider, Locale locale, DisplayNamesOptionsV1 options) { + final result = _ICU4XLocaleDisplayNamesFormatter_create(provider._underlying, locale._underlying, options._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return LocaleDisplayNamesFormatter._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XLocaleDisplayNamesFormatter_create = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer, - ffi.Pointer, _DisplayNamesOptionsV1Ffi)>>( - 'ICU4XLocaleDisplayNamesFormatter_create') - .asFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer, - ffi.Pointer, - _DisplayNamesOptionsV1Ffi)>(isLeaf: true); + static final _ICU4XLocaleDisplayNamesFormatter_create = + _capi, ffi.Pointer, _DisplayNamesOptionsV1Ffi)>>('ICU4XLocaleDisplayNamesFormatter_create') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer, ffi.Pointer, _DisplayNamesOptionsV1Ffi)>(isLeaf: true); /// Returns the locale-specific display name of a locale. /// @@ -49,8 +40,7 @@ final class LocaleDisplayNamesFormatter implements ffi.Finalizable { /// Throws [Error] on failure. String of(Locale locale) { final writeable = _Writeable(); - final result = _ICU4XLocaleDisplayNamesFormatter_of( - _underlying, locale._underlying, writeable._underlying); + final result = _ICU4XLocaleDisplayNamesFormatter_of(_underlying, locale._underlying, writeable._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } @@ -58,12 +48,7 @@ final class LocaleDisplayNamesFormatter implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XLocaleDisplayNamesFormatter_of = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function(ffi.Pointer, - ffi.Pointer, ffi.Pointer)>>( - 'ICU4XLocaleDisplayNamesFormatter_of') - .asFunction< - _ResultVoidInt32 Function(ffi.Pointer, - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XLocaleDisplayNamesFormatter_of = + _capi, ffi.Pointer, ffi.Pointer)>>('ICU4XLocaleDisplayNamesFormatter_of') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer, ffi.Pointer)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/LocaleExpander.g.dart b/ffi/capi/dart/package/lib/src/LocaleExpander.g.dart index 1aa2fcc2479..5652b2fc399 100644 --- a/ffi/capi/dart/package/lib/src/LocaleExpander.g.dart +++ b/ffi/capi/dart/package/lib/src/LocaleExpander.g.dart @@ -15,8 +15,7 @@ final class LocaleExpander implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XLocaleExpander_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XLocaleExpander_destroy')); /// Create a new [`LocaleExpander`]. /// @@ -30,13 +29,11 @@ final class LocaleExpander implements ffi.Finalizable { } return LocaleExpander._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XLocaleExpander_create = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer)>>('ICU4XLocaleExpander_create') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XLocaleExpander_create = + _capi)>>('ICU4XLocaleExpander_create') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// Create a new [`LocaleExpander`] with extended data. /// @@ -50,47 +47,35 @@ final class LocaleExpander implements ffi.Finalizable { } return LocaleExpander._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XLocaleExpander_create_extended = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XLocaleExpander_create_extended') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XLocaleExpander_create_extended = + _capi)>>('ICU4XLocaleExpander_create_extended') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// FFI version of `LocaleExpander::maximize()`. /// /// See the [Rust documentation for `maximize`](https://docs.rs/icu/latest/icu/locid_transform/struct.LocaleExpander.html#method.maximize) for more information. TransformResult maximize(Locale locale) { - final result = - _ICU4XLocaleExpander_maximize(_underlying, locale._underlying); + final result = _ICU4XLocaleExpander_maximize(_underlying, locale._underlying); return TransformResult.values[result]; } // ignore: non_constant_identifier_names - static final _ICU4XLocaleExpander_maximize = _capi< - ffi.NativeFunction< - ffi.Int32 Function(ffi.Pointer, - ffi.Pointer)>>('ICU4XLocaleExpander_maximize') - .asFunction< - int Function( - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XLocaleExpander_maximize = + _capi, ffi.Pointer)>>('ICU4XLocaleExpander_maximize') + .asFunction, ffi.Pointer)>(isLeaf: true); /// FFI version of `LocaleExpander::minimize()`. /// /// See the [Rust documentation for `minimize`](https://docs.rs/icu/latest/icu/locid_transform/struct.LocaleExpander.html#method.minimize) for more information. TransformResult minimize(Locale locale) { - final result = - _ICU4XLocaleExpander_minimize(_underlying, locale._underlying); + final result = _ICU4XLocaleExpander_minimize(_underlying, locale._underlying); return TransformResult.values[result]; } // ignore: non_constant_identifier_names - static final _ICU4XLocaleExpander_minimize = _capi< - ffi.NativeFunction< - ffi.Int32 Function(ffi.Pointer, - ffi.Pointer)>>('ICU4XLocaleExpander_minimize') - .asFunction< - int Function( - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XLocaleExpander_minimize = + _capi, ffi.Pointer)>>('ICU4XLocaleExpander_minimize') + .asFunction, ffi.Pointer)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/LocaleFallbackConfig.g.dart b/ffi/capi/dart/package/lib/src/LocaleFallbackConfig.g.dart index 36e29898e19..9af1500c61e 100644 --- a/ffi/capi/dart/package/lib/src/LocaleFallbackConfig.g.dart +++ b/ffi/capi/dart/package/lib/src/LocaleFallbackConfig.g.dart @@ -29,8 +29,7 @@ final class LocaleFallbackConfig { return result; } - LocaleFallbackPriority get priority => - LocaleFallbackPriority.values[_underlying.priority]; + LocaleFallbackPriority get priority => LocaleFallbackPriority.values[_underlying.priority]; set priority(LocaleFallbackPriority priority) { _underlying.priority = priority.index; } @@ -43,8 +42,7 @@ final class LocaleFallbackConfig { _underlying.extensionKey = extensionKeySlice; } - LocaleFallbackSupplement get fallbackSupplement => - LocaleFallbackSupplement.values[_underlying.fallbackSupplement]; + LocaleFallbackSupplement get fallbackSupplement => LocaleFallbackSupplement.values[_underlying.fallbackSupplement]; set fallbackSupplement(LocaleFallbackSupplement fallbackSupplement) { _underlying.fallbackSupplement = fallbackSupplement.index; } diff --git a/ffi/capi/dart/package/lib/src/LocaleFallbackIterator.g.dart b/ffi/capi/dart/package/lib/src/LocaleFallbackIterator.g.dart index 9080a6e34e1..a5ca6e36d49 100644 --- a/ffi/capi/dart/package/lib/src/LocaleFallbackIterator.g.dart +++ b/ffi/capi/dart/package/lib/src/LocaleFallbackIterator.g.dart @@ -15,8 +15,7 @@ final class LocaleFallbackIterator implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XLocaleFallbackIterator_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XLocaleFallbackIterator_destroy')); /// Gets a snapshot of the current state of the locale. /// @@ -27,12 +26,9 @@ final class LocaleFallbackIterator implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XLocaleFallbackIterator_get = _capi< - ffi.NativeFunction< - ffi.Pointer Function( - ffi.Pointer)>>('ICU4XLocaleFallbackIterator_get') - .asFunction Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XLocaleFallbackIterator_get = + _capi Function(ffi.Pointer)>>('ICU4XLocaleFallbackIterator_get') + .asFunction Function(ffi.Pointer)>(isLeaf: true); /// Performs one step of the fallback algorithm, mutating the locale. /// @@ -43,7 +39,6 @@ final class LocaleFallbackIterator implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XLocaleFallbackIterator_step = - _capi)>>( - 'ICU4XLocaleFallbackIterator_step') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XLocaleFallbackIterator_step') + .asFunction)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/LocaleFallbackPriority.g.dart b/ffi/capi/dart/package/lib/src/LocaleFallbackPriority.g.dart index fbfe5c5a5f2..3f617bae44c 100644 --- a/ffi/capi/dart/package/lib/src/LocaleFallbackPriority.g.dart +++ b/ffi/capi/dart/package/lib/src/LocaleFallbackPriority.g.dart @@ -10,6 +10,8 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `LocaleFallbackPriority`](https://docs.rs/icu/latest/icu/locid_transform/fallback/enum.LocaleFallbackPriority.html) for more information. enum LocaleFallbackPriority { language, + region, + collation; } diff --git a/ffi/capi/dart/package/lib/src/LocaleFallbackSupplement.g.dart b/ffi/capi/dart/package/lib/src/LocaleFallbackSupplement.g.dart index a82a02685f6..e72e7e5c262 100644 --- a/ffi/capi/dart/package/lib/src/LocaleFallbackSupplement.g.dart +++ b/ffi/capi/dart/package/lib/src/LocaleFallbackSupplement.g.dart @@ -10,5 +10,6 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `LocaleFallbackSupplement`](https://docs.rs/icu/latest/icu/locid_transform/fallback/enum.LocaleFallbackSupplement.html) for more information. enum LocaleFallbackSupplement { none, + collation; } diff --git a/ffi/capi/dart/package/lib/src/LocaleFallbacker.g.dart b/ffi/capi/dart/package/lib/src/LocaleFallbacker.g.dart index 4a4b58a422e..e744c4505fc 100644 --- a/ffi/capi/dart/package/lib/src/LocaleFallbacker.g.dart +++ b/ffi/capi/dart/package/lib/src/LocaleFallbacker.g.dart @@ -15,8 +15,7 @@ final class LocaleFallbacker implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XLocaleFallbacker_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XLocaleFallbacker_destroy')); /// Creates a new `LocaleFallbacker` from a data provider. /// @@ -30,13 +29,11 @@ final class LocaleFallbacker implements ffi.Finalizable { } return LocaleFallbacker._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XLocaleFallbacker_create = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer)>>('ICU4XLocaleFallbacker_create') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XLocaleFallbacker_create = + _capi)>>('ICU4XLocaleFallbacker_create') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// Creates a new `LocaleFallbacker` without data for limited functionality. /// @@ -45,11 +42,11 @@ final class LocaleFallbacker implements ffi.Finalizable { final result = _ICU4XLocaleFallbacker_create_without_data(); return LocaleFallbacker._(result); } + // ignore: non_constant_identifier_names static final _ICU4XLocaleFallbacker_create_without_data = - _capi Function()>>( - 'ICU4XLocaleFallbacker_create_without_data') - .asFunction Function()>(isLeaf: true); + _capi Function()>>('ICU4XLocaleFallbacker_create_without_data') + .asFunction Function()>(isLeaf: true); /// Associates this `LocaleFallbacker` with configuration options. /// @@ -57,8 +54,7 @@ final class LocaleFallbacker implements ffi.Finalizable { /// /// Throws [Error] on failure. LocaleFallbackerWithConfig forConfig(LocaleFallbackConfig config) { - final result = - _ICU4XLocaleFallbacker_for_config(_underlying, config._underlying); + final result = _ICU4XLocaleFallbacker_for_config(_underlying, config._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } @@ -66,12 +62,7 @@ final class LocaleFallbacker implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XLocaleFallbacker_for_config = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer, _LocaleFallbackConfigFfi)>>( - 'ICU4XLocaleFallbacker_for_config') - .asFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer, _LocaleFallbackConfigFfi)>(isLeaf: true); + static final _ICU4XLocaleFallbacker_for_config = + _capi, _LocaleFallbackConfigFfi)>>('ICU4XLocaleFallbacker_for_config') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer, _LocaleFallbackConfigFfi)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/LocaleFallbackerWithConfig.g.dart b/ffi/capi/dart/package/lib/src/LocaleFallbackerWithConfig.g.dart index 294109e58f5..03de6083f23 100644 --- a/ffi/capi/dart/package/lib/src/LocaleFallbackerWithConfig.g.dart +++ b/ffi/capi/dart/package/lib/src/LocaleFallbackerWithConfig.g.dart @@ -17,25 +17,18 @@ final class LocaleFallbackerWithConfig implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XLocaleFallbackerWithConfig_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XLocaleFallbackerWithConfig_destroy')); /// Creates an iterator from a locale with each step of fallback. /// /// See the [Rust documentation for `fallback_for`](https://docs.rs/icu/latest/icu/locid_transform/fallback/struct.LocaleFallbacker.html#method.fallback_for) for more information. LocaleFallbackIterator fallbackForLocale(Locale locale) { - final result = _ICU4XLocaleFallbackerWithConfig_fallback_for_locale( - _underlying, locale._underlying); + final result = _ICU4XLocaleFallbackerWithConfig_fallback_for_locale(_underlying, locale._underlying); return LocaleFallbackIterator._(result); } // ignore: non_constant_identifier_names - static final _ICU4XLocaleFallbackerWithConfig_fallback_for_locale = _capi< - ffi.NativeFunction< - ffi.Pointer Function( - ffi.Pointer, ffi.Pointer)>>( - 'ICU4XLocaleFallbackerWithConfig_fallback_for_locale') - .asFunction< - ffi.Pointer Function( - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XLocaleFallbackerWithConfig_fallback_for_locale = + _capi Function(ffi.Pointer, ffi.Pointer)>>('ICU4XLocaleFallbackerWithConfig_fallback_for_locale') + .asFunction Function(ffi.Pointer, ffi.Pointer)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/MetazoneCalculator.g.dart b/ffi/capi/dart/package/lib/src/MetazoneCalculator.g.dart index 29a21a46377..f5be7dcfb54 100644 --- a/ffi/capi/dart/package/lib/src/MetazoneCalculator.g.dart +++ b/ffi/capi/dart/package/lib/src/MetazoneCalculator.g.dart @@ -19,8 +19,7 @@ final class MetazoneCalculator implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XMetazoneCalculator_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XMetazoneCalculator_destroy')); /// See the [Rust documentation for `new`](https://docs.rs/icu/latest/icu/timezone/struct.MetazoneCalculator.html#method.new) for more information. /// @@ -32,11 +31,9 @@ final class MetazoneCalculator implements ffi.Finalizable { } return MetazoneCalculator._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XMetazoneCalculator_create = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer)>>('ICU4XMetazoneCalculator_create') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XMetazoneCalculator_create = + _capi)>>('ICU4XMetazoneCalculator_create') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/Ordering.g.dart b/ffi/capi/dart/package/lib/src/Ordering.g.dart index 5352c70a43f..bfc2c9a418c 100644 --- a/ffi/capi/dart/package/lib/src/Ordering.g.dart +++ b/ffi/capi/dart/package/lib/src/Ordering.g.dart @@ -8,7 +8,9 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `Ordering`](https://docs.rs/core/latest/core/cmp/enum.Ordering.html) for more information. enum Ordering { less, + equal, + greater; int get _underlying { diff --git a/ffi/capi/dart/package/lib/src/PluralCategory.g.dart b/ffi/capi/dart/package/lib/src/PluralCategory.g.dart index d7decf1e6af..8c78801d9bf 100644 --- a/ffi/capi/dart/package/lib/src/PluralCategory.g.dart +++ b/ffi/capi/dart/package/lib/src/PluralCategory.g.dart @@ -10,10 +10,15 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `PluralCategory`](https://docs.rs/icu/latest/icu/plurals/enum.PluralCategory.html) for more information. enum PluralCategory { zero, + one, + two, + few, + many, + other; /// Construct from a string in the format @@ -27,20 +32,16 @@ enum PluralCategory { factory PluralCategory.forCldrString(String s) { final alloc = ffi2.Arena(); final sSlice = _SliceFfi2Utf8._fromDart(s, alloc); - - final result = - _ICU4XPluralCategory_get_for_cldr_string(sSlice._bytes, sSlice._length); + final result = _ICU4XPluralCategory_get_for_cldr_string(sSlice._bytes, sSlice._length); alloc.releaseAll(); if (!result.isOk) { throw VoidError(); } return PluralCategory.values[result.union.ok]; } + // ignore: non_constant_identifier_names - static final _ICU4XPluralCategory_get_for_cldr_string = _capi< - ffi.NativeFunction< - _ResultInt32Void Function(ffi.Pointer, - ffi.Size)>>('ICU4XPluralCategory_get_for_cldr_string') - .asFunction<_ResultInt32Void Function(ffi.Pointer, int)>( - isLeaf: true); + static final _ICU4XPluralCategory_get_for_cldr_string = + _capi, ffi.Size)>>('ICU4XPluralCategory_get_for_cldr_string') + .asFunction<_ResultInt32Void Function(ffi.Pointer, int)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/PluralOperands.g.dart b/ffi/capi/dart/package/lib/src/PluralOperands.g.dart index ed3ade3b975..4dea22c9f12 100644 --- a/ffi/capi/dart/package/lib/src/PluralOperands.g.dart +++ b/ffi/capi/dart/package/lib/src/PluralOperands.g.dart @@ -15,8 +15,7 @@ final class PluralOperands implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XPluralOperands_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XPluralOperands_destroy')); /// Construct for a given string representing a number /// @@ -26,20 +25,16 @@ final class PluralOperands implements ffi.Finalizable { factory PluralOperands.fromString(String s) { final alloc = ffi2.Arena(); final sSlice = _SliceFfi2Utf8._fromDart(s, alloc); - - final result = - _ICU4XPluralOperands_create_from_string(sSlice._bytes, sSlice._length); + final result = _ICU4XPluralOperands_create_from_string(sSlice._bytes, sSlice._length); alloc.releaseAll(); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return PluralOperands._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XPluralOperands_create_from_string = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer, - ffi.Size)>>('ICU4XPluralOperands_create_from_string') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer, int)>( - isLeaf: true); + static final _ICU4XPluralOperands_create_from_string = + _capi, ffi.Size)>>('ICU4XPluralOperands_create_from_string') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer, int)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/PluralRules.g.dart b/ffi/capi/dart/package/lib/src/PluralRules.g.dart index 4d626a5f6b2..13c2e3b407a 100644 --- a/ffi/capi/dart/package/lib/src/PluralRules.g.dart +++ b/ffi/capi/dart/package/lib/src/PluralRules.g.dart @@ -15,8 +15,7 @@ final class PluralRules implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XPluralRules_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XPluralRules_destroy')); /// Construct an [`PluralRules`] for the given locale, for cardinal numbers /// @@ -24,21 +23,17 @@ final class PluralRules implements ffi.Finalizable { /// /// Throws [Error] on failure. factory PluralRules.cardinal(DataProvider provider, Locale locale) { - final result = _ICU4XPluralRules_create_cardinal( - provider._underlying, locale._underlying); + final result = _ICU4XPluralRules_create_cardinal(provider._underlying, locale._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return PluralRules._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XPluralRules_create_cardinal = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer, - ffi.Pointer)>>('ICU4XPluralRules_create_cardinal') - .asFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XPluralRules_create_cardinal = + _capi, ffi.Pointer)>>('ICU4XPluralRules_create_cardinal') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer, ffi.Pointer)>(isLeaf: true); /// Construct an [`PluralRules`] for the given locale, for ordinal numbers /// @@ -46,21 +41,17 @@ final class PluralRules implements ffi.Finalizable { /// /// Throws [Error] on failure. factory PluralRules.ordinal(DataProvider provider, Locale locale) { - final result = _ICU4XPluralRules_create_ordinal( - provider._underlying, locale._underlying); + final result = _ICU4XPluralRules_create_ordinal(provider._underlying, locale._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return PluralRules._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XPluralRules_create_ordinal = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer, - ffi.Pointer)>>('ICU4XPluralRules_create_ordinal') - .asFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XPluralRules_create_ordinal = + _capi, ffi.Pointer)>>('ICU4XPluralRules_create_ordinal') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer, ffi.Pointer)>(isLeaf: true); /// Get the category for a given number represented as operands /// @@ -71,13 +62,9 @@ final class PluralRules implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XPluralRules_category_for = _capi< - ffi.NativeFunction< - ffi.Int32 Function(ffi.Pointer, - ffi.Pointer)>>('ICU4XPluralRules_category_for') - .asFunction< - int Function( - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XPluralRules_category_for = + _capi, ffi.Pointer)>>('ICU4XPluralRules_category_for') + .asFunction, ffi.Pointer)>(isLeaf: true); /// Get all of the categories needed in the current locale /// @@ -88,10 +75,7 @@ final class PluralRules implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XPluralRules_categories = _capi< - ffi.NativeFunction< - _PluralCategoriesFfi Function( - ffi.Pointer)>>('ICU4XPluralRules_categories') - .asFunction<_PluralCategoriesFfi Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XPluralRules_categories = + _capi)>>('ICU4XPluralRules_categories') + .asFunction<_PluralCategoriesFfi Function(ffi.Pointer)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/PropertyValueNameToEnumMapper.g.dart b/ffi/capi/dart/package/lib/src/PropertyValueNameToEnumMapper.g.dart index 862048153ee..cb03f5096ad 100644 --- a/ffi/capi/dart/package/lib/src/PropertyValueNameToEnumMapper.g.dart +++ b/ffi/capi/dart/package/lib/src/PropertyValueNameToEnumMapper.g.dart @@ -17,8 +17,7 @@ final class PropertyValueNameToEnumMapper implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XPropertyValueNameToEnumMapper_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XPropertyValueNameToEnumMapper_destroy')); /// Get the property value matching the given name, using strict matching /// @@ -28,23 +27,15 @@ final class PropertyValueNameToEnumMapper implements ffi.Finalizable { int getStrict(String name) { final alloc = ffi2.Arena(); final nameSlice = _SliceFfi2Utf8._fromDart(name, alloc); - - final result = _ICU4XPropertyValueNameToEnumMapper_get_strict( - _underlying, nameSlice._bytes, nameSlice._length); + final result = _ICU4XPropertyValueNameToEnumMapper_get_strict(_underlying, nameSlice._bytes, nameSlice._length); alloc.releaseAll(); return result; } // ignore: non_constant_identifier_names - static final _ICU4XPropertyValueNameToEnumMapper_get_strict = _capi< - ffi.NativeFunction< - ffi.Int16 Function( - ffi.Pointer, - ffi.Pointer, - ffi.Size)>>('ICU4XPropertyValueNameToEnumMapper_get_strict') - .asFunction< - int Function(ffi.Pointer, ffi.Pointer, - int)>(isLeaf: true); + static final _ICU4XPropertyValueNameToEnumMapper_get_strict = + _capi, ffi.Pointer, ffi.Size)>>('ICU4XPropertyValueNameToEnumMapper_get_strict') + .asFunction, ffi.Pointer, int)>(isLeaf: true); /// Get the property value matching the given name, using loose matching /// @@ -54,203 +45,157 @@ final class PropertyValueNameToEnumMapper implements ffi.Finalizable { int getLoose(String name) { final alloc = ffi2.Arena(); final nameSlice = _SliceFfi2Utf8._fromDart(name, alloc); - - final result = _ICU4XPropertyValueNameToEnumMapper_get_loose( - _underlying, nameSlice._bytes, nameSlice._length); + final result = _ICU4XPropertyValueNameToEnumMapper_get_loose(_underlying, nameSlice._bytes, nameSlice._length); alloc.releaseAll(); return result; } // ignore: non_constant_identifier_names - static final _ICU4XPropertyValueNameToEnumMapper_get_loose = _capi< - ffi.NativeFunction< - ffi.Int16 Function( - ffi.Pointer, - ffi.Pointer, - ffi.Size)>>('ICU4XPropertyValueNameToEnumMapper_get_loose') - .asFunction< - int Function(ffi.Pointer, ffi.Pointer, - int)>(isLeaf: true); + static final _ICU4XPropertyValueNameToEnumMapper_get_loose = + _capi, ffi.Pointer, ffi.Size)>>('ICU4XPropertyValueNameToEnumMapper_get_loose') + .asFunction, ffi.Pointer, int)>(isLeaf: true); /// See the [Rust documentation for `get_name_to_enum_mapper`](https://docs.rs/icu/latest/icu/properties/struct.GeneralCategory.html#method.get_name_to_enum_mapper) for more information. /// /// Throws [Error] on failure. - factory PropertyValueNameToEnumMapper.loadGeneralCategory( - DataProvider provider) { - final result = _ICU4XPropertyValueNameToEnumMapper_load_general_category( - provider._underlying); + factory PropertyValueNameToEnumMapper.loadGeneralCategory(DataProvider provider) { + final result = _ICU4XPropertyValueNameToEnumMapper_load_general_category(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return PropertyValueNameToEnumMapper._(result.union.ok); } + // ignore: non_constant_identifier_names static final _ICU4XPropertyValueNameToEnumMapper_load_general_category = - _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XPropertyValueNameToEnumMapper_load_general_category') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + _capi)>>('ICU4XPropertyValueNameToEnumMapper_load_general_category') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `name_to_enum_mapper`](https://docs.rs/icu/latest/icu/properties/struct.BidiClass.html#method.name_to_enum_mapper) for more information. /// /// Throws [Error] on failure. factory PropertyValueNameToEnumMapper.loadBidiClass(DataProvider provider) { - final result = _ICU4XPropertyValueNameToEnumMapper_load_bidi_class( - provider._underlying); + final result = _ICU4XPropertyValueNameToEnumMapper_load_bidi_class(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return PropertyValueNameToEnumMapper._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XPropertyValueNameToEnumMapper_load_bidi_class = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XPropertyValueNameToEnumMapper_load_bidi_class') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XPropertyValueNameToEnumMapper_load_bidi_class = + _capi)>>('ICU4XPropertyValueNameToEnumMapper_load_bidi_class') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `name_to_enum_mapper`](https://docs.rs/icu/latest/icu/properties/struct.EastAsianWidth.html#method.name_to_enum_mapper) for more information. /// /// Throws [Error] on failure. - factory PropertyValueNameToEnumMapper.loadEastAsianWidth( - DataProvider provider) { - final result = _ICU4XPropertyValueNameToEnumMapper_load_east_asian_width( - provider._underlying); + factory PropertyValueNameToEnumMapper.loadEastAsianWidth(DataProvider provider) { + final result = _ICU4XPropertyValueNameToEnumMapper_load_east_asian_width(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return PropertyValueNameToEnumMapper._(result.union.ok); } + // ignore: non_constant_identifier_names static final _ICU4XPropertyValueNameToEnumMapper_load_east_asian_width = - _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XPropertyValueNameToEnumMapper_load_east_asian_width') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + _capi)>>('ICU4XPropertyValueNameToEnumMapper_load_east_asian_width') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `name_to_enum_mapper`](https://docs.rs/icu/latest/icu/properties/struct.IndicSyllabicCategory.html#method.name_to_enum_mapper) for more information. /// /// Throws [Error] on failure. - factory PropertyValueNameToEnumMapper.loadIndicSyllabicCategory( - DataProvider provider) { - final result = - _ICU4XPropertyValueNameToEnumMapper_load_indic_syllabic_category( - provider._underlying); + factory PropertyValueNameToEnumMapper.loadIndicSyllabicCategory(DataProvider provider) { + final result = _ICU4XPropertyValueNameToEnumMapper_load_indic_syllabic_category(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return PropertyValueNameToEnumMapper._(result.union.ok); } + // ignore: non_constant_identifier_names static final _ICU4XPropertyValueNameToEnumMapper_load_indic_syllabic_category = - _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XPropertyValueNameToEnumMapper_load_indic_syllabic_category') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + _capi)>>('ICU4XPropertyValueNameToEnumMapper_load_indic_syllabic_category') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `name_to_enum_mapper`](https://docs.rs/icu/latest/icu/properties/struct.LineBreak.html#method.name_to_enum_mapper) for more information. /// /// Throws [Error] on failure. factory PropertyValueNameToEnumMapper.loadLineBreak(DataProvider provider) { - final result = _ICU4XPropertyValueNameToEnumMapper_load_line_break( - provider._underlying); + final result = _ICU4XPropertyValueNameToEnumMapper_load_line_break(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return PropertyValueNameToEnumMapper._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XPropertyValueNameToEnumMapper_load_line_break = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XPropertyValueNameToEnumMapper_load_line_break') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XPropertyValueNameToEnumMapper_load_line_break = + _capi)>>('ICU4XPropertyValueNameToEnumMapper_load_line_break') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `get_name_to_enum_mapper`](https://docs.rs/icu/latest/icu/properties/struct.GraphemeClusterBreak.html#method.get_name_to_enum_mapper) for more information. /// /// Throws [Error] on failure. - factory PropertyValueNameToEnumMapper.loadGraphemeClusterBreak( - DataProvider provider) { - final result = - _ICU4XPropertyValueNameToEnumMapper_load_grapheme_cluster_break( - provider._underlying); + factory PropertyValueNameToEnumMapper.loadGraphemeClusterBreak(DataProvider provider) { + final result = _ICU4XPropertyValueNameToEnumMapper_load_grapheme_cluster_break(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return PropertyValueNameToEnumMapper._(result.union.ok); } + // ignore: non_constant_identifier_names static final _ICU4XPropertyValueNameToEnumMapper_load_grapheme_cluster_break = - _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XPropertyValueNameToEnumMapper_load_grapheme_cluster_break') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + _capi)>>('ICU4XPropertyValueNameToEnumMapper_load_grapheme_cluster_break') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `name_to_enum_mapper`](https://docs.rs/icu/latest/icu/properties/struct.WordBreak.html#method.name_to_enum_mapper) for more information. /// /// Throws [Error] on failure. factory PropertyValueNameToEnumMapper.loadWordBreak(DataProvider provider) { - final result = _ICU4XPropertyValueNameToEnumMapper_load_word_break( - provider._underlying); + final result = _ICU4XPropertyValueNameToEnumMapper_load_word_break(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return PropertyValueNameToEnumMapper._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XPropertyValueNameToEnumMapper_load_word_break = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XPropertyValueNameToEnumMapper_load_word_break') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XPropertyValueNameToEnumMapper_load_word_break = + _capi)>>('ICU4XPropertyValueNameToEnumMapper_load_word_break') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `name_to_enum_mapper`](https://docs.rs/icu/latest/icu/properties/struct.SentenceBreak.html#method.name_to_enum_mapper) for more information. /// /// Throws [Error] on failure. - factory PropertyValueNameToEnumMapper.loadSentenceBreak( - DataProvider provider) { - final result = _ICU4XPropertyValueNameToEnumMapper_load_sentence_break( - provider._underlying); + factory PropertyValueNameToEnumMapper.loadSentenceBreak(DataProvider provider) { + final result = _ICU4XPropertyValueNameToEnumMapper_load_sentence_break(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return PropertyValueNameToEnumMapper._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XPropertyValueNameToEnumMapper_load_sentence_break = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XPropertyValueNameToEnumMapper_load_sentence_break') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XPropertyValueNameToEnumMapper_load_sentence_break = + _capi)>>('ICU4XPropertyValueNameToEnumMapper_load_sentence_break') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `name_to_enum_mapper`](https://docs.rs/icu/latest/icu/properties/struct.Script.html#method.name_to_enum_mapper) for more information. /// /// Throws [Error] on failure. factory PropertyValueNameToEnumMapper.loadScript(DataProvider provider) { - final result = - _ICU4XPropertyValueNameToEnumMapper_load_script(provider._underlying); + final result = _ICU4XPropertyValueNameToEnumMapper_load_script(provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return PropertyValueNameToEnumMapper._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XPropertyValueNameToEnumMapper_load_script = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XPropertyValueNameToEnumMapper_load_script') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XPropertyValueNameToEnumMapper_load_script = + _capi)>>('ICU4XPropertyValueNameToEnumMapper_load_script') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/RegionDisplayNames.g.dart b/ffi/capi/dart/package/lib/src/RegionDisplayNames.g.dart index a5c3e0ebe5e..60f6712523c 100644 --- a/ffi/capi/dart/package/lib/src/RegionDisplayNames.g.dart +++ b/ffi/capi/dart/package/lib/src/RegionDisplayNames.g.dart @@ -13,8 +13,7 @@ final class RegionDisplayNames implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XRegionDisplayNames_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XRegionDisplayNames_destroy')); /// Creates a new `RegionDisplayNames` from locale data and an options bag. /// @@ -22,21 +21,17 @@ final class RegionDisplayNames implements ffi.Finalizable { /// /// Throws [Error] on failure. factory RegionDisplayNames(DataProvider provider, Locale locale) { - final result = _ICU4XRegionDisplayNames_create( - provider._underlying, locale._underlying); + final result = _ICU4XRegionDisplayNames_create(provider._underlying, locale._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return RegionDisplayNames._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XRegionDisplayNames_create = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer, - ffi.Pointer)>>('ICU4XRegionDisplayNames_create') - .asFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XRegionDisplayNames_create = + _capi, ffi.Pointer)>>('ICU4XRegionDisplayNames_create') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer, ffi.Pointer)>(isLeaf: true); /// Returns the locale specific display name of a region. /// Note that the funtion returns an empty string in case the display name for a given @@ -48,10 +43,8 @@ final class RegionDisplayNames implements ffi.Finalizable { String of(String region) { final alloc = ffi2.Arena(); final regionSlice = _SliceFfi2Utf8._fromDart(region, alloc); - final writeable = _Writeable(); - final result = _ICU4XRegionDisplayNames_of(_underlying, regionSlice._bytes, - regionSlice._length, writeable._underlying); + final result = _ICU4XRegionDisplayNames_of(_underlying, regionSlice._bytes, regionSlice._length, writeable._underlying); alloc.releaseAll(); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); @@ -60,17 +53,7 @@ final class RegionDisplayNames implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XRegionDisplayNames_of = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function( - ffi.Pointer, - ffi.Pointer, - ffi.Size, - ffi.Pointer)>>('ICU4XRegionDisplayNames_of') - .asFunction< - _ResultVoidInt32 Function( - ffi.Pointer, - ffi.Pointer, - int, - ffi.Pointer)>(isLeaf: true); + static final _ICU4XRegionDisplayNames_of = + _capi, ffi.Pointer, ffi.Size, ffi.Pointer)>>('ICU4XRegionDisplayNames_of') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer, int, ffi.Pointer)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/ReorderedIndexMap.g.dart b/ffi/capi/dart/package/lib/src/ReorderedIndexMap.g.dart index c3105614577..a8bc49c760c 100644 --- a/ffi/capi/dart/package/lib/src/ReorderedIndexMap.g.dart +++ b/ffi/capi/dart/package/lib/src/ReorderedIndexMap.g.dart @@ -17,8 +17,7 @@ final class ReorderedIndexMap implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XReorderedIndexMap_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XReorderedIndexMap_destroy')); /// Get this as a slice/array of indices SizeList get asSlice { @@ -28,9 +27,8 @@ final class ReorderedIndexMap implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XReorderedIndexMap_as_slice = - _capi)>>( - 'ICU4XReorderedIndexMap_as_slice') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XReorderedIndexMap_as_slice') + .asFunction)>(isLeaf: true); /// The length of this map int get length { @@ -40,9 +38,8 @@ final class ReorderedIndexMap implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XReorderedIndexMap_len = - _capi)>>( - 'ICU4XReorderedIndexMap_len') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XReorderedIndexMap_len') + .asFunction)>(isLeaf: true); /// Get element at `index`. Returns 0 when out of bounds /// (note that 0 is also a valid in-bounds value, please use `len()` @@ -53,9 +50,7 @@ final class ReorderedIndexMap implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XReorderedIndexMap_get = _capi< - ffi.NativeFunction< - ffi.Size Function(ffi.Pointer, - ffi.Size)>>('ICU4XReorderedIndexMap_get') + static final _ICU4XReorderedIndexMap_get = + _capi, ffi.Size)>>('ICU4XReorderedIndexMap_get') .asFunction, int)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/RoundingIncrement.g.dart b/ffi/capi/dart/package/lib/src/RoundingIncrement.g.dart index 77b14d65159..4cb5e145761 100644 --- a/ffi/capi/dart/package/lib/src/RoundingIncrement.g.dart +++ b/ffi/capi/dart/package/lib/src/RoundingIncrement.g.dart @@ -10,7 +10,10 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `RoundingIncrement`](https://docs.rs/fixed_decimal/latest/fixed_decimal/enum.RoundingIncrement.html) for more information. enum RoundingIncrement { multiplesOf1, + multiplesOf2, + multiplesOf5, + multiplesOf25; } diff --git a/ffi/capi/dart/package/lib/src/ScriptExtensionsSet.g.dart b/ffi/capi/dart/package/lib/src/ScriptExtensionsSet.g.dart index 2d2ef37965d..8998504b17f 100644 --- a/ffi/capi/dart/package/lib/src/ScriptExtensionsSet.g.dart +++ b/ffi/capi/dart/package/lib/src/ScriptExtensionsSet.g.dart @@ -15,8 +15,7 @@ final class ScriptExtensionsSet implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XScriptExtensionsSet_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XScriptExtensionsSet_destroy')); /// Check if the Script_Extensions property of the given code point covers the given script /// @@ -27,10 +26,8 @@ final class ScriptExtensionsSet implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XScriptExtensionsSet_contains = _capi< - ffi.NativeFunction< - ffi.Bool Function(ffi.Pointer, - ffi.Uint16)>>('ICU4XScriptExtensionsSet_contains') + static final _ICU4XScriptExtensionsSet_contains = + _capi, ffi.Uint16)>>('ICU4XScriptExtensionsSet_contains') .asFunction, int)>(isLeaf: true); /// Get the number of scripts contained in here @@ -43,9 +40,8 @@ final class ScriptExtensionsSet implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XScriptExtensionsSet_count = - _capi)>>( - 'ICU4XScriptExtensionsSet_count') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XScriptExtensionsSet_count') + .asFunction)>(isLeaf: true); /// Get script at index, returning an error if out of bounds /// @@ -61,10 +57,7 @@ final class ScriptExtensionsSet implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XScriptExtensionsSet_script_at = _capi< - ffi.NativeFunction< - _ResultUint16Void Function(ffi.Pointer, - ffi.Size)>>('ICU4XScriptExtensionsSet_script_at') - .asFunction<_ResultUint16Void Function(ffi.Pointer, int)>( - isLeaf: true); + static final _ICU4XScriptExtensionsSet_script_at = + _capi, ffi.Size)>>('ICU4XScriptExtensionsSet_script_at') + .asFunction<_ResultUint16Void Function(ffi.Pointer, int)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/ScriptWithExtensions.g.dart b/ffi/capi/dart/package/lib/src/ScriptWithExtensions.g.dart index cd8c7295446..74293c170e0 100644 --- a/ffi/capi/dart/package/lib/src/ScriptWithExtensions.g.dart +++ b/ffi/capi/dart/package/lib/src/ScriptWithExtensions.g.dart @@ -15,8 +15,7 @@ final class ScriptWithExtensions implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XScriptWithExtensions_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XScriptWithExtensions_destroy')); /// See the [Rust documentation for `script_with_extensions`](https://docs.rs/icu/latest/icu/properties/script/fn.script_with_extensions.html) for more information. /// @@ -28,46 +27,37 @@ final class ScriptWithExtensions implements ffi.Finalizable { } return ScriptWithExtensions._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XScriptWithExtensions_create = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer)>>('ICU4XScriptWithExtensions_create') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XScriptWithExtensions_create = + _capi)>>('ICU4XScriptWithExtensions_create') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// Get the Script property value for a code point /// /// See the [Rust documentation for `get_script_val`](https://docs.rs/icu/latest/icu/properties/script/struct.ScriptWithExtensionsBorrowed.html#method.get_script_val) for more information. int getScriptVal(int codePoint) { - final result = - _ICU4XScriptWithExtensions_get_script_val(_underlying, codePoint); + final result = _ICU4XScriptWithExtensions_get_script_val(_underlying, codePoint); return result; } // ignore: non_constant_identifier_names - static final _ICU4XScriptWithExtensions_get_script_val = _capi< - ffi.NativeFunction< - ffi.Uint16 Function(ffi.Pointer, - ffi.Uint32)>>('ICU4XScriptWithExtensions_get_script_val') + static final _ICU4XScriptWithExtensions_get_script_val = + _capi, ffi.Uint32)>>('ICU4XScriptWithExtensions_get_script_val') .asFunction, int)>(isLeaf: true); /// Check if the Script_Extensions property of the given code point covers the given script /// /// See the [Rust documentation for `has_script`](https://docs.rs/icu/latest/icu/properties/script/struct.ScriptWithExtensionsBorrowed.html#method.has_script) for more information. bool hasScript(int codePoint, int script) { - final result = - _ICU4XScriptWithExtensions_has_script(_underlying, codePoint, script); + final result = _ICU4XScriptWithExtensions_has_script(_underlying, codePoint, script); return result; } // ignore: non_constant_identifier_names - static final _ICU4XScriptWithExtensions_has_script = _capi< - ffi.NativeFunction< - ffi.Bool Function(ffi.Pointer, ffi.Uint32, - ffi.Uint16)>>('ICU4XScriptWithExtensions_has_script') - .asFunction, int, int)>( - isLeaf: true); + static final _ICU4XScriptWithExtensions_has_script = + _capi, ffi.Uint32, ffi.Uint16)>>('ICU4XScriptWithExtensions_has_script') + .asFunction, int, int)>(isLeaf: true); /// Borrow this object for a slightly faster variant with more operations /// @@ -78,29 +68,20 @@ final class ScriptWithExtensions implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XScriptWithExtensions_as_borrowed = _capi< - ffi.NativeFunction< - ffi.Pointer Function(ffi.Pointer)>>( - 'ICU4XScriptWithExtensions_as_borrowed') - .asFunction Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XScriptWithExtensions_as_borrowed = + _capi Function(ffi.Pointer)>>('ICU4XScriptWithExtensions_as_borrowed') + .asFunction Function(ffi.Pointer)>(isLeaf: true); /// Get a list of ranges of code points that contain this script in their Script_Extensions values /// /// See the [Rust documentation for `get_script_extensions_ranges`](https://docs.rs/icu/latest/icu/properties/script/struct.ScriptWithExtensionsBorrowed.html#method.get_script_extensions_ranges) for more information. CodePointRangeIterator iterRangesForScript(int script) { - final result = - _ICU4XScriptWithExtensions_iter_ranges_for_script(_underlying, script); + final result = _ICU4XScriptWithExtensions_iter_ranges_for_script(_underlying, script); return CodePointRangeIterator._(result); } // ignore: non_constant_identifier_names - static final _ICU4XScriptWithExtensions_iter_ranges_for_script = _capi< - ffi.NativeFunction< - ffi.Pointer Function( - ffi.Pointer, ffi.Uint16)>>( - 'ICU4XScriptWithExtensions_iter_ranges_for_script') - .asFunction< - ffi.Pointer Function( - ffi.Pointer, int)>(isLeaf: true); + static final _ICU4XScriptWithExtensions_iter_ranges_for_script = + _capi Function(ffi.Pointer, ffi.Uint16)>>('ICU4XScriptWithExtensions_iter_ranges_for_script') + .asFunction Function(ffi.Pointer, int)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/ScriptWithExtensionsBorrowed.g.dart b/ffi/capi/dart/package/lib/src/ScriptWithExtensionsBorrowed.g.dart index f52427168ea..b4b629dfb4f 100644 --- a/ffi/capi/dart/package/lib/src/ScriptWithExtensionsBorrowed.g.dart +++ b/ffi/capi/dart/package/lib/src/ScriptWithExtensionsBorrowed.g.dart @@ -15,86 +15,58 @@ final class ScriptWithExtensionsBorrowed implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XScriptWithExtensionsBorrowed_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XScriptWithExtensionsBorrowed_destroy')); /// Get the Script property value for a code point /// /// See the [Rust documentation for `get_script_val`](https://docs.rs/icu/latest/icu/properties/script/struct.ScriptWithExtensionsBorrowed.html#method.get_script_val) for more information. int getScriptVal(int codePoint) { - final result = _ICU4XScriptWithExtensionsBorrowed_get_script_val( - _underlying, codePoint); + final result = _ICU4XScriptWithExtensionsBorrowed_get_script_val(_underlying, codePoint); return result; } // ignore: non_constant_identifier_names - static final _ICU4XScriptWithExtensionsBorrowed_get_script_val = _capi< - ffi.NativeFunction< - ffi.Uint16 Function(ffi.Pointer, ffi.Uint32)>>( - 'ICU4XScriptWithExtensionsBorrowed_get_script_val') + static final _ICU4XScriptWithExtensionsBorrowed_get_script_val = + _capi, ffi.Uint32)>>('ICU4XScriptWithExtensionsBorrowed_get_script_val') .asFunction, int)>(isLeaf: true); /// Get the Script property value for a code point /// /// See the [Rust documentation for `get_script_extensions_val`](https://docs.rs/icu/latest/icu/properties/script/struct.ScriptWithExtensionsBorrowed.html#method.get_script_extensions_val) for more information. ScriptExtensionsSet getScriptExtensionsVal(int codePoint) { - final result = _ICU4XScriptWithExtensionsBorrowed_get_script_extensions_val( - _underlying, codePoint); + final result = _ICU4XScriptWithExtensionsBorrowed_get_script_extensions_val(_underlying, codePoint); return ScriptExtensionsSet._(result); } // ignore: non_constant_identifier_names static final _ICU4XScriptWithExtensionsBorrowed_get_script_extensions_val = - _capi< - ffi - .NativeFunction< - ffi.Pointer Function( - ffi.Pointer, - ffi - .Uint32)>>( - 'ICU4XScriptWithExtensionsBorrowed_get_script_extensions_val') - .asFunction< - ffi.Pointer Function( - ffi.Pointer, int)>(isLeaf: true); + _capi Function(ffi.Pointer, ffi.Uint32)>>('ICU4XScriptWithExtensionsBorrowed_get_script_extensions_val') + .asFunction Function(ffi.Pointer, int)>(isLeaf: true); /// Check if the Script_Extensions property of the given code point covers the given script /// /// See the [Rust documentation for `has_script`](https://docs.rs/icu/latest/icu/properties/script/struct.ScriptWithExtensionsBorrowed.html#method.has_script) for more information. bool hasScript(int codePoint, int script) { - final result = _ICU4XScriptWithExtensionsBorrowed_has_script( - _underlying, codePoint, script); + final result = _ICU4XScriptWithExtensionsBorrowed_has_script(_underlying, codePoint, script); return result; } // ignore: non_constant_identifier_names - static final _ICU4XScriptWithExtensionsBorrowed_has_script = _capi< - ffi.NativeFunction< - ffi.Bool Function(ffi.Pointer, ffi.Uint32, - ffi.Uint16)>>('ICU4XScriptWithExtensionsBorrowed_has_script') - .asFunction, int, int)>( - isLeaf: true); + static final _ICU4XScriptWithExtensionsBorrowed_has_script = + _capi, ffi.Uint32, ffi.Uint16)>>('ICU4XScriptWithExtensionsBorrowed_has_script') + .asFunction, int, int)>(isLeaf: true); /// Build the CodePointSetData corresponding to a codepoints matching a particular script /// in their Script_Extensions /// /// See the [Rust documentation for `get_script_extensions_set`](https://docs.rs/icu/latest/icu/properties/script/struct.ScriptWithExtensionsBorrowed.html#method.get_script_extensions_set) for more information. CodePointSetData getScriptExtensionsSet(int script) { - final result = _ICU4XScriptWithExtensionsBorrowed_get_script_extensions_set( - _underlying, script); + final result = _ICU4XScriptWithExtensionsBorrowed_get_script_extensions_set(_underlying, script); return CodePointSetData._(result); } // ignore: non_constant_identifier_names static final _ICU4XScriptWithExtensionsBorrowed_get_script_extensions_set = - _capi< - ffi - .NativeFunction< - ffi.Pointer Function( - ffi.Pointer, - ffi - .Uint16)>>( - 'ICU4XScriptWithExtensionsBorrowed_get_script_extensions_set') - .asFunction< - ffi.Pointer Function( - ffi.Pointer, int)>(isLeaf: true); + _capi Function(ffi.Pointer, ffi.Uint16)>>('ICU4XScriptWithExtensionsBorrowed_get_script_extensions_set') + .asFunction Function(ffi.Pointer, int)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/SegmenterWordType.g.dart b/ffi/capi/dart/package/lib/src/SegmenterWordType.g.dart index b828d958a14..ee2ae761777 100644 --- a/ffi/capi/dart/package/lib/src/SegmenterWordType.g.dart +++ b/ffi/capi/dart/package/lib/src/SegmenterWordType.g.dart @@ -8,6 +8,8 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `WordType`](https://docs.rs/icu/latest/icu/segmenter/enum.WordType.html) for more information. enum SegmenterWordType { none, + number, + letter; } diff --git a/ffi/capi/dart/package/lib/src/SentenceBreakIteratorLatin1.g.dart b/ffi/capi/dart/package/lib/src/SentenceBreakIteratorLatin1.g.dart index 5a7bd0d2067..33d74272445 100644 --- a/ffi/capi/dart/package/lib/src/SentenceBreakIteratorLatin1.g.dart +++ b/ffi/capi/dart/package/lib/src/SentenceBreakIteratorLatin1.g.dart @@ -13,8 +13,7 @@ final class SentenceBreakIteratorLatin1 implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XSentenceBreakIteratorLatin1_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XSentenceBreakIteratorLatin1_destroy')); /// Finds the next breakpoint. Returns -1 if at the end of the string or if the index is /// out of range of a 32-bit signed integer. @@ -27,7 +26,6 @@ final class SentenceBreakIteratorLatin1 implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XSentenceBreakIteratorLatin1_next = - _capi)>>( - 'ICU4XSentenceBreakIteratorLatin1_next') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XSentenceBreakIteratorLatin1_next') + .asFunction)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/SentenceBreakIteratorUtf16.g.dart b/ffi/capi/dart/package/lib/src/SentenceBreakIteratorUtf16.g.dart index 5c7c80dd56e..25ac68675f3 100644 --- a/ffi/capi/dart/package/lib/src/SentenceBreakIteratorUtf16.g.dart +++ b/ffi/capi/dart/package/lib/src/SentenceBreakIteratorUtf16.g.dart @@ -13,8 +13,7 @@ final class SentenceBreakIteratorUtf16 implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XSentenceBreakIteratorUtf16_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XSentenceBreakIteratorUtf16_destroy')); /// Finds the next breakpoint. Returns -1 if at the end of the string or if the index is /// out of range of a 32-bit signed integer. @@ -27,7 +26,6 @@ final class SentenceBreakIteratorUtf16 implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XSentenceBreakIteratorUtf16_next = - _capi)>>( - 'ICU4XSentenceBreakIteratorUtf16_next') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XSentenceBreakIteratorUtf16_next') + .asFunction)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/SentenceBreakIteratorUtf8.g.dart b/ffi/capi/dart/package/lib/src/SentenceBreakIteratorUtf8.g.dart index 9e34464a7d5..e8b93c6cbd8 100644 --- a/ffi/capi/dart/package/lib/src/SentenceBreakIteratorUtf8.g.dart +++ b/ffi/capi/dart/package/lib/src/SentenceBreakIteratorUtf8.g.dart @@ -13,8 +13,7 @@ final class SentenceBreakIteratorUtf8 implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XSentenceBreakIteratorUtf8_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XSentenceBreakIteratorUtf8_destroy')); /// Finds the next breakpoint. Returns -1 if at the end of the string or if the index is /// out of range of a 32-bit signed integer. @@ -27,7 +26,6 @@ final class SentenceBreakIteratorUtf8 implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XSentenceBreakIteratorUtf8_next = - _capi)>>( - 'ICU4XSentenceBreakIteratorUtf8_next') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XSentenceBreakIteratorUtf8_next') + .asFunction)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/SentenceSegmenter.g.dart b/ffi/capi/dart/package/lib/src/SentenceSegmenter.g.dart index a3ecd2a3489..d656dbdd2bf 100644 --- a/ffi/capi/dart/package/lib/src/SentenceSegmenter.g.dart +++ b/ffi/capi/dart/package/lib/src/SentenceSegmenter.g.dart @@ -15,8 +15,7 @@ final class SentenceSegmenter implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XSentenceSegmenter_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XSentenceSegmenter_destroy')); /// Construct an [`SentenceSegmenter`]. /// @@ -30,13 +29,11 @@ final class SentenceSegmenter implements ffi.Finalizable { } return SentenceSegmenter._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XSentenceSegmenter_create = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer)>>('ICU4XSentenceSegmenter_create') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XSentenceSegmenter_create = + _capi)>>('ICU4XSentenceSegmenter_create') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// Segments a (potentially ill-formed) UTF-8 string. /// @@ -44,23 +41,15 @@ final class SentenceSegmenter implements ffi.Finalizable { SentenceBreakIteratorUtf8 segmentUtf8(String input) { final alloc = ffi2.Arena(); final inputSlice = _SliceFfi2Utf8._fromDart(input, alloc); - - final result = _ICU4XSentenceSegmenter_segment_utf8( - _underlying, inputSlice._bytes, inputSlice._length); + final result = _ICU4XSentenceSegmenter_segment_utf8(_underlying, inputSlice._bytes, inputSlice._length); alloc.releaseAll(); return SentenceBreakIteratorUtf8._(result); } // ignore: non_constant_identifier_names - static final _ICU4XSentenceSegmenter_segment_utf8 = _capi< - ffi.NativeFunction< - ffi.Pointer Function( - ffi.Pointer, - ffi.Pointer, - ffi.Size)>>('ICU4XSentenceSegmenter_segment_utf8') - .asFunction< - ffi.Pointer Function(ffi.Pointer, - ffi.Pointer, int)>(isLeaf: true); + static final _ICU4XSentenceSegmenter_segment_utf8 = + _capi Function(ffi.Pointer, ffi.Pointer, ffi.Size)>>('ICU4XSentenceSegmenter_segment_utf8') + .asFunction Function(ffi.Pointer, ffi.Pointer, int)>(isLeaf: true); /// Segments a UTF-16 string. /// @@ -68,23 +57,15 @@ final class SentenceSegmenter implements ffi.Finalizable { SentenceBreakIteratorUtf16 segmentUtf16(Uint16List input) { final alloc = ffi2.Arena(); final inputSlice = _SliceFfiUint16._fromDart(input, alloc); - - final result = _ICU4XSentenceSegmenter_segment_utf16( - _underlying, inputSlice._bytes, inputSlice._length); + final result = _ICU4XSentenceSegmenter_segment_utf16(_underlying, inputSlice._bytes, inputSlice._length); alloc.releaseAll(); return SentenceBreakIteratorUtf16._(result); } // ignore: non_constant_identifier_names - static final _ICU4XSentenceSegmenter_segment_utf16 = _capi< - ffi.NativeFunction< - ffi.Pointer Function( - ffi.Pointer, - ffi.Pointer, - ffi.Size)>>('ICU4XSentenceSegmenter_segment_utf16') - .asFunction< - ffi.Pointer Function(ffi.Pointer, - ffi.Pointer, int)>(isLeaf: true); + static final _ICU4XSentenceSegmenter_segment_utf16 = + _capi Function(ffi.Pointer, ffi.Pointer, ffi.Size)>>('ICU4XSentenceSegmenter_segment_utf16') + .asFunction Function(ffi.Pointer, ffi.Pointer, int)>(isLeaf: true); /// Segments a Latin-1 string. /// @@ -92,21 +73,13 @@ final class SentenceSegmenter implements ffi.Finalizable { SentenceBreakIteratorLatin1 segmentLatin1(Uint8List input) { final alloc = ffi2.Arena(); final inputSlice = _SliceFfiUint8._fromDart(input, alloc); - - final result = _ICU4XSentenceSegmenter_segment_latin1( - _underlying, inputSlice._bytes, inputSlice._length); + final result = _ICU4XSentenceSegmenter_segment_latin1(_underlying, inputSlice._bytes, inputSlice._length); alloc.releaseAll(); return SentenceBreakIteratorLatin1._(result); } // ignore: non_constant_identifier_names - static final _ICU4XSentenceSegmenter_segment_latin1 = _capi< - ffi.NativeFunction< - ffi.Pointer Function( - ffi.Pointer, - ffi.Pointer, - ffi.Size)>>('ICU4XSentenceSegmenter_segment_latin1') - .asFunction< - ffi.Pointer Function(ffi.Pointer, - ffi.Pointer, int)>(isLeaf: true); + static final _ICU4XSentenceSegmenter_segment_latin1 = + _capi Function(ffi.Pointer, ffi.Pointer, ffi.Size)>>('ICU4XSentenceSegmenter_segment_latin1') + .asFunction Function(ffi.Pointer, ffi.Pointer, int)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/Time.g.dart b/ffi/capi/dart/package/lib/src/Time.g.dart index 72c71ccc71e..a1919d638cc 100644 --- a/ffi/capi/dart/package/lib/src/Time.g.dart +++ b/ffi/capi/dart/package/lib/src/Time.g.dart @@ -29,13 +29,11 @@ final class Time implements ffi.Finalizable { } return Time._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XTime_create = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Uint8, ffi.Uint8, ffi.Uint8, - ffi.Uint32)>>('ICU4XTime_create') - .asFunction<_ResultOpaqueInt32 Function(int, int, int, int)>( - isLeaf: true); + static final _ICU4XTime_create = + _capi>('ICU4XTime_create') + .asFunction<_ResultOpaqueInt32 Function(int, int, int, int)>(isLeaf: true); /// Creates a new [`Time`] representing midnight (00:00.000). /// @@ -49,11 +47,11 @@ final class Time implements ffi.Finalizable { } return Time._(result.union.ok); } + // ignore: non_constant_identifier_names static final _ICU4XTime_create_midnight = - _capi>( - 'ICU4XTime_create_midnight') - .asFunction<_ResultOpaqueInt32 Function()>(isLeaf: true); + _capi>('ICU4XTime_create_midnight') + .asFunction<_ResultOpaqueInt32 Function()>(isLeaf: true); /// Returns the hour in this time /// @@ -65,9 +63,8 @@ final class Time implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XTime_hour = - _capi)>>( - 'ICU4XTime_hour') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XTime_hour') + .asFunction)>(isLeaf: true); /// Returns the minute in this time /// @@ -79,9 +76,8 @@ final class Time implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XTime_minute = - _capi)>>( - 'ICU4XTime_minute') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XTime_minute') + .asFunction)>(isLeaf: true); /// Returns the second in this time /// @@ -93,9 +89,8 @@ final class Time implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XTime_second = - _capi)>>( - 'ICU4XTime_second') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XTime_second') + .asFunction)>(isLeaf: true); /// Returns the nanosecond in this time /// @@ -107,7 +102,6 @@ final class Time implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XTime_nanosecond = - _capi)>>( - 'ICU4XTime_nanosecond') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XTime_nanosecond') + .asFunction)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/TimeFormatter.g.dart b/ffi/capi/dart/package/lib/src/TimeFormatter.g.dart index e0d9b40c54b..8a68484910f 100644 --- a/ffi/capi/dart/package/lib/src/TimeFormatter.g.dart +++ b/ffi/capi/dart/package/lib/src/TimeFormatter.g.dart @@ -15,33 +15,25 @@ final class TimeFormatter implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XTimeFormatter_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XTimeFormatter_destroy')); /// Creates a new [`TimeFormatter`] from locale data. /// /// See the [Rust documentation for `try_new_with_length`](https://docs.rs/icu/latest/icu/datetime/struct.TimeFormatter.html#method.try_new_with_length) for more information. /// /// Throws [Error] on failure. - factory TimeFormatter.withLength( - DataProvider provider, Locale locale, TimeLength length) { - final result = _ICU4XTimeFormatter_create_with_length( - provider._underlying, locale._underlying, length.index); + factory TimeFormatter.withLength(DataProvider provider, Locale locale, TimeLength length) { + final result = _ICU4XTimeFormatter_create_with_length(provider._underlying, locale._underlying, length.index); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return TimeFormatter._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XTimeFormatter_create_with_length = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer, - ffi.Pointer, - ffi.Int32)>>('ICU4XTimeFormatter_create_with_length') - .asFunction< - _ResultOpaqueInt32 Function(ffi.Pointer, - ffi.Pointer, int)>(isLeaf: true); + static final _ICU4XTimeFormatter_create_with_length = + _capi, ffi.Pointer, ffi.Int32)>>('ICU4XTimeFormatter_create_with_length') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer, ffi.Pointer, int)>(isLeaf: true); /// Formats a [`Time`] to a string. /// @@ -50,8 +42,7 @@ final class TimeFormatter implements ffi.Finalizable { /// Throws [Error] on failure. String formatTime(Time value) { final writeable = _Writeable(); - final result = _ICU4XTimeFormatter_format_time( - _underlying, value._underlying, writeable._underlying); + final result = _ICU4XTimeFormatter_format_time(_underlying, value._underlying, writeable._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } @@ -59,15 +50,9 @@ final class TimeFormatter implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XTimeFormatter_format_time = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function( - ffi.Pointer, - ffi.Pointer, - ffi.Pointer)>>('ICU4XTimeFormatter_format_time') - .asFunction< - _ResultVoidInt32 Function(ffi.Pointer, - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XTimeFormatter_format_time = + _capi, ffi.Pointer, ffi.Pointer)>>('ICU4XTimeFormatter_format_time') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer, ffi.Pointer)>(isLeaf: true); /// Formats a [`DateTime`] to a string. /// @@ -76,8 +61,7 @@ final class TimeFormatter implements ffi.Finalizable { /// Throws [Error] on failure. String formatDatetime(DateTime value) { final writeable = _Writeable(); - final result = _ICU4XTimeFormatter_format_datetime( - _underlying, value._underlying, writeable._underlying); + final result = _ICU4XTimeFormatter_format_datetime(_underlying, value._underlying, writeable._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } @@ -85,14 +69,9 @@ final class TimeFormatter implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XTimeFormatter_format_datetime = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function(ffi.Pointer, - ffi.Pointer, ffi.Pointer)>>( - 'ICU4XTimeFormatter_format_datetime') - .asFunction< - _ResultVoidInt32 Function(ffi.Pointer, - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XTimeFormatter_format_datetime = + _capi, ffi.Pointer, ffi.Pointer)>>('ICU4XTimeFormatter_format_datetime') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer, ffi.Pointer)>(isLeaf: true); /// Formats a [`IsoDateTime`] to a string. /// @@ -101,8 +80,7 @@ final class TimeFormatter implements ffi.Finalizable { /// Throws [Error] on failure. String formatIsoDatetime(IsoDateTime value) { final writeable = _Writeable(); - final result = _ICU4XTimeFormatter_format_iso_datetime( - _underlying, value._underlying, writeable._underlying); + final result = _ICU4XTimeFormatter_format_iso_datetime(_underlying, value._underlying, writeable._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } @@ -110,12 +88,7 @@ final class TimeFormatter implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XTimeFormatter_format_iso_datetime = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function(ffi.Pointer, - ffi.Pointer, ffi.Pointer)>>( - 'ICU4XTimeFormatter_format_iso_datetime') - .asFunction< - _ResultVoidInt32 Function(ffi.Pointer, - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XTimeFormatter_format_iso_datetime = + _capi, ffi.Pointer, ffi.Pointer)>>('ICU4XTimeFormatter_format_iso_datetime') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer, ffi.Pointer)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/TimeLength.g.dart b/ffi/capi/dart/package/lib/src/TimeLength.g.dart index 59949ccec6e..3ee335ab039 100644 --- a/ffi/capi/dart/package/lib/src/TimeLength.g.dart +++ b/ffi/capi/dart/package/lib/src/TimeLength.g.dart @@ -8,7 +8,10 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `Time`](https://docs.rs/icu/latest/icu/datetime/options/length/enum.Time.html) for more information. enum TimeLength { full, + long, + medium, + short; } diff --git a/ffi/capi/dart/package/lib/src/TimeZoneFormatter.g.dart b/ffi/capi/dart/package/lib/src/TimeZoneFormatter.g.dart index f19d4679cae..4a0b225e9ea 100644 --- a/ffi/capi/dart/package/lib/src/TimeZoneFormatter.g.dart +++ b/ffi/capi/dart/package/lib/src/TimeZoneFormatter.g.dart @@ -15,8 +15,7 @@ final class TimeZoneFormatter implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XTimeZoneFormatter_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XTimeZoneFormatter_destroy')); /// Creates a new [`TimeZoneFormatter`] from locale data. /// @@ -27,25 +26,18 @@ final class TimeZoneFormatter implements ffi.Finalizable { /// Additional information: [1](https://docs.rs/icu/latest/icu/datetime/time_zone/enum.FallbackFormat.html) /// /// Throws [Error] on failure. - factory TimeZoneFormatter.withLocalizedGmtFallback( - DataProvider provider, Locale locale) { - final result = _ICU4XTimeZoneFormatter_create_with_localized_gmt_fallback( - provider._underlying, locale._underlying); + factory TimeZoneFormatter.withLocalizedGmtFallback(DataProvider provider, Locale locale) { + final result = _ICU4XTimeZoneFormatter_create_with_localized_gmt_fallback(provider._underlying, locale._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return TimeZoneFormatter._(result.union.ok); } + // ignore: non_constant_identifier_names static final _ICU4XTimeZoneFormatter_create_with_localized_gmt_fallback = - _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer, ffi.Pointer)>>( - 'ICU4XTimeZoneFormatter_create_with_localized_gmt_fallback') - .asFunction< - _ResultOpaqueInt32 Function(ffi.Pointer, - ffi.Pointer)>(isLeaf: true); + _capi, ffi.Pointer)>>('ICU4XTimeZoneFormatter_create_with_localized_gmt_fallback') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer, ffi.Pointer)>(isLeaf: true); /// Creates a new [`TimeZoneFormatter`] from locale data. /// @@ -56,24 +48,18 @@ final class TimeZoneFormatter implements ffi.Finalizable { /// Additional information: [1](https://docs.rs/icu/latest/icu/datetime/time_zone/enum.FallbackFormat.html) /// /// Throws [Error] on failure. - factory TimeZoneFormatter.withIso8601Fallback( - DataProvider provider, Locale locale, IsoTimeZoneOptions options) { - final result = _ICU4XTimeZoneFormatter_create_with_iso_8601_fallback( - provider._underlying, locale._underlying, options._underlying); + factory TimeZoneFormatter.withIso8601Fallback(DataProvider provider, Locale locale, IsoTimeZoneOptions options) { + final result = _ICU4XTimeZoneFormatter_create_with_iso_8601_fallback(provider._underlying, locale._underlying, options._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return TimeZoneFormatter._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XTimeZoneFormatter_create_with_iso_8601_fallback = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer, - ffi.Pointer, _IsoTimeZoneOptionsFfi)>>( - 'ICU4XTimeZoneFormatter_create_with_iso_8601_fallback') - .asFunction< - _ResultOpaqueInt32 Function(ffi.Pointer, - ffi.Pointer, _IsoTimeZoneOptionsFfi)>(isLeaf: true); + static final _ICU4XTimeZoneFormatter_create_with_iso_8601_fallback = + _capi, ffi.Pointer, _IsoTimeZoneOptionsFfi)>>('ICU4XTimeZoneFormatter_create_with_iso_8601_fallback') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer, ffi.Pointer, _IsoTimeZoneOptionsFfi)>(isLeaf: true); /// Loads generic non-location long format. Example: "Pacific Time" /// @@ -81,22 +67,16 @@ final class TimeZoneFormatter implements ffi.Finalizable { /// /// Throws [Error] on failure. void loadGenericNonLocationLong(DataProvider provider) { - final result = _ICU4XTimeZoneFormatter_load_generic_non_location_long( - _underlying, provider._underlying); + final result = _ICU4XTimeZoneFormatter_load_generic_non_location_long(_underlying, provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } } // ignore: non_constant_identifier_names - static final _ICU4XTimeZoneFormatter_load_generic_non_location_long = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function( - ffi.Pointer, ffi.Pointer)>>( - 'ICU4XTimeZoneFormatter_load_generic_non_location_long') - .asFunction< - _ResultVoidInt32 Function( - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XTimeZoneFormatter_load_generic_non_location_long = + _capi, ffi.Pointer)>>('ICU4XTimeZoneFormatter_load_generic_non_location_long') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer)>(isLeaf: true); /// Loads generic non-location short format. Example: "PT" /// @@ -104,22 +84,16 @@ final class TimeZoneFormatter implements ffi.Finalizable { /// /// Throws [Error] on failure. void loadGenericNonLocationShort(DataProvider provider) { - final result = _ICU4XTimeZoneFormatter_load_generic_non_location_short( - _underlying, provider._underlying); + final result = _ICU4XTimeZoneFormatter_load_generic_non_location_short(_underlying, provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } } // ignore: non_constant_identifier_names - static final _ICU4XTimeZoneFormatter_load_generic_non_location_short = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function( - ffi.Pointer, ffi.Pointer)>>( - 'ICU4XTimeZoneFormatter_load_generic_non_location_short') - .asFunction< - _ResultVoidInt32 Function( - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XTimeZoneFormatter_load_generic_non_location_short = + _capi, ffi.Pointer)>>('ICU4XTimeZoneFormatter_load_generic_non_location_short') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer)>(isLeaf: true); /// Loads specific non-location long format. Example: "Pacific Standard Time" /// @@ -127,22 +101,16 @@ final class TimeZoneFormatter implements ffi.Finalizable { /// /// Throws [Error] on failure. void loadSpecificNonLocationLong(DataProvider provider) { - final result = _ICU4XTimeZoneFormatter_load_specific_non_location_long( - _underlying, provider._underlying); + final result = _ICU4XTimeZoneFormatter_load_specific_non_location_long(_underlying, provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } } // ignore: non_constant_identifier_names - static final _ICU4XTimeZoneFormatter_load_specific_non_location_long = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function( - ffi.Pointer, ffi.Pointer)>>( - 'ICU4XTimeZoneFormatter_load_specific_non_location_long') - .asFunction< - _ResultVoidInt32 Function( - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XTimeZoneFormatter_load_specific_non_location_long = + _capi, ffi.Pointer)>>('ICU4XTimeZoneFormatter_load_specific_non_location_long') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer)>(isLeaf: true); /// Loads specific non-location short format. Example: "PST" /// @@ -150,22 +118,16 @@ final class TimeZoneFormatter implements ffi.Finalizable { /// /// Throws [Error] on failure. void loadSpecificNonLocationShort(DataProvider provider) { - final result = _ICU4XTimeZoneFormatter_load_specific_non_location_short( - _underlying, provider._underlying); + final result = _ICU4XTimeZoneFormatter_load_specific_non_location_short(_underlying, provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } } // ignore: non_constant_identifier_names - static final _ICU4XTimeZoneFormatter_load_specific_non_location_short = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function( - ffi.Pointer, ffi.Pointer)>>( - 'ICU4XTimeZoneFormatter_load_specific_non_location_short') - .asFunction< - _ResultVoidInt32 Function( - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XTimeZoneFormatter_load_specific_non_location_short = + _capi, ffi.Pointer)>>('ICU4XTimeZoneFormatter_load_specific_non_location_short') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer)>(isLeaf: true); /// Loads generic location format. Example: "Los Angeles Time" /// @@ -173,22 +135,16 @@ final class TimeZoneFormatter implements ffi.Finalizable { /// /// Throws [Error] on failure. void loadGenericLocationFormat(DataProvider provider) { - final result = _ICU4XTimeZoneFormatter_load_generic_location_format( - _underlying, provider._underlying); + final result = _ICU4XTimeZoneFormatter_load_generic_location_format(_underlying, provider._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } } // ignore: non_constant_identifier_names - static final _ICU4XTimeZoneFormatter_load_generic_location_format = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function( - ffi.Pointer, ffi.Pointer)>>( - 'ICU4XTimeZoneFormatter_load_generic_location_format') - .asFunction< - _ResultVoidInt32 Function( - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XTimeZoneFormatter_load_generic_location_format = + _capi, ffi.Pointer)>>('ICU4XTimeZoneFormatter_load_generic_location_format') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer)>(isLeaf: true); /// Loads localized GMT format. Example: "GMT-07:00" /// @@ -196,20 +152,16 @@ final class TimeZoneFormatter implements ffi.Finalizable { /// /// Throws [Error] on failure. void includeLocalizedGmtFormat() { - final result = - _ICU4XTimeZoneFormatter_include_localized_gmt_format(_underlying); + final result = _ICU4XTimeZoneFormatter_include_localized_gmt_format(_underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } } // ignore: non_constant_identifier_names - static final _ICU4XTimeZoneFormatter_include_localized_gmt_format = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function(ffi.Pointer)>>( - 'ICU4XTimeZoneFormatter_include_localized_gmt_format') - .asFunction<_ResultVoidInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XTimeZoneFormatter_include_localized_gmt_format = + _capi)>>('ICU4XTimeZoneFormatter_include_localized_gmt_format') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer)>(isLeaf: true); /// Loads ISO-8601 format. Example: "-07:00" /// @@ -217,22 +169,16 @@ final class TimeZoneFormatter implements ffi.Finalizable { /// /// Throws [Error] on failure. void loadIso8601Format(IsoTimeZoneOptions options) { - final result = _ICU4XTimeZoneFormatter_load_iso_8601_format( - _underlying, options._underlying); + final result = _ICU4XTimeZoneFormatter_load_iso_8601_format(_underlying, options._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } } // ignore: non_constant_identifier_names - static final _ICU4XTimeZoneFormatter_load_iso_8601_format = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function( - ffi.Pointer, _IsoTimeZoneOptionsFfi)>>( - 'ICU4XTimeZoneFormatter_load_iso_8601_format') - .asFunction< - _ResultVoidInt32 Function( - ffi.Pointer, _IsoTimeZoneOptionsFfi)>(isLeaf: true); + static final _ICU4XTimeZoneFormatter_load_iso_8601_format = + _capi, _IsoTimeZoneOptionsFfi)>>('ICU4XTimeZoneFormatter_load_iso_8601_format') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, _IsoTimeZoneOptionsFfi)>(isLeaf: true); /// Formats a [`CustomTimeZone`] to a string. /// @@ -243,8 +189,7 @@ final class TimeZoneFormatter implements ffi.Finalizable { /// Throws [Error] on failure. String formatCustomTimeZone(CustomTimeZone value) { final writeable = _Writeable(); - final result = _ICU4XTimeZoneFormatter_format_custom_time_zone( - _underlying, value._underlying, writeable._underlying); + final result = _ICU4XTimeZoneFormatter_format_custom_time_zone(_underlying, value._underlying, writeable._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } @@ -252,12 +197,7 @@ final class TimeZoneFormatter implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XTimeZoneFormatter_format_custom_time_zone = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function(ffi.Pointer, - ffi.Pointer, ffi.Pointer)>>( - 'ICU4XTimeZoneFormatter_format_custom_time_zone') - .asFunction< - _ResultVoidInt32 Function(ffi.Pointer, - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XTimeZoneFormatter_format_custom_time_zone = + _capi, ffi.Pointer, ffi.Pointer)>>('ICU4XTimeZoneFormatter_format_custom_time_zone') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer, ffi.Pointer)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/TitlecaseMapper.g.dart b/ffi/capi/dart/package/lib/src/TitlecaseMapper.g.dart index 7a8e5ed0351..a25cafe889f 100644 --- a/ffi/capi/dart/package/lib/src/TitlecaseMapper.g.dart +++ b/ffi/capi/dart/package/lib/src/TitlecaseMapper.g.dart @@ -13,8 +13,7 @@ final class TitlecaseMapper implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XTitlecaseMapper_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XTitlecaseMapper_destroy')); /// Construct a new `TitlecaseMapper` instance /// @@ -28,13 +27,11 @@ final class TitlecaseMapper implements ffi.Finalizable { } return TitlecaseMapper._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XTitlecaseMapper_create = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer)>>('ICU4XTitlecaseMapper_create') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XTitlecaseMapper_create = + _capi)>>('ICU4XTitlecaseMapper_create') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// Returns the full titlecase mapping of the given string /// @@ -43,19 +40,11 @@ final class TitlecaseMapper implements ffi.Finalizable { /// See the [Rust documentation for `titlecase_segment`](https://docs.rs/icu/latest/icu/casemap/struct.TitlecaseMapper.html#method.titlecase_segment) for more information. /// /// Throws [Error] on failure. - String titlecaseSegmentV1( - String s, Locale locale, TitlecaseOptionsV1 options) { + String titlecaseSegmentV1(String s, Locale locale, TitlecaseOptionsV1 options) { final alloc = ffi2.Arena(); final sSlice = _SliceFfi2Utf8._fromDart(s, alloc); - final writeable = _Writeable(); - final result = _ICU4XTitlecaseMapper_titlecase_segment_v1( - _underlying, - sSlice._bytes, - sSlice._length, - locale._underlying, - options._underlying, - writeable._underlying); + final result = _ICU4XTitlecaseMapper_titlecase_segment_v1(_underlying, sSlice._bytes, sSlice._length, locale._underlying, options._underlying, writeable._underlying); alloc.releaseAll(); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); @@ -64,22 +53,7 @@ final class TitlecaseMapper implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XTitlecaseMapper_titlecase_segment_v1 = _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function( - ffi.Pointer, - ffi.Pointer, - ffi.Size, - ffi.Pointer, - _TitlecaseOptionsV1Ffi, - ffi.Pointer)>>( - 'ICU4XTitlecaseMapper_titlecase_segment_v1') - .asFunction< - _ResultVoidInt32 Function( - ffi.Pointer, - ffi.Pointer, - int, - ffi.Pointer, - _TitlecaseOptionsV1Ffi, - ffi.Pointer)>(isLeaf: true); + static final _ICU4XTitlecaseMapper_titlecase_segment_v1 = + _capi, ffi.Pointer, ffi.Size, ffi.Pointer, _TitlecaseOptionsV1Ffi, ffi.Pointer)>>('ICU4XTitlecaseMapper_titlecase_segment_v1') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer, int, ffi.Pointer, _TitlecaseOptionsV1Ffi, ffi.Pointer)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/TitlecaseOptionsV1.g.dart b/ffi/capi/dart/package/lib/src/TitlecaseOptionsV1.g.dart index 555d96874cb..b95c86cec8d 100644 --- a/ffi/capi/dart/package/lib/src/TitlecaseOptionsV1.g.dart +++ b/ffi/capi/dart/package/lib/src/TitlecaseOptionsV1.g.dart @@ -26,14 +26,12 @@ final class TitlecaseOptionsV1 { return result; } - LeadingAdjustment get leadingAdjustment => - LeadingAdjustment.values[_underlying.leadingAdjustment]; + LeadingAdjustment get leadingAdjustment => LeadingAdjustment.values[_underlying.leadingAdjustment]; set leadingAdjustment(LeadingAdjustment leadingAdjustment) { _underlying.leadingAdjustment = leadingAdjustment.index; } - TrailingCase get trailingCase => - TrailingCase.values[_underlying.trailingCase]; + TrailingCase get trailingCase => TrailingCase.values[_underlying.trailingCase]; set trailingCase(TrailingCase trailingCase) { _underlying.trailingCase = trailingCase.index; } @@ -43,11 +41,11 @@ final class TitlecaseOptionsV1 { final result = _ICU4XTitlecaseOptionsV1_default_options(); return TitlecaseOptionsV1._(result); } + // ignore: non_constant_identifier_names static final _ICU4XTitlecaseOptionsV1_default_options = - _capi>( - 'ICU4XTitlecaseOptionsV1_default_options') - .asFunction<_TitlecaseOptionsV1Ffi Function()>(isLeaf: true); + _capi>('ICU4XTitlecaseOptionsV1_default_options') + .asFunction<_TitlecaseOptionsV1Ffi Function()>(isLeaf: true); @override bool operator ==(Object other) => diff --git a/ffi/capi/dart/package/lib/src/TrailingCase.g.dart b/ffi/capi/dart/package/lib/src/TrailingCase.g.dart index b7c39792f03..87fe7b50756 100644 --- a/ffi/capi/dart/package/lib/src/TrailingCase.g.dart +++ b/ffi/capi/dart/package/lib/src/TrailingCase.g.dart @@ -8,5 +8,6 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `TrailingCase`](https://docs.rs/icu/latest/icu/casemap/titlecase/enum.TrailingCase.html) for more information. enum TrailingCase { lower, + unchanged; } diff --git a/ffi/capi/dart/package/lib/src/TransformResult.g.dart b/ffi/capi/dart/package/lib/src/TransformResult.g.dart index f2200bc09e1..dd9eed61981 100644 --- a/ffi/capi/dart/package/lib/src/TransformResult.g.dart +++ b/ffi/capi/dart/package/lib/src/TransformResult.g.dart @@ -10,5 +10,6 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `TransformResult`](https://docs.rs/icu/latest/icu/locid_transform/enum.TransformResult.html) for more information. enum TransformResult { modified, + unmodified; } diff --git a/ffi/capi/dart/package/lib/src/UnicodeSetData.g.dart b/ffi/capi/dart/package/lib/src/UnicodeSetData.g.dart index bc45469968d..7a41d5298ea 100644 --- a/ffi/capi/dart/package/lib/src/UnicodeSetData.g.dart +++ b/ffi/capi/dart/package/lib/src/UnicodeSetData.g.dart @@ -19,8 +19,7 @@ final class UnicodeSetData implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XUnicodeSetData_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XUnicodeSetData_destroy')); /// Checks whether the string is in the set. /// @@ -28,21 +27,15 @@ final class UnicodeSetData implements ffi.Finalizable { bool contains(String s) { final alloc = ffi2.Arena(); final sSlice = _SliceFfi2Utf8._fromDart(s, alloc); - - final result = _ICU4XUnicodeSetData_contains( - _underlying, sSlice._bytes, sSlice._length); + final result = _ICU4XUnicodeSetData_contains(_underlying, sSlice._bytes, sSlice._length); alloc.releaseAll(); return result; } // ignore: non_constant_identifier_names - static final _ICU4XUnicodeSetData_contains = _capi< - ffi.NativeFunction< - ffi.Bool Function(ffi.Pointer, ffi.Pointer, - ffi.Size)>>('ICU4XUnicodeSetData_contains') - .asFunction< - bool Function(ffi.Pointer, ffi.Pointer, - int)>(isLeaf: true); + static final _ICU4XUnicodeSetData_contains = + _capi, ffi.Pointer, ffi.Size)>>('ICU4XUnicodeSetData_contains') + .asFunction, ffi.Pointer, int)>(isLeaf: true); /// Checks whether the code point is in the set. /// @@ -53,10 +46,8 @@ final class UnicodeSetData implements ffi.Finalizable { } // ignore: non_constant_identifier_names - static final _ICU4XUnicodeSetData_contains_char = _capi< - ffi.NativeFunction< - ffi.Bool Function(ffi.Pointer, - ffi.Uint32)>>('ICU4XUnicodeSetData_contains_char') + static final _ICU4XUnicodeSetData_contains_char = + _capi, ffi.Uint32)>>('ICU4XUnicodeSetData_contains_char') .asFunction, int)>(isLeaf: true); /// See the [Rust documentation for `basic_emoji`](https://docs.rs/icu/latest/icu/properties/sets/fn.basic_emoji.html) for more information. @@ -69,121 +60,89 @@ final class UnicodeSetData implements ffi.Finalizable { } return UnicodeSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XUnicodeSetData_load_basic_emoji = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XUnicodeSetData_load_basic_emoji') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XUnicodeSetData_load_basic_emoji = + _capi)>>('ICU4XUnicodeSetData_load_basic_emoji') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `exemplars_main`](https://docs.rs/icu/latest/icu/properties/exemplar_chars/fn.exemplars_main.html) for more information. /// /// Throws [Error] on failure. - factory UnicodeSetData.loadExemplarsMain( - DataProvider provider, Locale locale) { - final result = _ICU4XUnicodeSetData_load_exemplars_main( - provider._underlying, locale._underlying); + factory UnicodeSetData.loadExemplarsMain(DataProvider provider, Locale locale) { + final result = _ICU4XUnicodeSetData_load_exemplars_main(provider._underlying, locale._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return UnicodeSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XUnicodeSetData_load_exemplars_main = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer, ffi.Pointer)>>( - 'ICU4XUnicodeSetData_load_exemplars_main') - .asFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XUnicodeSetData_load_exemplars_main = + _capi, ffi.Pointer)>>('ICU4XUnicodeSetData_load_exemplars_main') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer, ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `exemplars_auxiliary`](https://docs.rs/icu/latest/icu/properties/exemplar_chars/fn.exemplars_auxiliary.html) for more information. /// /// Throws [Error] on failure. - factory UnicodeSetData.loadExemplarsAuxiliary( - DataProvider provider, Locale locale) { - final result = _ICU4XUnicodeSetData_load_exemplars_auxiliary( - provider._underlying, locale._underlying); + factory UnicodeSetData.loadExemplarsAuxiliary(DataProvider provider, Locale locale) { + final result = _ICU4XUnicodeSetData_load_exemplars_auxiliary(provider._underlying, locale._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return UnicodeSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XUnicodeSetData_load_exemplars_auxiliary = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer, ffi.Pointer)>>( - 'ICU4XUnicodeSetData_load_exemplars_auxiliary') - .asFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XUnicodeSetData_load_exemplars_auxiliary = + _capi, ffi.Pointer)>>('ICU4XUnicodeSetData_load_exemplars_auxiliary') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer, ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `exemplars_punctuation`](https://docs.rs/icu/latest/icu/properties/exemplar_chars/fn.exemplars_punctuation.html) for more information. /// /// Throws [Error] on failure. - factory UnicodeSetData.loadExemplarsPunctuation( - DataProvider provider, Locale locale) { - final result = _ICU4XUnicodeSetData_load_exemplars_punctuation( - provider._underlying, locale._underlying); + factory UnicodeSetData.loadExemplarsPunctuation(DataProvider provider, Locale locale) { + final result = _ICU4XUnicodeSetData_load_exemplars_punctuation(provider._underlying, locale._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return UnicodeSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XUnicodeSetData_load_exemplars_punctuation = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer, ffi.Pointer)>>( - 'ICU4XUnicodeSetData_load_exemplars_punctuation') - .asFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XUnicodeSetData_load_exemplars_punctuation = + _capi, ffi.Pointer)>>('ICU4XUnicodeSetData_load_exemplars_punctuation') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer, ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `exemplars_numbers`](https://docs.rs/icu/latest/icu/properties/exemplar_chars/fn.exemplars_numbers.html) for more information. /// /// Throws [Error] on failure. - factory UnicodeSetData.loadExemplarsNumbers( - DataProvider provider, Locale locale) { - final result = _ICU4XUnicodeSetData_load_exemplars_numbers( - provider._underlying, locale._underlying); + factory UnicodeSetData.loadExemplarsNumbers(DataProvider provider, Locale locale) { + final result = _ICU4XUnicodeSetData_load_exemplars_numbers(provider._underlying, locale._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return UnicodeSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XUnicodeSetData_load_exemplars_numbers = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer, ffi.Pointer)>>( - 'ICU4XUnicodeSetData_load_exemplars_numbers') - .asFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XUnicodeSetData_load_exemplars_numbers = + _capi, ffi.Pointer)>>('ICU4XUnicodeSetData_load_exemplars_numbers') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer, ffi.Pointer)>(isLeaf: true); /// See the [Rust documentation for `exemplars_index`](https://docs.rs/icu/latest/icu/properties/exemplar_chars/fn.exemplars_index.html) for more information. /// /// Throws [Error] on failure. - factory UnicodeSetData.loadExemplarsIndex( - DataProvider provider, Locale locale) { - final result = _ICU4XUnicodeSetData_load_exemplars_index( - provider._underlying, locale._underlying); + factory UnicodeSetData.loadExemplarsIndex(DataProvider provider, Locale locale) { + final result = _ICU4XUnicodeSetData_load_exemplars_index(provider._underlying, locale._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return UnicodeSetData._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XUnicodeSetData_load_exemplars_index = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer, ffi.Pointer)>>( - 'ICU4XUnicodeSetData_load_exemplars_index') - .asFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XUnicodeSetData_load_exemplars_index = + _capi, ffi.Pointer)>>('ICU4XUnicodeSetData_load_exemplars_index') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer, ffi.Pointer)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/WeekCalculator.g.dart b/ffi/capi/dart/package/lib/src/WeekCalculator.g.dart index 72509b38570..69e382876a6 100644 --- a/ffi/capi/dart/package/lib/src/WeekCalculator.g.dart +++ b/ffi/capi/dart/package/lib/src/WeekCalculator.g.dart @@ -15,8 +15,7 @@ final class WeekCalculator implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XWeekCalculator_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XWeekCalculator_destroy')); /// Creates a new [`WeekCalculator`] from locale data. /// @@ -24,37 +23,28 @@ final class WeekCalculator implements ffi.Finalizable { /// /// Throws [Error] on failure. factory WeekCalculator(DataProvider provider, Locale locale) { - final result = - _ICU4XWeekCalculator_create(provider._underlying, locale._underlying); + final result = _ICU4XWeekCalculator_create(provider._underlying, locale._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return WeekCalculator._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XWeekCalculator_create = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer, - ffi.Pointer)>>('ICU4XWeekCalculator_create') - .asFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer, ffi.Pointer)>(isLeaf: true); + static final _ICU4XWeekCalculator_create = + _capi, ffi.Pointer)>>('ICU4XWeekCalculator_create') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer, ffi.Pointer)>(isLeaf: true); /// Additional information: [1](https://docs.rs/icu/latest/icu/calendar/week/struct.WeekCalculator.html#structfield.first_weekday), [2](https://docs.rs/icu/latest/icu/calendar/week/struct.WeekCalculator.html#structfield.min_week_days) - factory WeekCalculator.fromFirstDayOfWeekAndMinWeekDays( - IsoWeekday firstWeekday, int minWeekDays) { - final result = - _ICU4XWeekCalculator_create_from_first_day_of_week_and_min_week_days( - firstWeekday._underlying, minWeekDays); + factory WeekCalculator.fromFirstDayOfWeekAndMinWeekDays(IsoWeekday firstWeekday, int minWeekDays) { + final result = _ICU4XWeekCalculator_create_from_first_day_of_week_and_min_week_days(firstWeekday._underlying, minWeekDays); return WeekCalculator._(result); } + // ignore: non_constant_identifier_names static final _ICU4XWeekCalculator_create_from_first_day_of_week_and_min_week_days = - _capi< - ffi.NativeFunction< - ffi.Pointer Function(ffi.Int32, ffi.Uint8)>>( - 'ICU4XWeekCalculator_create_from_first_day_of_week_and_min_week_days') - .asFunction Function(int, int)>(isLeaf: true); + _capi Function(ffi.Int32, ffi.Uint8)>>('ICU4XWeekCalculator_create_from_first_day_of_week_and_min_week_days') + .asFunction Function(int, int)>(isLeaf: true); /// Returns the weekday that starts the week for this object's locale /// @@ -66,9 +56,8 @@ final class WeekCalculator implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XWeekCalculator_first_weekday = - _capi)>>( - 'ICU4XWeekCalculator_first_weekday') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XWeekCalculator_first_weekday') + .asFunction)>(isLeaf: true); /// The minimum number of days overlapping a year required for a week to be /// considered part of that year @@ -81,7 +70,6 @@ final class WeekCalculator implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XWeekCalculator_min_week_days = - _capi)>>( - 'ICU4XWeekCalculator_min_week_days') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XWeekCalculator_min_week_days') + .asFunction)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/WeekRelativeUnit.g.dart b/ffi/capi/dart/package/lib/src/WeekRelativeUnit.g.dart index dc3a3fc9b63..0f46b419772 100644 --- a/ffi/capi/dart/package/lib/src/WeekRelativeUnit.g.dart +++ b/ffi/capi/dart/package/lib/src/WeekRelativeUnit.g.dart @@ -8,6 +8,8 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `RelativeUnit`](https://docs.rs/icu/latest/icu/calendar/week/enum.RelativeUnit.html) for more information. enum WeekRelativeUnit { previous, + current, + next; } diff --git a/ffi/capi/dart/package/lib/src/WordBreakIteratorLatin1.g.dart b/ffi/capi/dart/package/lib/src/WordBreakIteratorLatin1.g.dart index 3e08c258763..00466950d70 100644 --- a/ffi/capi/dart/package/lib/src/WordBreakIteratorLatin1.g.dart +++ b/ffi/capi/dart/package/lib/src/WordBreakIteratorLatin1.g.dart @@ -13,8 +13,7 @@ final class WordBreakIteratorLatin1 implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XWordBreakIteratorLatin1_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XWordBreakIteratorLatin1_destroy')); /// Finds the next breakpoint. Returns -1 if at the end of the string or if the index is /// out of range of a 32-bit signed integer. @@ -27,9 +26,8 @@ final class WordBreakIteratorLatin1 implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XWordBreakIteratorLatin1_next = - _capi)>>( - 'ICU4XWordBreakIteratorLatin1_next') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XWordBreakIteratorLatin1_next') + .asFunction)>(isLeaf: true); /// Return the status value of break boundary. /// @@ -41,9 +39,8 @@ final class WordBreakIteratorLatin1 implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XWordBreakIteratorLatin1_word_type = - _capi)>>( - 'ICU4XWordBreakIteratorLatin1_word_type') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XWordBreakIteratorLatin1_word_type') + .asFunction)>(isLeaf: true); /// Return true when break boundary is word-like such as letter/number/CJK /// @@ -55,7 +52,6 @@ final class WordBreakIteratorLatin1 implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XWordBreakIteratorLatin1_is_word_like = - _capi)>>( - 'ICU4XWordBreakIteratorLatin1_is_word_like') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XWordBreakIteratorLatin1_is_word_like') + .asFunction)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/WordBreakIteratorUtf16.g.dart b/ffi/capi/dart/package/lib/src/WordBreakIteratorUtf16.g.dart index 4f9c24b10d5..0e2ae4eef90 100644 --- a/ffi/capi/dart/package/lib/src/WordBreakIteratorUtf16.g.dart +++ b/ffi/capi/dart/package/lib/src/WordBreakIteratorUtf16.g.dart @@ -13,8 +13,7 @@ final class WordBreakIteratorUtf16 implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XWordBreakIteratorUtf16_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XWordBreakIteratorUtf16_destroy')); /// Finds the next breakpoint. Returns -1 if at the end of the string or if the index is /// out of range of a 32-bit signed integer. @@ -27,9 +26,8 @@ final class WordBreakIteratorUtf16 implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XWordBreakIteratorUtf16_next = - _capi)>>( - 'ICU4XWordBreakIteratorUtf16_next') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XWordBreakIteratorUtf16_next') + .asFunction)>(isLeaf: true); /// Return the status value of break boundary. /// @@ -41,9 +39,8 @@ final class WordBreakIteratorUtf16 implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XWordBreakIteratorUtf16_word_type = - _capi)>>( - 'ICU4XWordBreakIteratorUtf16_word_type') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XWordBreakIteratorUtf16_word_type') + .asFunction)>(isLeaf: true); /// Return true when break boundary is word-like such as letter/number/CJK /// @@ -55,7 +52,6 @@ final class WordBreakIteratorUtf16 implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XWordBreakIteratorUtf16_is_word_like = - _capi)>>( - 'ICU4XWordBreakIteratorUtf16_is_word_like') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XWordBreakIteratorUtf16_is_word_like') + .asFunction)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/WordBreakIteratorUtf8.g.dart b/ffi/capi/dart/package/lib/src/WordBreakIteratorUtf8.g.dart index 077d98a183f..71fe4cf2459 100644 --- a/ffi/capi/dart/package/lib/src/WordBreakIteratorUtf8.g.dart +++ b/ffi/capi/dart/package/lib/src/WordBreakIteratorUtf8.g.dart @@ -13,8 +13,7 @@ final class WordBreakIteratorUtf8 implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XWordBreakIteratorUtf8_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XWordBreakIteratorUtf8_destroy')); /// Finds the next breakpoint. Returns -1 if at the end of the string or if the index is /// out of range of a 32-bit signed integer. @@ -27,9 +26,8 @@ final class WordBreakIteratorUtf8 implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XWordBreakIteratorUtf8_next = - _capi)>>( - 'ICU4XWordBreakIteratorUtf8_next') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XWordBreakIteratorUtf8_next') + .asFunction)>(isLeaf: true); /// Return the status value of break boundary. /// @@ -41,9 +39,8 @@ final class WordBreakIteratorUtf8 implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XWordBreakIteratorUtf8_word_type = - _capi)>>( - 'ICU4XWordBreakIteratorUtf8_word_type') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XWordBreakIteratorUtf8_word_type') + .asFunction)>(isLeaf: true); /// Return true when break boundary is word-like such as letter/number/CJK /// @@ -55,7 +52,6 @@ final class WordBreakIteratorUtf8 implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XWordBreakIteratorUtf8_is_word_like = - _capi)>>( - 'ICU4XWordBreakIteratorUtf8_is_word_like') - .asFunction)>(isLeaf: true); + _capi)>>('ICU4XWordBreakIteratorUtf8_is_word_like') + .asFunction)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/WordSegmenter.g.dart b/ffi/capi/dart/package/lib/src/WordSegmenter.g.dart index 9309e7419d4..834833b8951 100644 --- a/ffi/capi/dart/package/lib/src/WordSegmenter.g.dart +++ b/ffi/capi/dart/package/lib/src/WordSegmenter.g.dart @@ -15,8 +15,7 @@ final class WordSegmenter implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XWordSegmenter_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XWordSegmenter_destroy')); /// Construct an [`WordSegmenter`] with automatically selecting the best available LSTM /// or dictionary payload data. @@ -34,13 +33,11 @@ final class WordSegmenter implements ffi.Finalizable { } return WordSegmenter._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XWordSegmenter_create_auto = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer)>>('ICU4XWordSegmenter_create_auto') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XWordSegmenter_create_auto = + _capi)>>('ICU4XWordSegmenter_create_auto') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// Construct an [`WordSegmenter`] with LSTM payload data for Burmese, Khmer, Lao, and /// Thai. @@ -58,13 +55,11 @@ final class WordSegmenter implements ffi.Finalizable { } return WordSegmenter._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XWordSegmenter_create_lstm = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer)>>('ICU4XWordSegmenter_create_lstm') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XWordSegmenter_create_lstm = + _capi)>>('ICU4XWordSegmenter_create_lstm') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// Construct an [`WordSegmenter`] with dictionary payload data for Chinese, Japanese, /// Burmese, Khmer, Lao, and Thai. @@ -79,13 +74,11 @@ final class WordSegmenter implements ffi.Finalizable { } return WordSegmenter._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XWordSegmenter_create_dictionary = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer)>>( - 'ICU4XWordSegmenter_create_dictionary') - .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>( - isLeaf: true); + static final _ICU4XWordSegmenter_create_dictionary = + _capi)>>('ICU4XWordSegmenter_create_dictionary') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer)>(isLeaf: true); /// Segments a (potentially ill-formed) UTF-8 string. /// @@ -93,23 +86,15 @@ final class WordSegmenter implements ffi.Finalizable { WordBreakIteratorUtf8 segmentUtf8(String input) { final alloc = ffi2.Arena(); final inputSlice = _SliceFfi2Utf8._fromDart(input, alloc); - - final result = _ICU4XWordSegmenter_segment_utf8( - _underlying, inputSlice._bytes, inputSlice._length); + final result = _ICU4XWordSegmenter_segment_utf8(_underlying, inputSlice._bytes, inputSlice._length); alloc.releaseAll(); return WordBreakIteratorUtf8._(result); } // ignore: non_constant_identifier_names - static final _ICU4XWordSegmenter_segment_utf8 = _capi< - ffi.NativeFunction< - ffi.Pointer Function( - ffi.Pointer, - ffi.Pointer, - ffi.Size)>>('ICU4XWordSegmenter_segment_utf8') - .asFunction< - ffi.Pointer Function(ffi.Pointer, - ffi.Pointer, int)>(isLeaf: true); + static final _ICU4XWordSegmenter_segment_utf8 = + _capi Function(ffi.Pointer, ffi.Pointer, ffi.Size)>>('ICU4XWordSegmenter_segment_utf8') + .asFunction Function(ffi.Pointer, ffi.Pointer, int)>(isLeaf: true); /// Segments a UTF-16 string. /// @@ -117,23 +102,15 @@ final class WordSegmenter implements ffi.Finalizable { WordBreakIteratorUtf16 segmentUtf16(Uint16List input) { final alloc = ffi2.Arena(); final inputSlice = _SliceFfiUint16._fromDart(input, alloc); - - final result = _ICU4XWordSegmenter_segment_utf16( - _underlying, inputSlice._bytes, inputSlice._length); + final result = _ICU4XWordSegmenter_segment_utf16(_underlying, inputSlice._bytes, inputSlice._length); alloc.releaseAll(); return WordBreakIteratorUtf16._(result); } // ignore: non_constant_identifier_names - static final _ICU4XWordSegmenter_segment_utf16 = _capi< - ffi.NativeFunction< - ffi.Pointer Function( - ffi.Pointer, - ffi.Pointer, - ffi.Size)>>('ICU4XWordSegmenter_segment_utf16') - .asFunction< - ffi.Pointer Function(ffi.Pointer, - ffi.Pointer, int)>(isLeaf: true); + static final _ICU4XWordSegmenter_segment_utf16 = + _capi Function(ffi.Pointer, ffi.Pointer, ffi.Size)>>('ICU4XWordSegmenter_segment_utf16') + .asFunction Function(ffi.Pointer, ffi.Pointer, int)>(isLeaf: true); /// Segments a Latin-1 string. /// @@ -141,21 +118,13 @@ final class WordSegmenter implements ffi.Finalizable { WordBreakIteratorLatin1 segmentLatin1(Uint8List input) { final alloc = ffi2.Arena(); final inputSlice = _SliceFfiUint8._fromDart(input, alloc); - - final result = _ICU4XWordSegmenter_segment_latin1( - _underlying, inputSlice._bytes, inputSlice._length); + final result = _ICU4XWordSegmenter_segment_latin1(_underlying, inputSlice._bytes, inputSlice._length); alloc.releaseAll(); return WordBreakIteratorLatin1._(result); } // ignore: non_constant_identifier_names - static final _ICU4XWordSegmenter_segment_latin1 = _capi< - ffi.NativeFunction< - ffi.Pointer Function( - ffi.Pointer, - ffi.Pointer, - ffi.Size)>>('ICU4XWordSegmenter_segment_latin1') - .asFunction< - ffi.Pointer Function(ffi.Pointer, - ffi.Pointer, int)>(isLeaf: true); + static final _ICU4XWordSegmenter_segment_latin1 = + _capi Function(ffi.Pointer, ffi.Pointer, ffi.Size)>>('ICU4XWordSegmenter_segment_latin1') + .asFunction Function(ffi.Pointer, ffi.Pointer, int)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/ZonedDateTimeFormatter.g.dart b/ffi/capi/dart/package/lib/src/ZonedDateTimeFormatter.g.dart index f79093b07d3..3f6e25fc654 100644 --- a/ffi/capi/dart/package/lib/src/ZonedDateTimeFormatter.g.dart +++ b/ffi/capi/dart/package/lib/src/ZonedDateTimeFormatter.g.dart @@ -15,8 +15,7 @@ final class ZonedDateTimeFormatter implements ffi.Finalizable { _finalizer.attach(this, _underlying.cast()); } - static final _finalizer = - ffi.NativeFinalizer(_capi('ICU4XZonedDateTimeFormatter_destroy')); + static final _finalizer = ffi.NativeFinalizer(_capi('ICU4XZonedDateTimeFormatter_destroy')); /// Creates a new [`ZonedDateTimeFormatter`] from locale data. /// @@ -26,27 +25,18 @@ final class ZonedDateTimeFormatter implements ffi.Finalizable { /// See the [Rust documentation for `try_new`](https://docs.rs/icu/latest/icu/datetime/struct.ZonedDateTimeFormatter.html#method.try_new) for more information. /// /// Throws [Error] on failure. - factory ZonedDateTimeFormatter.withLengths(DataProvider provider, - Locale locale, DateLength dateLength, TimeLength timeLength) { - final result = _ICU4XZonedDateTimeFormatter_create_with_lengths( - provider._underlying, - locale._underlying, - dateLength.index, - timeLength.index); + factory ZonedDateTimeFormatter.withLengths(DataProvider provider, Locale locale, DateLength dateLength, TimeLength timeLength) { + final result = _ICU4XZonedDateTimeFormatter_create_with_lengths(provider._underlying, locale._underlying, dateLength.index, timeLength.index); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return ZonedDateTimeFormatter._(result.union.ok); } + // ignore: non_constant_identifier_names - static final _ICU4XZonedDateTimeFormatter_create_with_lengths = _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function(ffi.Pointer, - ffi.Pointer, ffi.Int32, ffi.Int32)>>( - 'ICU4XZonedDateTimeFormatter_create_with_lengths') - .asFunction< - _ResultOpaqueInt32 Function(ffi.Pointer, - ffi.Pointer, int, int)>(isLeaf: true); + static final _ICU4XZonedDateTimeFormatter_create_with_lengths = + _capi, ffi.Pointer, ffi.Int32, ffi.Int32)>>('ICU4XZonedDateTimeFormatter_create_with_lengths') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer, ffi.Pointer, int, int)>(isLeaf: true); /// Creates a new [`ZonedDateTimeFormatter`] from locale data. /// @@ -56,57 +46,27 @@ final class ZonedDateTimeFormatter implements ffi.Finalizable { /// See the [Rust documentation for `try_new`](https://docs.rs/icu/latest/icu/datetime/struct.ZonedDateTimeFormatter.html#method.try_new) for more information. /// /// Throws [Error] on failure. - factory ZonedDateTimeFormatter.withLengthsAndIso8601TimeZoneFallback( - DataProvider provider, - Locale locale, - DateLength dateLength, - TimeLength timeLength, - IsoTimeZoneOptions zoneOptions) { - final result = - _ICU4XZonedDateTimeFormatter_create_with_lengths_and_iso_8601_time_zone_fallback( - provider._underlying, - locale._underlying, - dateLength.index, - timeLength.index, - zoneOptions._underlying); + factory ZonedDateTimeFormatter.withLengthsAndIso8601TimeZoneFallback(DataProvider provider, Locale locale, DateLength dateLength, TimeLength timeLength, IsoTimeZoneOptions zoneOptions) { + final result = _ICU4XZonedDateTimeFormatter_create_with_lengths_and_iso_8601_time_zone_fallback(provider._underlying, locale._underlying, dateLength.index, timeLength.index, zoneOptions._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } return ZonedDateTimeFormatter._(result.union.ok); } + // ignore: non_constant_identifier_names static final _ICU4XZonedDateTimeFormatter_create_with_lengths_and_iso_8601_time_zone_fallback = - _capi< - ffi.NativeFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer, - ffi.Pointer, - ffi.Int32, - ffi.Int32, - _IsoTimeZoneOptionsFfi)>>( - 'ICU4XZonedDateTimeFormatter_create_with_lengths_and_iso_8601_time_zone_fallback') - .asFunction< - _ResultOpaqueInt32 Function( - ffi.Pointer, - ffi.Pointer, - int, - int, - _IsoTimeZoneOptionsFfi)>(isLeaf: true); + _capi, ffi.Pointer, ffi.Int32, ffi.Int32, _IsoTimeZoneOptionsFfi)>>('ICU4XZonedDateTimeFormatter_create_with_lengths_and_iso_8601_time_zone_fallback') + .asFunction<_ResultOpaqueInt32 Function(ffi.Pointer, ffi.Pointer, int, int, _IsoTimeZoneOptionsFfi)>(isLeaf: true); /// Formats a [`DateTime`] and [`CustomTimeZone`] to a string. /// /// See the [Rust documentation for `format`](https://docs.rs/icu/latest/icu/datetime/struct.ZonedDateTimeFormatter.html#method.format) for more information. /// /// Throws [Error] on failure. - String formatDatetimeWithCustomTimeZone( - DateTime datetime, CustomTimeZone timeZone) { + String formatDatetimeWithCustomTimeZone(DateTime datetime, CustomTimeZone timeZone) { final writeable = _Writeable(); - final result = - _ICU4XZonedDateTimeFormatter_format_datetime_with_custom_time_zone( - _underlying, - datetime._underlying, - timeZone._underlying, - writeable._underlying); + final result = _ICU4XZonedDateTimeFormatter_format_datetime_with_custom_time_zone(_underlying, datetime._underlying, timeZone._underlying, writeable._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } @@ -115,35 +75,17 @@ final class ZonedDateTimeFormatter implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XZonedDateTimeFormatter_format_datetime_with_custom_time_zone = - _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function( - ffi.Pointer, - ffi.Pointer, - ffi.Pointer, - ffi.Pointer)>>( - 'ICU4XZonedDateTimeFormatter_format_datetime_with_custom_time_zone') - .asFunction< - _ResultVoidInt32 Function( - ffi.Pointer, - ffi.Pointer, - ffi.Pointer, - ffi.Pointer)>(isLeaf: true); + _capi, ffi.Pointer, ffi.Pointer, ffi.Pointer)>>('ICU4XZonedDateTimeFormatter_format_datetime_with_custom_time_zone') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer, ffi.Pointer, ffi.Pointer)>(isLeaf: true); /// Formats a [`IsoDateTime`] and [`CustomTimeZone`] to a string. /// /// See the [Rust documentation for `format`](https://docs.rs/icu/latest/icu/datetime/struct.ZonedDateTimeFormatter.html#method.format) for more information. /// /// Throws [Error] on failure. - String formatIsoDatetimeWithCustomTimeZone( - IsoDateTime datetime, CustomTimeZone timeZone) { + String formatIsoDatetimeWithCustomTimeZone(IsoDateTime datetime, CustomTimeZone timeZone) { final writeable = _Writeable(); - final result = - _ICU4XZonedDateTimeFormatter_format_iso_datetime_with_custom_time_zone( - _underlying, - datetime._underlying, - timeZone._underlying, - writeable._underlying); + final result = _ICU4XZonedDateTimeFormatter_format_iso_datetime_with_custom_time_zone(_underlying, datetime._underlying, timeZone._underlying, writeable._underlying); if (!result.isOk) { throw Error.values.firstWhere((v) => v._underlying == result.union.err); } @@ -152,18 +94,6 @@ final class ZonedDateTimeFormatter implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XZonedDateTimeFormatter_format_iso_datetime_with_custom_time_zone = - _capi< - ffi.NativeFunction< - _ResultVoidInt32 Function( - ffi.Pointer, - ffi.Pointer, - ffi.Pointer, - ffi.Pointer)>>( - 'ICU4XZonedDateTimeFormatter_format_iso_datetime_with_custom_time_zone') - .asFunction< - _ResultVoidInt32 Function( - ffi.Pointer, - ffi.Pointer, - ffi.Pointer, - ffi.Pointer)>(isLeaf: true); + _capi, ffi.Pointer, ffi.Pointer, ffi.Pointer)>>('ICU4XZonedDateTimeFormatter_format_iso_datetime_with_custom_time_zone') + .asFunction<_ResultVoidInt32 Function(ffi.Pointer, ffi.Pointer, ffi.Pointer, ffi.Pointer)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/lib.g.dart b/ffi/capi/dart/package/lib/src/lib.g.dart index 5fd6908158a..547c7108431 100644 --- a/ffi/capi/dart/package/lib/src/lib.g.dart +++ b/ffi/capi/dart/package/lib/src/lib.g.dart @@ -244,6 +244,8 @@ final class _ResultVoidInt32 extends ffi.Struct { } final class _ResultVoidVoid extends ffi.Struct { + + @ffi.Bool() external bool isOk; } @@ -278,13 +280,11 @@ final class _SliceFfi2Utf8 extends ffi.Struct { slice._length = units.length; slice._bytes = allocator(slice._length).cast(); slice._bytes.cast().asTypedList(slice._length).setAll(0, units); - return slice; } // ignore: unused_element - String get _asDart => - Utf8Decoder().convert(_bytes.cast().asTypedList(_length)); + String get _asDart => Utf8Decoder().convert(_bytes.cast().asTypedList(_length)); // This is expensive @override @@ -321,7 +321,6 @@ final class _SliceFfiUint16 extends ffi.Struct { slice._length = value.length; slice._bytes = allocator(slice._length); slice._bytes.asTypedList(slice._length).setAll(0, value); - return slice; } @@ -363,7 +362,6 @@ final class _SliceFfiUint8 extends ffi.Struct { slice._length = value.length; slice._bytes = allocator(slice._length); slice._bytes.asTypedList(slice._length).setAll(0, value); - return slice; } @@ -398,29 +396,22 @@ final class _Writeable { _Writeable() : _underlying = _create(0); static final _create = - _capi Function(ffi.Size)>>( - 'diplomat_buffer_writeable_create') - .asFunction Function(int)>(); + _capi Function(ffi.Size)>>('diplomat_buffer_writeable_create') + .asFunction Function(int)>(); String finalize() { - final string = - _getBytes(_underlying).toDartString(length: _len(_underlying)); + final string = _getBytes(_underlying).toDartString(length: _len(_underlying)); _destroy(_underlying); return string; } + static final _len = + _capi)>>('diplomat_buffer_writeable_len') + .asFunction)>(isLeaf: true); - static final _len = - _capi)>>( - 'diplomat_buffer_writeable_len') - .asFunction)>(isLeaf: true); - static final _getBytes = _capi< - ffi.NativeFunction< - ffi.Pointer Function(ffi.Pointer)>>( - 'diplomat_buffer_writeable_get_bytes') - .asFunction Function(ffi.Pointer)>( - isLeaf: true); + static final _getBytes = + _capi Function(ffi.Pointer)>>('diplomat_buffer_writeable_get_bytes') + .asFunction Function(ffi.Pointer)>(isLeaf: true); static final _destroy = - _capi)>>( - 'diplomat_buffer_writeable_destroy') - .asFunction)>(isLeaf: true); + _capi)>>('diplomat_buffer_writeable_destroy') + .asFunction)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/pubspec.yaml b/ffi/capi/dart/package/pubspec.yaml index c1820933901..ffaac122f0c 100644 --- a/ffi/capi/dart/package/pubspec.yaml +++ b/ffi/capi/dart/package/pubspec.yaml @@ -3,10 +3,10 @@ version: 0.0.0 repository: https://github.com/unicode-org/icu4x environment: - sdk: '>=2.18.0' + sdk: ^3.0.0 dependencies: - ffi: '>=1.1.0' + ffi: ^2.0.0 dev_dependencies: lints: ^3.0.0 From af20c6d8e76bb35096e2549ddf662f4222ee1e1d Mon Sep 17 00:00:00 2001 From: Robert Bastian <4706271+robertbastian@users.noreply.github.com> Date: Mon, 20 Nov 2023 23:23:06 +0100 Subject: [PATCH 05/10] gn --- ffi/gn/Cargo.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ffi/gn/Cargo.lock b/ffi/gn/Cargo.lock index ef5a03b07db..27a4fc5d110 100644 --- a/ffi/gn/Cargo.lock +++ b/ffi/gn/Cargo.lock @@ -120,7 +120,7 @@ checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" [[package]] name = "diplomat" version = "0.7.0" -source = "git+https://github.com/rust-diplomat/diplomat.git?rev=7eee7e90381904fb96d4f188ae689b3ad6a103fd#7eee7e90381904fb96d4f188ae689b3ad6a103fd" +source = "git+https://github.com/rust-diplomat/diplomat.git?rev=fa3747fbc9d41248d8d0c034c3e462a71e8ab6bf#fa3747fbc9d41248d8d0c034c3e462a71e8ab6bf" dependencies = [ "diplomat_core", "proc-macro2", @@ -131,12 +131,12 @@ dependencies = [ [[package]] name = "diplomat-runtime" version = "0.7.0" -source = "git+https://github.com/rust-diplomat/diplomat.git?rev=7eee7e90381904fb96d4f188ae689b3ad6a103fd#7eee7e90381904fb96d4f188ae689b3ad6a103fd" +source = "git+https://github.com/rust-diplomat/diplomat.git?rev=fa3747fbc9d41248d8d0c034c3e462a71e8ab6bf#fa3747fbc9d41248d8d0c034c3e462a71e8ab6bf" [[package]] name = "diplomat_core" version = "0.7.0" -source = "git+https://github.com/rust-diplomat/diplomat.git?rev=7eee7e90381904fb96d4f188ae689b3ad6a103fd#7eee7e90381904fb96d4f188ae689b3ad6a103fd" +source = "git+https://github.com/rust-diplomat/diplomat.git?rev=fa3747fbc9d41248d8d0c034c3e462a71e8ab6bf#fa3747fbc9d41248d8d0c034c3e462a71e8ab6bf" dependencies = [ "lazy_static", "proc-macro2", From 017eaf382c9ea04841646c12651efc5696c722bd Mon Sep 17 00:00:00 2001 From: Robert Bastian <4706271+robertbastian@users.noreply.github.com> Date: Mon, 20 Nov 2023 23:23:15 +0100 Subject: [PATCH 06/10] gn --- ffi/gn/.cargo/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ffi/gn/.cargo/config b/ffi/gn/.cargo/config index b3525580dcd..e216c320765 100644 --- a/ffi/gn/.cargo/config +++ b/ffi/gn/.cargo/config @@ -6,9 +6,9 @@ [source.crates-io] replace-with = "vendored-sources" -[source."git+https://github.com/rust-diplomat/diplomat.git?rev=7eee7e90381904fb96d4f188ae689b3ad6a103fd"] +[source."git+https://github.com/rust-diplomat/diplomat.git?rev=fa3747fbc9d41248d8d0c034c3e462a71e8ab6bf"] git = "https://github.com/rust-diplomat/diplomat.git" -rev = "7eee7e90381904fb96d4f188ae689b3ad6a103fd" +rev = "fa3747fbc9d41248d8d0c034c3e462a71e8ab6bf" replace-with = "vendored-sources" [source.vendored-sources] From 586677428e8d4c92606b3658223bc09c2fc29a23 Mon Sep 17 00:00:00 2001 From: Robert Bastian <4706271+robertbastian@users.noreply.github.com> Date: Tue, 21 Nov 2023 15:23:18 +0100 Subject: [PATCH 07/10] runes --- Cargo.lock | 26 +++++++++++---- Cargo.toml | 8 ++--- .../lib/src/CanonicalCombiningClassMap.g.dart | 4 +-- .../lib/src/CanonicalComposition.g.dart | 4 +-- .../lib/src/CanonicalDecomposition.g.dart | 4 +-- .../dart/package/lib/src/CaseMapCloser.g.dart | 4 +-- .../dart/package/lib/src/CaseMapper.g.dart | 24 +++++++------- .../package/lib/src/CodePointMapData16.g.dart | 4 +-- .../package/lib/src/CodePointMapData8.g.dart | 4 +-- .../lib/src/CodePointSetBuilder.g.dart | 32 +++++++++---------- .../package/lib/src/CodePointSetData.g.dart | 4 +-- .../dart/package/lib/src/Decomposed.g.dart | 12 +++---- .../package/lib/src/UnicodeSetData.g.dart | 4 +-- ffi/capi/dart/package/lib/src/lib.g.dart | 16 ++++++++++ ffi/capi/dart/package/test/icu_test.dart | 12 +++++++ 15 files changed, 101 insertions(+), 61 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cba16a5cdee..8387f295d51 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -796,9 +796,9 @@ dependencies = [ [[package]] name = "diplomat" version = "0.7.0" -source = "git+https://github.com/rust-diplomat/diplomat.git?rev=fa3747fbc9d41248d8d0c034c3e462a71e8ab6bf#fa3747fbc9d41248d8d0c034c3e462a71e8ab6bf" +source = "git+https://github.com/rust-diplomat/diplomat.git?rev=564323d77cc7344b323459473d4a5b295f9830cc#564323d77cc7344b323459473d4a5b295f9830cc" dependencies = [ - "diplomat_core", + "diplomat_core 0.7.0 (git+https://github.com/rust-diplomat/diplomat.git?rev=564323d77cc7344b323459473d4a5b295f9830cc)", "proc-macro2", "quote", "syn 2.0.37", @@ -814,7 +814,7 @@ dependencies = [ [[package]] name = "diplomat-runtime" version = "0.7.0" -source = "git+https://github.com/rust-diplomat/diplomat.git?rev=fa3747fbc9d41248d8d0c034c3e462a71e8ab6bf#fa3747fbc9d41248d8d0c034c3e462a71e8ab6bf" +source = "git+https://github.com/rust-diplomat/diplomat.git?rev=564323d77cc7344b323459473d4a5b295f9830cc#564323d77cc7344b323459473d4a5b295f9830cc" dependencies = [ "log", ] @@ -822,12 +822,11 @@ dependencies = [ [[package]] name = "diplomat-tool" version = "0.7.0" -source = "git+https://github.com/rust-diplomat/diplomat.git?rev=fa3747fbc9d41248d8d0c034c3e462a71e8ab6bf#fa3747fbc9d41248d8d0c034c3e462a71e8ab6bf" dependencies = [ "askama", "clap 3.2.25", "colored", - "diplomat_core", + "diplomat_core 0.7.0", "displaydoc", "heck 0.4.1", "indenter", @@ -842,7 +841,6 @@ dependencies = [ [[package]] name = "diplomat_core" version = "0.7.0" -source = "git+https://github.com/rust-diplomat/diplomat.git?rev=fa3747fbc9d41248d8d0c034c3e462a71e8ab6bf#fa3747fbc9d41248d8d0c034c3e462a71e8ab6bf" dependencies = [ "displaydoc", "lazy_static", @@ -854,6 +852,20 @@ dependencies = [ "syn 2.0.37", ] +[[package]] +name = "diplomat_core" +version = "0.7.0" +source = "git+https://github.com/rust-diplomat/diplomat.git?rev=564323d77cc7344b323459473d4a5b295f9830cc#564323d77cc7344b323459473d4a5b295f9830cc" +dependencies = [ + "lazy_static", + "proc-macro2", + "quote", + "serde", + "smallvec", + "strck_ident", + "syn 2.0.37", +] + [[package]] name = "discard" version = "1.0.4" @@ -1690,7 +1702,7 @@ version = "1.4.0" name = "icu_ffi_coverage" version = "0.0.0" dependencies = [ - "diplomat_core", + "diplomat_core 0.7.0 (git+https://github.com/rust-diplomat/diplomat.git?rev=564323d77cc7344b323459473d4a5b295f9830cc)", "elsa", "lazy_static", "rustdoc-types", diff --git a/Cargo.toml b/Cargo.toml index a5215b2d203..f5f8a428716 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -230,10 +230,10 @@ icu_benchmark_macros = { path = "tools/benchmark/macros" } # The version here can either be a `version = ".."` spec or `git = "https://github.com/rust-diplomat/diplomat", rev = ".."` # Diplomat must be published preceding a new ICU4X release but may use git versions in between -diplomat = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "fa3747fbc9d41248d8d0c034c3e462a71e8ab6bf" } -diplomat-runtime = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "fa3747fbc9d41248d8d0c034c3e462a71e8ab6bf" } -diplomat_core = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "fa3747fbc9d41248d8d0c034c3e462a71e8ab6bf" } -diplomat-tool = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "fa3747fbc9d41248d8d0c034c3e462a71e8ab6bf" } +diplomat = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "564323d77cc7344b323459473d4a5b295f9830cc" } +diplomat-runtime = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "564323d77cc7344b323459473d4a5b295f9830cc" } +diplomat_core = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "564323d77cc7344b323459473d4a5b295f9830cc" } +diplomat-tool = { path = "../diplomat/tool" } # Size optimized builds [profile.release-opt-size] diff --git a/ffi/capi/dart/package/lib/src/CanonicalCombiningClassMap.g.dart b/ffi/capi/dart/package/lib/src/CanonicalCombiningClassMap.g.dart index 210acf77594..e4c8879f979 100644 --- a/ffi/capi/dart/package/lib/src/CanonicalCombiningClassMap.g.dart +++ b/ffi/capi/dart/package/lib/src/CanonicalCombiningClassMap.g.dart @@ -38,7 +38,7 @@ final class CanonicalCombiningClassMap implements ffi.Finalizable { /// See the [Rust documentation for `get`](https://docs.rs/icu/latest/icu/normalizer/properties/struct.CanonicalCombiningClassMap.html#method.get) for more information. /// /// Additional information: [1](https://docs.rs/icu/latest/icu/properties/properties/struct.CanonicalCombiningClass.html) - int operator [](int ch) { + int operator [](Rune ch) { final result = _ICU4XCanonicalCombiningClassMap_get(_underlying, ch); return result; } @@ -46,7 +46,7 @@ final class CanonicalCombiningClassMap implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XCanonicalCombiningClassMap_get = _capi, ffi.Uint32)>>('ICU4XCanonicalCombiningClassMap_get') - .asFunction, int)>(isLeaf: true); + .asFunction, Rune)>(isLeaf: true); /// See the [Rust documentation for `get32`](https://docs.rs/icu/latest/icu/normalizer/properties/struct.CanonicalCombiningClassMap.html#method.get32) for more information. /// diff --git a/ffi/capi/dart/package/lib/src/CanonicalComposition.g.dart b/ffi/capi/dart/package/lib/src/CanonicalComposition.g.dart index 35c82d19f7f..e686fb01ff7 100644 --- a/ffi/capi/dart/package/lib/src/CanonicalComposition.g.dart +++ b/ffi/capi/dart/package/lib/src/CanonicalComposition.g.dart @@ -41,7 +41,7 @@ final class CanonicalComposition implements ffi.Finalizable { /// or returns NUL if these characters don’t compose. Composition exclusions are taken into account. /// /// See the [Rust documentation for `compose`](https://docs.rs/icu/latest/icu/normalizer/properties/struct.CanonicalComposition.html#method.compose) for more information. - int compose(int starter, int second) { + Rune compose(Rune starter, Rune second) { final result = _ICU4XCanonicalComposition_compose(_underlying, starter, second); return result; } @@ -49,5 +49,5 @@ final class CanonicalComposition implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XCanonicalComposition_compose = _capi, ffi.Uint32, ffi.Uint32)>>('ICU4XCanonicalComposition_compose') - .asFunction, int, int)>(isLeaf: true); + .asFunction, Rune, Rune)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/CanonicalDecomposition.g.dart b/ffi/capi/dart/package/lib/src/CanonicalDecomposition.g.dart index 292dac8f25a..4b0fe976e7a 100644 --- a/ffi/capi/dart/package/lib/src/CanonicalDecomposition.g.dart +++ b/ffi/capi/dart/package/lib/src/CanonicalDecomposition.g.dart @@ -40,7 +40,7 @@ final class CanonicalDecomposition implements ffi.Finalizable { /// Performs non-recursive canonical decomposition (including for Hangul). /// /// See the [Rust documentation for `decompose`](https://docs.rs/icu/latest/icu/normalizer/properties/struct.CanonicalDecomposition.html#method.decompose) for more information. - Decomposed decompose(int c) { + Decomposed decompose(Rune c) { final result = _ICU4XCanonicalDecomposition_decompose(_underlying, c); return Decomposed._(result); } @@ -48,5 +48,5 @@ final class CanonicalDecomposition implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XCanonicalDecomposition_decompose = _capi, ffi.Uint32)>>('ICU4XCanonicalDecomposition_decompose') - .asFunction<_DecomposedFfi Function(ffi.Pointer, int)>(isLeaf: true); + .asFunction<_DecomposedFfi Function(ffi.Pointer, Rune)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/CaseMapCloser.g.dart b/ffi/capi/dart/package/lib/src/CaseMapCloser.g.dart index ffb6a9397b4..63680be5c72 100644 --- a/ffi/capi/dart/package/lib/src/CaseMapCloser.g.dart +++ b/ffi/capi/dart/package/lib/src/CaseMapCloser.g.dart @@ -37,14 +37,14 @@ final class CaseMapCloser implements ffi.Finalizable { /// Also adds special case closure mappings. /// /// See the [Rust documentation for `add_case_closure_to`](https://docs.rs/icu/latest/icu/casemap/struct.CaseMapCloser.html#method.add_case_closure_to) for more information. - void addCaseClosureTo(int c, CodePointSetBuilder builder) { + void addCaseClosureTo(Rune c, CodePointSetBuilder builder) { _ICU4XCaseMapCloser_add_case_closure_to(_underlying, c, builder._underlying); } // ignore: non_constant_identifier_names static final _ICU4XCaseMapCloser_add_case_closure_to = _capi, ffi.Uint32, ffi.Pointer)>>('ICU4XCaseMapCloser_add_case_closure_to') - .asFunction, int, ffi.Pointer)>(isLeaf: true); + .asFunction, Rune, ffi.Pointer)>(isLeaf: true); /// Finds all characters and strings which may casemap to `s` as their full case folding string /// and adds them to the set. diff --git a/ffi/capi/dart/package/lib/src/CaseMapper.g.dart b/ffi/capi/dart/package/lib/src/CaseMapper.g.dart index 657b7de77c0..aa86d9e4e9e 100644 --- a/ffi/capi/dart/package/lib/src/CaseMapper.g.dart +++ b/ffi/capi/dart/package/lib/src/CaseMapper.g.dart @@ -161,14 +161,14 @@ final class CaseMapper implements ffi.Finalizable { /// plan on using string case closure mappings too. /// /// See the [Rust documentation for `add_case_closure_to`](https://docs.rs/icu/latest/icu/casemap/struct.CaseMapper.html#method.add_case_closure_to) for more information. - void addCaseClosureTo(int c, CodePointSetBuilder builder) { + void addCaseClosureTo(Rune c, CodePointSetBuilder builder) { _ICU4XCaseMapper_add_case_closure_to(_underlying, c, builder._underlying); } // ignore: non_constant_identifier_names static final _ICU4XCaseMapper_add_case_closure_to = _capi, ffi.Uint32, ffi.Pointer)>>('ICU4XCaseMapper_add_case_closure_to') - .asFunction, int, ffi.Pointer)>(isLeaf: true); + .asFunction, Rune, ffi.Pointer)>(isLeaf: true); /// Returns the simple lowercase mapping of the given character. /// @@ -177,7 +177,7 @@ final class CaseMapper implements ffi.Finalizable { /// For full mappings, use `CaseMapper::lowercase`. /// /// See the [Rust documentation for `simple_lowercase`](https://docs.rs/icu/latest/icu/casemap/struct.CaseMapper.html#method.simple_lowercase) for more information. - int simpleLowercase(int ch) { + Rune simpleLowercase(Rune ch) { final result = _ICU4XCaseMapper_simple_lowercase(_underlying, ch); return result; } @@ -185,7 +185,7 @@ final class CaseMapper implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XCaseMapper_simple_lowercase = _capi, ffi.Uint32)>>('ICU4XCaseMapper_simple_lowercase') - .asFunction, int)>(isLeaf: true); + .asFunction, Rune)>(isLeaf: true); /// Returns the simple uppercase mapping of the given character. /// @@ -194,7 +194,7 @@ final class CaseMapper implements ffi.Finalizable { /// For full mappings, use `CaseMapper::uppercase`. /// /// See the [Rust documentation for `simple_uppercase`](https://docs.rs/icu/latest/icu/casemap/struct.CaseMapper.html#method.simple_uppercase) for more information. - int simpleUppercase(int ch) { + Rune simpleUppercase(Rune ch) { final result = _ICU4XCaseMapper_simple_uppercase(_underlying, ch); return result; } @@ -202,7 +202,7 @@ final class CaseMapper implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XCaseMapper_simple_uppercase = _capi, ffi.Uint32)>>('ICU4XCaseMapper_simple_uppercase') - .asFunction, int)>(isLeaf: true); + .asFunction, Rune)>(isLeaf: true); /// Returns the simple titlecase mapping of the given character. /// @@ -211,7 +211,7 @@ final class CaseMapper implements ffi.Finalizable { /// For full mappings, use `CaseMapper::titlecase_segment`. /// /// See the [Rust documentation for `simple_titlecase`](https://docs.rs/icu/latest/icu/casemap/struct.CaseMapper.html#method.simple_titlecase) for more information. - int simpleTitlecase(int ch) { + Rune simpleTitlecase(Rune ch) { final result = _ICU4XCaseMapper_simple_titlecase(_underlying, ch); return result; } @@ -219,7 +219,7 @@ final class CaseMapper implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XCaseMapper_simple_titlecase = _capi, ffi.Uint32)>>('ICU4XCaseMapper_simple_titlecase') - .asFunction, int)>(isLeaf: true); + .asFunction, Rune)>(isLeaf: true); /// Returns the simple casefolding of the given character. /// @@ -227,7 +227,7 @@ final class CaseMapper implements ffi.Finalizable { /// For full folding, use `CaseMapper::fold`. /// /// See the [Rust documentation for `simple_fold`](https://docs.rs/icu/latest/icu/casemap/struct.CaseMapper.html#method.simple_fold) for more information. - int simpleFold(int ch) { + Rune simpleFold(Rune ch) { final result = _ICU4XCaseMapper_simple_fold(_underlying, ch); return result; } @@ -235,7 +235,7 @@ final class CaseMapper implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XCaseMapper_simple_fold = _capi, ffi.Uint32)>>('ICU4XCaseMapper_simple_fold') - .asFunction, int)>(isLeaf: true); + .asFunction, Rune)>(isLeaf: true); /// Returns the simple casefolding of the given character in the Turkic locale /// @@ -243,7 +243,7 @@ final class CaseMapper implements ffi.Finalizable { /// For full folding, use `CaseMapper::fold_turkic`. /// /// See the [Rust documentation for `simple_fold_turkic`](https://docs.rs/icu/latest/icu/casemap/struct.CaseMapper.html#method.simple_fold_turkic) for more information. - int simpleFoldTurkic(int ch) { + Rune simpleFoldTurkic(Rune ch) { final result = _ICU4XCaseMapper_simple_fold_turkic(_underlying, ch); return result; } @@ -251,5 +251,5 @@ final class CaseMapper implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XCaseMapper_simple_fold_turkic = _capi, ffi.Uint32)>>('ICU4XCaseMapper_simple_fold_turkic') - .asFunction, int)>(isLeaf: true); + .asFunction, Rune)>(isLeaf: true); } diff --git a/ffi/capi/dart/package/lib/src/CodePointMapData16.g.dart b/ffi/capi/dart/package/lib/src/CodePointMapData16.g.dart index 51bd4b222fc..e6f44255177 100644 --- a/ffi/capi/dart/package/lib/src/CodePointMapData16.g.dart +++ b/ffi/capi/dart/package/lib/src/CodePointMapData16.g.dart @@ -26,7 +26,7 @@ final class CodePointMapData16 implements ffi.Finalizable { /// Gets the value for a code point. /// /// See the [Rust documentation for `get`](https://docs.rs/icu/latest/icu/properties/maps/struct.CodePointMapDataBorrowed.html#method.get) for more information. - int operator [](int cp) { + int operator [](Rune cp) { final result = _ICU4XCodePointMapData16_get(_underlying, cp); return result; } @@ -34,7 +34,7 @@ final class CodePointMapData16 implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XCodePointMapData16_get = _capi, ffi.Uint32)>>('ICU4XCodePointMapData16_get') - .asFunction, int)>(isLeaf: true); + .asFunction, Rune)>(isLeaf: true); /// Gets the value for a code point (specified as a 32 bit integer, in UTF-32) int get32(int cp) { diff --git a/ffi/capi/dart/package/lib/src/CodePointMapData8.g.dart b/ffi/capi/dart/package/lib/src/CodePointMapData8.g.dart index 50a4f4d5c76..7db9777e6e4 100644 --- a/ffi/capi/dart/package/lib/src/CodePointMapData8.g.dart +++ b/ffi/capi/dart/package/lib/src/CodePointMapData8.g.dart @@ -26,7 +26,7 @@ final class CodePointMapData8 implements ffi.Finalizable { /// Gets the value for a code point. /// /// See the [Rust documentation for `get`](https://docs.rs/icu/latest/icu/properties/maps/struct.CodePointMapDataBorrowed.html#method.get) for more information. - int operator [](int cp) { + int operator [](Rune cp) { final result = _ICU4XCodePointMapData8_get(_underlying, cp); return result; } @@ -34,7 +34,7 @@ final class CodePointMapData8 implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XCodePointMapData8_get = _capi, ffi.Uint32)>>('ICU4XCodePointMapData8_get') - .asFunction, int)>(isLeaf: true); + .asFunction, Rune)>(isLeaf: true); /// Gets the value for a code point (specified as a 32 bit integer, in UTF-32) int get32(int cp) { diff --git a/ffi/capi/dart/package/lib/src/CodePointSetBuilder.g.dart b/ffi/capi/dart/package/lib/src/CodePointSetBuilder.g.dart index bc5329c42aa..4a68be2f4e9 100644 --- a/ffi/capi/dart/package/lib/src/CodePointSetBuilder.g.dart +++ b/ffi/capi/dart/package/lib/src/CodePointSetBuilder.g.dart @@ -73,26 +73,26 @@ final class CodePointSetBuilder implements ffi.Finalizable { /// Add a single character to the set /// /// See the [Rust documentation for `add_char`](https://docs.rs/icu/latest/icu/collections/codepointinvlist/struct.CodePointInversionListBuilder.html#method.add_char) for more information. - void addChar(int ch) { + void addChar(Rune ch) { _ICU4XCodePointSetBuilder_add_char(_underlying, ch); } // ignore: non_constant_identifier_names static final _ICU4XCodePointSetBuilder_add_char = _capi, ffi.Uint32)>>('ICU4XCodePointSetBuilder_add_char') - .asFunction, int)>(isLeaf: true); + .asFunction, Rune)>(isLeaf: true); /// Add an inclusive range of characters to the set /// /// See the [Rust documentation for `add_range`](https://docs.rs/icu/latest/icu/collections/codepointinvlist/struct.CodePointInversionListBuilder.html#method.add_range) for more information. - void addInclusiveRange(int start, int end) { + void addInclusiveRange(Rune start, Rune end) { _ICU4XCodePointSetBuilder_add_inclusive_range(_underlying, start, end); } // ignore: non_constant_identifier_names static final _ICU4XCodePointSetBuilder_add_inclusive_range = _capi, ffi.Uint32, ffi.Uint32)>>('ICU4XCodePointSetBuilder_add_inclusive_range') - .asFunction, int, int)>(isLeaf: true); + .asFunction, Rune, Rune)>(isLeaf: true); /// Add all elements that belong to the provided set to the set /// @@ -109,26 +109,26 @@ final class CodePointSetBuilder implements ffi.Finalizable { /// Remove a single character to the set /// /// See the [Rust documentation for `remove_char`](https://docs.rs/icu/latest/icu/collections/codepointinvlist/struct.CodePointInversionListBuilder.html#method.remove_char) for more information. - void removeChar(int ch) { + void removeChar(Rune ch) { _ICU4XCodePointSetBuilder_remove_char(_underlying, ch); } // ignore: non_constant_identifier_names static final _ICU4XCodePointSetBuilder_remove_char = _capi, ffi.Uint32)>>('ICU4XCodePointSetBuilder_remove_char') - .asFunction, int)>(isLeaf: true); + .asFunction, Rune)>(isLeaf: true); /// Remove an inclusive range of characters from the set /// /// See the [Rust documentation for `remove_range`](https://docs.rs/icu/latest/icu/collections/codepointinvlist/struct.CodePointInversionListBuilder.html#method.remove_range) for more information. - void removeInclusiveRange(int start, int end) { + void removeInclusiveRange(Rune start, Rune end) { _ICU4XCodePointSetBuilder_remove_inclusive_range(_underlying, start, end); } // ignore: non_constant_identifier_names static final _ICU4XCodePointSetBuilder_remove_inclusive_range = _capi, ffi.Uint32, ffi.Uint32)>>('ICU4XCodePointSetBuilder_remove_inclusive_range') - .asFunction, int, int)>(isLeaf: true); + .asFunction, Rune, Rune)>(isLeaf: true); /// Remove all elements that belong to the provided set from the set /// @@ -145,26 +145,26 @@ final class CodePointSetBuilder implements ffi.Finalizable { /// Removes all elements from the set except a single character /// /// See the [Rust documentation for `retain_char`](https://docs.rs/icu/latest/icu/collections/codepointinvlist/struct.CodePointInversionListBuilder.html#method.retain_char) for more information. - void retainChar(int ch) { + void retainChar(Rune ch) { _ICU4XCodePointSetBuilder_retain_char(_underlying, ch); } // ignore: non_constant_identifier_names static final _ICU4XCodePointSetBuilder_retain_char = _capi, ffi.Uint32)>>('ICU4XCodePointSetBuilder_retain_char') - .asFunction, int)>(isLeaf: true); + .asFunction, Rune)>(isLeaf: true); /// Removes all elements from the set except an inclusive range of characters f /// /// See the [Rust documentation for `retain_range`](https://docs.rs/icu/latest/icu/collections/codepointinvlist/struct.CodePointInversionListBuilder.html#method.retain_range) for more information. - void retainInclusiveRange(int start, int end) { + void retainInclusiveRange(Rune start, Rune end) { _ICU4XCodePointSetBuilder_retain_inclusive_range(_underlying, start, end); } // ignore: non_constant_identifier_names static final _ICU4XCodePointSetBuilder_retain_inclusive_range = _capi, ffi.Uint32, ffi.Uint32)>>('ICU4XCodePointSetBuilder_retain_inclusive_range') - .asFunction, int, int)>(isLeaf: true); + .asFunction, Rune, Rune)>(isLeaf: true); /// Removes all elements from the set except all elements in the provided set /// @@ -183,28 +183,28 @@ final class CodePointSetBuilder implements ffi.Finalizable { /// (Characters which are in this set are removed and vice versa) /// /// See the [Rust documentation for `complement_char`](https://docs.rs/icu/latest/icu/collections/codepointinvlist/struct.CodePointInversionListBuilder.html#method.complement_char) for more information. - void complementChar(int ch) { + void complementChar(Rune ch) { _ICU4XCodePointSetBuilder_complement_char(_underlying, ch); } // ignore: non_constant_identifier_names static final _ICU4XCodePointSetBuilder_complement_char = _capi, ffi.Uint32)>>('ICU4XCodePointSetBuilder_complement_char') - .asFunction, int)>(isLeaf: true); + .asFunction, Rune)>(isLeaf: true); /// Complement an inclusive range of characters from the set /// /// (Characters which are in this set are removed and vice versa) /// /// See the [Rust documentation for `complement_range`](https://docs.rs/icu/latest/icu/collections/codepointinvlist/struct.CodePointInversionListBuilder.html#method.complement_range) for more information. - void complementInclusiveRange(int start, int end) { + void complementInclusiveRange(Rune start, Rune end) { _ICU4XCodePointSetBuilder_complement_inclusive_range(_underlying, start, end); } // ignore: non_constant_identifier_names static final _ICU4XCodePointSetBuilder_complement_inclusive_range = _capi, ffi.Uint32, ffi.Uint32)>>('ICU4XCodePointSetBuilder_complement_inclusive_range') - .asFunction, int, int)>(isLeaf: true); + .asFunction, Rune, Rune)>(isLeaf: true); /// Complement all elements that belong to the provided set from the set /// diff --git a/ffi/capi/dart/package/lib/src/CodePointSetData.g.dart b/ffi/capi/dart/package/lib/src/CodePointSetData.g.dart index 885b4514e31..215667f087a 100644 --- a/ffi/capi/dart/package/lib/src/CodePointSetData.g.dart +++ b/ffi/capi/dart/package/lib/src/CodePointSetData.g.dart @@ -24,7 +24,7 @@ final class CodePointSetData implements ffi.Finalizable { /// Checks whether the code point is in the set. /// /// See the [Rust documentation for `contains`](https://docs.rs/icu/latest/icu/properties/sets/struct.CodePointSetDataBorrowed.html#method.contains) for more information. - bool contains(int cp) { + bool contains(Rune cp) { final result = _ICU4XCodePointSetData_contains(_underlying, cp); return result; } @@ -32,7 +32,7 @@ final class CodePointSetData implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XCodePointSetData_contains = _capi, ffi.Uint32)>>('ICU4XCodePointSetData_contains') - .asFunction, int)>(isLeaf: true); + .asFunction, Rune)>(isLeaf: true); /// Produces an iterator over ranges of code points contained in this set /// diff --git a/ffi/capi/dart/package/lib/src/Decomposed.g.dart b/ffi/capi/dart/package/lib/src/Decomposed.g.dart index 632fb74724e..4469b276e25 100644 --- a/ffi/capi/dart/package/lib/src/Decomposed.g.dart +++ b/ffi/capi/dart/package/lib/src/Decomposed.g.dart @@ -12,9 +12,9 @@ part of 'lib.g.dart'; /// See the [Rust documentation for `Decomposed`](https://docs.rs/icu/latest/icu/normalizer/properties/enum.Decomposed.html) for more information. final class _DecomposedFfi extends ffi.Struct { @ffi.Uint32() - external int first; + external Rune first; @ffi.Uint32() - external int second; + external Rune second; } final class Decomposed { @@ -30,13 +30,13 @@ final class Decomposed { return result; } - int get first => _underlying.first; - set first(int first) { + Rune get first => _underlying.first; + set first(Rune first) { _underlying.first = first; } - int get second => _underlying.second; - set second(int second) { + Rune get second => _underlying.second; + set second(Rune second) { _underlying.second = second; } diff --git a/ffi/capi/dart/package/lib/src/UnicodeSetData.g.dart b/ffi/capi/dart/package/lib/src/UnicodeSetData.g.dart index 7a41d5298ea..e7ec6820f4c 100644 --- a/ffi/capi/dart/package/lib/src/UnicodeSetData.g.dart +++ b/ffi/capi/dart/package/lib/src/UnicodeSetData.g.dart @@ -40,7 +40,7 @@ final class UnicodeSetData implements ffi.Finalizable { /// Checks whether the code point is in the set. /// /// See the [Rust documentation for `contains_char`](https://docs.rs/icu/latest/icu/properties/sets/struct.UnicodeSetDataBorrowed.html#method.contains_char) for more information. - bool containsChar(int cp) { + bool containsChar(Rune cp) { final result = _ICU4XUnicodeSetData_contains_char(_underlying, cp); return result; } @@ -48,7 +48,7 @@ final class UnicodeSetData implements ffi.Finalizable { // ignore: non_constant_identifier_names static final _ICU4XUnicodeSetData_contains_char = _capi, ffi.Uint32)>>('ICU4XUnicodeSetData_contains_char') - .asFunction, int)>(isLeaf: true); + .asFunction, Rune)>(isLeaf: true); /// See the [Rust documentation for `basic_emoji`](https://docs.rs/icu/latest/icu/properties/sets/fn.basic_emoji.html) for more information. /// diff --git a/ffi/capi/dart/package/lib/src/lib.g.dart b/ffi/capi/dart/package/lib/src/lib.g.dart index 547c7108431..3a178c76fe4 100644 --- a/ffi/capi/dart/package/lib/src/lib.g.dart +++ b/ffi/capi/dart/package/lib/src/lib.g.dart @@ -129,6 +129,22 @@ part 'WordBreakIteratorUtf8.g.dart'; part 'WordSegmenter.g.dart'; part 'ZonedDateTimeFormatter.g.dart'; +/// A [Rune] is a Unicode code point, such as `a`, or `💡`. +/// +/// The recommended way to obtain a [Rune] is to create it from a +/// [String], which is conceptually a list of [Runes]. For example, +/// `'a'.runes.first` is equal to the [Rune] `a`. +/// +/// Dart does not have a character/rune literal, so integer literals +/// need to be used. For example the Unicode code point U+1F4A1, `💡`, +/// can be represented by `0x1F4A1`. Note that only values in the ranges +/// `0x0..0xD7FF` and `0xE000..0x10FFFF` (both inclusive) are Unicode +/// code points, and hence valid [Rune]s. +/// +/// A [String] can be constructed from a [Rune] using [String.fromCharCode]. +typedef Rune = int; +typedef RuneList = Uint32List; + late final ffi.Pointer Function(String) _capi; void init(String path) => _capi = ffi.DynamicLibrary.open(path).lookup; diff --git a/ffi/capi/dart/package/test/icu_test.dart b/ffi/capi/dart/package/test/icu_test.dart index 6b64d7f4682..712bd8131c5 100644 --- a/ffi/capi/dart/package/test/icu_test.dart +++ b/ffi/capi/dart/package/test/icu_test.dart @@ -43,4 +43,16 @@ void main() { ..extensionKey = 'ca' ..priority = LocaleFallbackPriority.region)); }); + + test('Runes', () { + Rune a = 'a'.runes.first; + Rune emoji = '💡'.runes.first; + + final emojiSet = CodePointSetData.loadEmoji(DataProvider.compiled()); + expect(emojiSet.contains(a), false); + expect(emojiSet.contains(emoji), true); + + Rune upperA = CaseMapper(DataProvider.compiled()).simpleUppercase(a); + expect(String.fromCharCode(upperA), 'A'); + }); } From 3196002f4609a0291a54e013eb6ee2f7dc658151 Mon Sep 17 00:00:00 2001 From: Robert Bastian <4706271+robertbastian@users.noreply.github.com> Date: Tue, 21 Nov 2023 16:49:37 +0100 Subject: [PATCH 08/10] whoops --- Cargo.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index f5f8a428716..58ba60f5d9b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -230,10 +230,10 @@ icu_benchmark_macros = { path = "tools/benchmark/macros" } # The version here can either be a `version = ".."` spec or `git = "https://github.com/rust-diplomat/diplomat", rev = ".."` # Diplomat must be published preceding a new ICU4X release but may use git versions in between -diplomat = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "564323d77cc7344b323459473d4a5b295f9830cc" } -diplomat-runtime = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "564323d77cc7344b323459473d4a5b295f9830cc" } -diplomat_core = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "564323d77cc7344b323459473d4a5b295f9830cc" } -diplomat-tool = { path = "../diplomat/tool" } +diplomat = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "7e0482c03ad2406e49bcc77795622c632d4cfed6" } +diplomat-runtime = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "7e0482c03ad2406e49bcc77795622c632d4cfed6" } +diplomat_core = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "7e0482c03ad2406e49bcc77795622c632d4cfed6" } +diplomat-tool = { git = "https://github.com/rust-diplomat/diplomat.git", rev = "7e0482c03ad2406e49bcc77795622c632d4cfed6" } # Size optimized builds [profile.release-opt-size] From 14a7e5c184e5a687993c2b872acf330f32c0ff14 Mon Sep 17 00:00:00 2001 From: Robert Bastian <4706271+robertbastian@users.noreply.github.com> Date: Tue, 21 Nov 2023 18:53:32 +0100 Subject: [PATCH 09/10] gen --- Cargo.lock | 26 +++++++----------------- ffi/capi/dart/package/lib/src/lib.g.dart | 1 + 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8387f295d51..6e4be9d2b60 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -796,9 +796,9 @@ dependencies = [ [[package]] name = "diplomat" version = "0.7.0" -source = "git+https://github.com/rust-diplomat/diplomat.git?rev=564323d77cc7344b323459473d4a5b295f9830cc#564323d77cc7344b323459473d4a5b295f9830cc" +source = "git+https://github.com/rust-diplomat/diplomat.git?rev=7e0482c03ad2406e49bcc77795622c632d4cfed6#7e0482c03ad2406e49bcc77795622c632d4cfed6" dependencies = [ - "diplomat_core 0.7.0 (git+https://github.com/rust-diplomat/diplomat.git?rev=564323d77cc7344b323459473d4a5b295f9830cc)", + "diplomat_core", "proc-macro2", "quote", "syn 2.0.37", @@ -814,7 +814,7 @@ dependencies = [ [[package]] name = "diplomat-runtime" version = "0.7.0" -source = "git+https://github.com/rust-diplomat/diplomat.git?rev=564323d77cc7344b323459473d4a5b295f9830cc#564323d77cc7344b323459473d4a5b295f9830cc" +source = "git+https://github.com/rust-diplomat/diplomat.git?rev=7e0482c03ad2406e49bcc77795622c632d4cfed6#7e0482c03ad2406e49bcc77795622c632d4cfed6" dependencies = [ "log", ] @@ -822,11 +822,12 @@ dependencies = [ [[package]] name = "diplomat-tool" version = "0.7.0" +source = "git+https://github.com/rust-diplomat/diplomat.git?rev=7e0482c03ad2406e49bcc77795622c632d4cfed6#7e0482c03ad2406e49bcc77795622c632d4cfed6" dependencies = [ "askama", "clap 3.2.25", "colored", - "diplomat_core 0.7.0", + "diplomat_core", "displaydoc", "heck 0.4.1", "indenter", @@ -841,6 +842,7 @@ dependencies = [ [[package]] name = "diplomat_core" version = "0.7.0" +source = "git+https://github.com/rust-diplomat/diplomat.git?rev=7e0482c03ad2406e49bcc77795622c632d4cfed6#7e0482c03ad2406e49bcc77795622c632d4cfed6" dependencies = [ "displaydoc", "lazy_static", @@ -852,20 +854,6 @@ dependencies = [ "syn 2.0.37", ] -[[package]] -name = "diplomat_core" -version = "0.7.0" -source = "git+https://github.com/rust-diplomat/diplomat.git?rev=564323d77cc7344b323459473d4a5b295f9830cc#564323d77cc7344b323459473d4a5b295f9830cc" -dependencies = [ - "lazy_static", - "proc-macro2", - "quote", - "serde", - "smallvec", - "strck_ident", - "syn 2.0.37", -] - [[package]] name = "discard" version = "1.0.4" @@ -1702,7 +1690,7 @@ version = "1.4.0" name = "icu_ffi_coverage" version = "0.0.0" dependencies = [ - "diplomat_core 0.7.0 (git+https://github.com/rust-diplomat/diplomat.git?rev=564323d77cc7344b323459473d4a5b295f9830cc)", + "diplomat_core", "elsa", "lazy_static", "rustdoc-types", diff --git a/ffi/capi/dart/package/lib/src/lib.g.dart b/ffi/capi/dart/package/lib/src/lib.g.dart index 3a178c76fe4..2e28d9b5f4a 100644 --- a/ffi/capi/dart/package/lib/src/lib.g.dart +++ b/ffi/capi/dart/package/lib/src/lib.g.dart @@ -143,6 +143,7 @@ part 'ZonedDateTimeFormatter.g.dart'; /// /// A [String] can be constructed from a [Rune] using [String.fromCharCode]. typedef Rune = int; +/// A list of [Rune]s. typedef RuneList = Uint32List; late final ffi.Pointer Function(String) _capi; From 728d9232e8f94007e255c79c0880fc216daa3cb5 Mon Sep 17 00:00:00 2001 From: Robert Bastian <4706271+robertbastian@users.noreply.github.com> Date: Tue, 21 Nov 2023 19:03:28 +0100 Subject: [PATCH 10/10] gn --- ffi/gn/.cargo/config | 4 ++-- ffi/gn/Cargo.lock | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ffi/gn/.cargo/config b/ffi/gn/.cargo/config index e216c320765..2b4dfa27fd0 100644 --- a/ffi/gn/.cargo/config +++ b/ffi/gn/.cargo/config @@ -6,9 +6,9 @@ [source.crates-io] replace-with = "vendored-sources" -[source."git+https://github.com/rust-diplomat/diplomat.git?rev=fa3747fbc9d41248d8d0c034c3e462a71e8ab6bf"] +[source."git+https://github.com/rust-diplomat/diplomat.git?rev=7e0482c03ad2406e49bcc77795622c632d4cfed6"] git = "https://github.com/rust-diplomat/diplomat.git" -rev = "fa3747fbc9d41248d8d0c034c3e462a71e8ab6bf" +rev = "7e0482c03ad2406e49bcc77795622c632d4cfed6" replace-with = "vendored-sources" [source.vendored-sources] diff --git a/ffi/gn/Cargo.lock b/ffi/gn/Cargo.lock index 27a4fc5d110..753db1ef307 100644 --- a/ffi/gn/Cargo.lock +++ b/ffi/gn/Cargo.lock @@ -120,7 +120,7 @@ checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" [[package]] name = "diplomat" version = "0.7.0" -source = "git+https://github.com/rust-diplomat/diplomat.git?rev=fa3747fbc9d41248d8d0c034c3e462a71e8ab6bf#fa3747fbc9d41248d8d0c034c3e462a71e8ab6bf" +source = "git+https://github.com/rust-diplomat/diplomat.git?rev=7e0482c03ad2406e49bcc77795622c632d4cfed6#7e0482c03ad2406e49bcc77795622c632d4cfed6" dependencies = [ "diplomat_core", "proc-macro2", @@ -131,12 +131,12 @@ dependencies = [ [[package]] name = "diplomat-runtime" version = "0.7.0" -source = "git+https://github.com/rust-diplomat/diplomat.git?rev=fa3747fbc9d41248d8d0c034c3e462a71e8ab6bf#fa3747fbc9d41248d8d0c034c3e462a71e8ab6bf" +source = "git+https://github.com/rust-diplomat/diplomat.git?rev=7e0482c03ad2406e49bcc77795622c632d4cfed6#7e0482c03ad2406e49bcc77795622c632d4cfed6" [[package]] name = "diplomat_core" version = "0.7.0" -source = "git+https://github.com/rust-diplomat/diplomat.git?rev=fa3747fbc9d41248d8d0c034c3e462a71e8ab6bf#fa3747fbc9d41248d8d0c034c3e462a71e8ab6bf" +source = "git+https://github.com/rust-diplomat/diplomat.git?rev=7e0482c03ad2406e49bcc77795622c632d4cfed6#7e0482c03ad2406e49bcc77795622c632d4cfed6" dependencies = [ "lazy_static", "proc-macro2",