diff --git a/Cargo.lock b/Cargo.lock index 39a3ebec8b5..dabbbe8a9b1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -613,7 +613,7 @@ dependencies = [ [[package]] name = "diplomat" version = "0.8.0" -source = "git+https://github.com/rust-diplomat/diplomat?rev=808d18ae8a1e687e0ccaa41c74ea626157f88826#808d18ae8a1e687e0ccaa41c74ea626157f88826" +source = "git+https://github.com/rust-diplomat/diplomat?rev=b49d63ec2a50a456b4b6e9d072d3650dca153ff8#b49d63ec2a50a456b4b6e9d072d3650dca153ff8" dependencies = [ "diplomat_core", "proc-macro2", @@ -643,7 +643,7 @@ dependencies = [ [[package]] name = "diplomat-runtime" version = "0.8.1" -source = "git+https://github.com/rust-diplomat/diplomat?rev=808d18ae8a1e687e0ccaa41c74ea626157f88826#808d18ae8a1e687e0ccaa41c74ea626157f88826" +source = "git+https://github.com/rust-diplomat/diplomat?rev=b49d63ec2a50a456b4b6e9d072d3650dca153ff8#b49d63ec2a50a456b4b6e9d072d3650dca153ff8" dependencies = [ "log", ] @@ -651,7 +651,7 @@ dependencies = [ [[package]] name = "diplomat-tool" version = "0.8.0" -source = "git+https://github.com/rust-diplomat/diplomat?rev=808d18ae8a1e687e0ccaa41c74ea626157f88826#808d18ae8a1e687e0ccaa41c74ea626157f88826" +source = "git+https://github.com/rust-diplomat/diplomat?rev=b49d63ec2a50a456b4b6e9d072d3650dca153ff8#b49d63ec2a50a456b4b6e9d072d3650dca153ff8" dependencies = [ "askama", "clap", @@ -671,7 +671,7 @@ dependencies = [ [[package]] name = "diplomat_core" version = "0.8.0" -source = "git+https://github.com/rust-diplomat/diplomat?rev=808d18ae8a1e687e0ccaa41c74ea626157f88826#808d18ae8a1e687e0ccaa41c74ea626157f88826" +source = "git+https://github.com/rust-diplomat/diplomat?rev=b49d63ec2a50a456b4b6e9d072d3650dca153ff8#b49d63ec2a50a456b4b6e9d072d3650dca153ff8" dependencies = [ "displaydoc", "either", diff --git a/Cargo.toml b/Cargo.toml index 890b1a83481..f3d1788ce4d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -213,10 +213,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", rev = "808d18ae8a1e687e0ccaa41c74ea626157f88826" } -diplomat-runtime = { git = "https://github.com/rust-diplomat/diplomat", rev = "808d18ae8a1e687e0ccaa41c74ea626157f88826" } -diplomat_core = { git = "https://github.com/rust-diplomat/diplomat", rev = "808d18ae8a1e687e0ccaa41c74ea626157f88826" } -diplomat-tool = { git = "https://github.com/rust-diplomat/diplomat", rev = "808d18ae8a1e687e0ccaa41c74ea626157f88826" } +diplomat = { git = "https://github.com/rust-diplomat/diplomat", rev = "b49d63ec2a50a456b4b6e9d072d3650dca153ff8" } +diplomat-runtime = { git = "https://github.com/rust-diplomat/diplomat", rev = "b49d63ec2a50a456b4b6e9d072d3650dca153ff8" } +diplomat_core = { git = "https://github.com/rust-diplomat/diplomat", rev = "b49d63ec2a50a456b4b6e9d072d3650dca153ff8" } +diplomat-tool = { git = "https://github.com/rust-diplomat/diplomat", rev = "b49d63ec2a50a456b4b6e9d072d3650dca153ff8" } # EXTERNAL DEPENDENCIES # diff --git a/ffi/capi/bindings/demo_gen/index.mjs b/ffi/capi/bindings/demo_gen/index.mjs index 8753148a4aa..5c687c42fcf 100644 --- a/ffi/capi/bindings/demo_gen/index.mjs +++ b/ffi/capi/bindings/demo_gen/index.mjs @@ -59,7 +59,7 @@ let termini = Object.assign({ }, { - name: "Name", + name: "Locale:Name", type: "string", typeUse: "string" } @@ -80,7 +80,7 @@ let termini = Object.assign({ }, { - name: "Name", + name: "Locale:Name", type: "string", typeUse: "string" } @@ -101,19 +101,19 @@ let termini = Object.assign({ }, { - name: "Name", + name: "Locale:Name", type: "string", typeUse: "string" }, { - name: "LeadingAdjustment", + name: "Options:LeadingAdjustment", type: "LeadingAdjustment", typeUse: "enumerator" }, { - name: "TrailingCase", + name: "Options:TrailingCase", type: "TrailingCase", typeUse: "enumerator" } @@ -164,19 +164,19 @@ let termini = Object.assign({ }, { - name: "Name", + name: "Locale:Name", type: "string", typeUse: "string" }, { - name: "LeadingAdjustment", + name: "Options:LeadingAdjustment", type: "LeadingAdjustment", typeUse: "enumerator" }, { - name: "TrailingCase", + name: "Options:TrailingCase", type: "TrailingCase", typeUse: "enumerator" } @@ -191,25 +191,25 @@ let termini = Object.assign({ parameters: [ { - name: "Year", + name: "Self:Year", type: "number", typeUse: "number" }, { - name: "Month", + name: "Self:Month", type: "number", typeUse: "number" }, { - name: "Day", + name: "Self:Day", type: "number", typeUse: "number" }, { - name: "Name", + name: "Locale:Name", type: "string", typeUse: "string" } @@ -224,25 +224,25 @@ let termini = Object.assign({ parameters: [ { - name: "Year", + name: "Self:Year", type: "number", typeUse: "number" }, { - name: "Month", + name: "Self:Month", type: "number", typeUse: "number" }, { - name: "Day", + name: "Self:Day", type: "number", typeUse: "number" }, { - name: "Name", + name: "Locale:Name", type: "string", typeUse: "string" } @@ -257,49 +257,49 @@ let termini = Object.assign({ parameters: [ { - name: "Year", + name: "Self:Year", type: "number", typeUse: "number" }, { - name: "Month", + name: "Self:Month", type: "number", typeUse: "number" }, { - name: "Day", + name: "Self:Day", type: "number", typeUse: "number" }, { - name: "Hour", + name: "Self:Hour", type: "number", typeUse: "number" }, { - name: "Minute", + name: "Self:Minute", type: "number", typeUse: "number" }, { - name: "Second", + name: "Self:Second", type: "number", typeUse: "number" }, { - name: "Nanosecond", + name: "Self:Nanosecond", type: "number", typeUse: "number" }, { - name: "Name", + name: "Locale:Name", type: "string", typeUse: "string" } @@ -314,49 +314,49 @@ let termini = Object.assign({ parameters: [ { - name: "Year", + name: "Self:Year", type: "number", typeUse: "number" }, { - name: "Month", + name: "Self:Month", type: "number", typeUse: "number" }, { - name: "Day", + name: "Self:Day", type: "number", typeUse: "number" }, { - name: "Hour", + name: "Self:Hour", type: "number", typeUse: "number" }, { - name: "Minute", + name: "Self:Minute", type: "number", typeUse: "number" }, { - name: "Second", + name: "Self:Second", type: "number", typeUse: "number" }, { - name: "Nanosecond", + name: "Self:Nanosecond", type: "number", typeUse: "number" }, { - name: "Name", + name: "Locale:Name", type: "string", typeUse: "string" } @@ -371,37 +371,37 @@ let termini = Object.assign({ parameters: [ { - name: "Name", + name: "Locale:Name", type: "string", typeUse: "string" }, { - name: "Length", + name: "Self:Length", type: "DateTimeLength", typeUse: "enumerator" }, { - name: "Year", + name: "Value:Year", type: "number", typeUse: "number" }, { - name: "Month", + name: "Value:Month", type: "number", typeUse: "number" }, { - name: "Day", + name: "Value:Day", type: "number", typeUse: "number" }, { - name: "Name", + name: "Locale:Name", type: "string", typeUse: "string" } @@ -416,31 +416,31 @@ let termini = Object.assign({ parameters: [ { - name: "Name", + name: "Locale:Name", type: "string", typeUse: "string" }, { - name: "Length", + name: "Self:Length", type: "DateTimeLength", typeUse: "enumerator" }, { - name: "Year", + name: "Value:Year", type: "number", typeUse: "number" }, { - name: "Month", + name: "Value:Month", type: "number", typeUse: "number" }, { - name: "Day", + name: "Value:Day", type: "number", typeUse: "number" } @@ -455,61 +455,61 @@ let termini = Object.assign({ parameters: [ { - name: "Name", + name: "Locale:Name", type: "string", typeUse: "string" }, { - name: "Length", + name: "Self:Length", type: "DateTimeLength", typeUse: "enumerator" }, { - name: "Year", + name: "Value:Year", type: "number", typeUse: "number" }, { - name: "Month", + name: "Value:Month", type: "number", typeUse: "number" }, { - name: "Day", + name: "Value:Day", type: "number", typeUse: "number" }, { - name: "Hour", + name: "Value:Hour", type: "number", typeUse: "number" }, { - name: "Minute", + name: "Value:Minute", type: "number", typeUse: "number" }, { - name: "Second", + name: "Value:Second", type: "number", typeUse: "number" }, { - name: "Nanosecond", + name: "Value:Nanosecond", type: "number", typeUse: "number" }, { - name: "Name", + name: "Locale:Name", type: "string", typeUse: "string" } @@ -524,55 +524,55 @@ let termini = Object.assign({ parameters: [ { - name: "Name", + name: "Locale:Name", type: "string", typeUse: "string" }, { - name: "Length", + name: "Self:Length", type: "DateTimeLength", typeUse: "enumerator" }, { - name: "Year", + name: "Value:Year", type: "number", typeUse: "number" }, { - name: "Month", + name: "Value:Month", type: "number", typeUse: "number" }, { - name: "Day", + name: "Value:Day", type: "number", typeUse: "number" }, { - name: "Hour", + name: "Value:Hour", type: "number", typeUse: "number" }, { - name: "Minute", + name: "Value:Minute", type: "number", typeUse: "number" }, { - name: "Second", + name: "Value:Second", type: "number", typeUse: "number" }, { - name: "Nanosecond", + name: "Value:Nanosecond", type: "number", typeUse: "number" } @@ -587,61 +587,61 @@ let termini = Object.assign({ parameters: [ { - name: "Name", + name: "Locale:Name", type: "string", typeUse: "string" }, { - name: "Length", + name: "Self:Length", type: "DateTimeLength", typeUse: "enumerator" }, { - name: "Year", + name: "Value:Year", type: "number", typeUse: "number" }, { - name: "Month", + name: "Value:Month", type: "number", typeUse: "number" }, { - name: "Day", + name: "Value:Day", type: "number", typeUse: "number" }, { - name: "Hour", + name: "Value:Hour", type: "number", typeUse: "number" }, { - name: "Minute", + name: "Value:Minute", type: "number", typeUse: "number" }, { - name: "Second", + name: "Value:Second", type: "number", typeUse: "number" }, { - name: "Nanosecond", + name: "Value:Nanosecond", type: "number", typeUse: "number" }, { - name: "Name", + name: "Locale:Name", type: "string", typeUse: "string" } @@ -656,55 +656,55 @@ let termini = Object.assign({ parameters: [ { - name: "Name", + name: "Locale:Name", type: "string", typeUse: "string" }, { - name: "Length", + name: "Self:Length", type: "DateTimeLength", typeUse: "enumerator" }, { - name: "Year", + name: "Value:Year", type: "number", typeUse: "number" }, { - name: "Month", + name: "Value:Month", type: "number", typeUse: "number" }, { - name: "Day", + name: "Value:Day", type: "number", typeUse: "number" }, { - name: "Hour", + name: "Value:Hour", type: "number", typeUse: "number" }, { - name: "Minute", + name: "Value:Minute", type: "number", typeUse: "number" }, { - name: "Second", + name: "Value:Second", type: "number", typeUse: "number" }, { - name: "Nanosecond", + name: "Value:Nanosecond", type: "number", typeUse: "number" } @@ -719,31 +719,31 @@ let termini = Object.assign({ parameters: [ { - name: "Name", + name: "Locale:Name", type: "string", typeUse: "string" }, { - name: "Length", + name: "Self:Length", type: "DateTimeLength", typeUse: "enumerator" }, { - name: "Year", + name: "Value:Year", type: "number", typeUse: "number" }, { - name: "Month", + name: "Value:Month", type: "number", typeUse: "number" }, { - name: "Day", + name: "Value:Day", type: "number", typeUse: "number" } @@ -758,55 +758,55 @@ let termini = Object.assign({ parameters: [ { - name: "Name", + name: "Locale:Name", type: "string", typeUse: "string" }, { - name: "Length", + name: "Self:Length", type: "DateTimeLength", typeUse: "enumerator" }, { - name: "Year", + name: "Value:Year", type: "number", typeUse: "number" }, { - name: "Month", + name: "Value:Month", type: "number", typeUse: "number" }, { - name: "Day", + name: "Value:Day", type: "number", typeUse: "number" }, { - name: "Hour", + name: "Value:Hour", type: "number", typeUse: "number" }, { - name: "Minute", + name: "Value:Minute", type: "number", typeUse: "number" }, { - name: "Second", + name: "Value:Second", type: "number", typeUse: "number" }, { - name: "Nanosecond", + name: "Value:Nanosecond", type: "number", typeUse: "number" } @@ -821,55 +821,55 @@ let termini = Object.assign({ parameters: [ { - name: "Name", + name: "Locale:Name", type: "string", typeUse: "string" }, { - name: "Length", + name: "Self:Length", type: "DateTimeLength", typeUse: "enumerator" }, { - name: "Year", + name: "Value:Year", type: "number", typeUse: "number" }, { - name: "Month", + name: "Value:Month", type: "number", typeUse: "number" }, { - name: "Day", + name: "Value:Day", type: "number", typeUse: "number" }, { - name: "Hour", + name: "Value:Hour", type: "number", typeUse: "number" }, { - name: "Minute", + name: "Value:Minute", type: "number", typeUse: "number" }, { - name: "Second", + name: "Value:Second", type: "number", typeUse: "number" }, { - name: "Nanosecond", + name: "Value:Nanosecond", type: "number", typeUse: "number" } @@ -884,37 +884,37 @@ let termini = Object.assign({ parameters: [ { - name: "Name", + name: "Locale:Name", type: "string", typeUse: "string" }, { - name: "Length", + name: "Self:Length", type: "DateTimeLength", typeUse: "enumerator" }, { - name: "Hour", + name: "Value:Hour", type: "number", typeUse: "number" }, { - name: "Minute", + name: "Value:Minute", type: "number", typeUse: "number" }, { - name: "Second", + name: "Value:Second", type: "number", typeUse: "number" }, { - name: "Nanosecond", + name: "Value:Nanosecond", type: "number", typeUse: "number" } @@ -929,61 +929,61 @@ let termini = Object.assign({ parameters: [ { - name: "Name", + name: "Locale:Name", type: "string", typeUse: "string" }, { - name: "Length", + name: "Self:Length", type: "DateTimeLength", typeUse: "enumerator" }, { - name: "Year", + name: "Value:Year", type: "number", typeUse: "number" }, { - name: "Month", + name: "Value:Month", type: "number", typeUse: "number" }, { - name: "Day", + name: "Value:Day", type: "number", typeUse: "number" }, { - name: "Hour", + name: "Value:Hour", type: "number", typeUse: "number" }, { - name: "Minute", + name: "Value:Minute", type: "number", typeUse: "number" }, { - name: "Second", + name: "Value:Second", type: "number", typeUse: "number" }, { - name: "Nanosecond", + name: "Value:Nanosecond", type: "number", typeUse: "number" }, { - name: "Name", + name: "Locale:Name", type: "string", typeUse: "string" } @@ -998,55 +998,55 @@ let termini = Object.assign({ parameters: [ { - name: "Name", + name: "Locale:Name", type: "string", typeUse: "string" }, { - name: "Length", + name: "Self:Length", type: "DateTimeLength", typeUse: "enumerator" }, { - name: "Year", + name: "Value:Year", type: "number", typeUse: "number" }, { - name: "Month", + name: "Value:Month", type: "number", typeUse: "number" }, { - name: "Day", + name: "Value:Day", type: "number", typeUse: "number" }, { - name: "Hour", + name: "Value:Hour", type: "number", typeUse: "number" }, { - name: "Minute", + name: "Value:Minute", type: "number", typeUse: "number" }, { - name: "Second", + name: "Value:Second", type: "number", typeUse: "number" }, { - name: "Nanosecond", + name: "Value:Nanosecond", type: "number", typeUse: "number" } @@ -1061,25 +1061,25 @@ let termini = Object.assign({ parameters: [ { - name: "Name", + name: "Locale:Name", type: "string", typeUse: "string" }, { - name: "GroupingStrategy", + name: "Self:GroupingStrategy", type: "FixedDecimalGroupingStrategy", typeUse: "enumerator" }, { - name: "F", + name: "Value:F", type: "number", typeUse: "number" }, { - name: "Magnitude", + name: "Value:Magnitude", type: "number", typeUse: "number" } @@ -1094,13 +1094,13 @@ let termini = Object.assign({ parameters: [ { - name: "F", + name: "Self:F", type: "number", typeUse: "number" }, { - name: "Magnitude", + name: "Self:Magnitude", type: "number", typeUse: "number" } @@ -1115,13 +1115,13 @@ let termini = Object.assign({ parameters: [ { - name: "Name", + name: "Locale:Name", type: "string", typeUse: "string" }, { - name: "Length", + name: "Self:Length", type: "ListLength", typeUse: "enumerator" }, @@ -1142,7 +1142,7 @@ let termini = Object.assign({ parameters: [ { - name: "Name", + name: "Self:Name", type: "string", typeUse: "string" } @@ -1157,7 +1157,7 @@ let termini = Object.assign({ parameters: [ { - name: "Name", + name: "Self:Name", type: "string", typeUse: "string" }, @@ -1178,7 +1178,7 @@ let termini = Object.assign({ parameters: [ { - name: "Name", + name: "Self:Name", type: "string", typeUse: "string" } @@ -1193,7 +1193,7 @@ let termini = Object.assign({ parameters: [ { - name: "Name", + name: "Self:Name", type: "string", typeUse: "string" } @@ -1208,7 +1208,7 @@ let termini = Object.assign({ parameters: [ { - name: "Name", + name: "Self:Name", type: "string", typeUse: "string" } @@ -1238,7 +1238,7 @@ let termini = Object.assign({ parameters: [ { - name: "Name", + name: "Self:Name", type: "string", typeUse: "string" } @@ -1283,19 +1283,19 @@ let termini = Object.assign({ parameters: [ { - name: "Bcp47Id", + name: "Self:Bcp47Id", type: "string", typeUse: "string" }, { - name: "OffsetSeconds", + name: "Self:OffsetSeconds", type: "number", typeUse: "number" }, { - name: "Dst", + name: "Self:Dst", type: "boolean", typeUse: "boolean" } @@ -1310,19 +1310,19 @@ let termini = Object.assign({ parameters: [ { - name: "Bcp47Id", + name: "Self:Bcp47Id", type: "string", typeUse: "string" }, { - name: "OffsetSeconds", + name: "Self:OffsetSeconds", type: "number", typeUse: "number" }, { - name: "Dst", + name: "Self:Dst", type: "boolean", typeUse: "boolean" } @@ -1427,73 +1427,73 @@ let termini = Object.assign({ parameters: [ { - name: "Name", + name: "Locale:Name", type: "string", typeUse: "string" }, { - name: "Length", + name: "Self:Length", type: "DateTimeLength", typeUse: "enumerator" }, { - name: "Year", + name: "Datetime:Year", type: "number", typeUse: "number" }, { - name: "Month", + name: "Datetime:Month", type: "number", typeUse: "number" }, { - name: "Day", + name: "Datetime:Day", type: "number", typeUse: "number" }, { - name: "Hour", + name: "Datetime:Hour", type: "number", typeUse: "number" }, { - name: "Minute", + name: "Datetime:Minute", type: "number", typeUse: "number" }, { - name: "Second", + name: "Datetime:Second", type: "number", typeUse: "number" }, { - name: "Nanosecond", + name: "Datetime:Nanosecond", type: "number", typeUse: "number" }, { - name: "Bcp47Id", + name: "TimeZone:Bcp47Id", type: "string", typeUse: "string" }, { - name: "OffsetSeconds", + name: "TimeZone:OffsetSeconds", type: "number", typeUse: "number" }, { - name: "Dst", + name: "TimeZone:Dst", type: "boolean", typeUse: "boolean" } @@ -1508,79 +1508,79 @@ let termini = Object.assign({ parameters: [ { - name: "Name", + name: "Locale:Name", type: "string", typeUse: "string" }, { - name: "Length", + name: "Self:Length", type: "DateTimeLength", typeUse: "enumerator" }, { - name: "Year", + name: "Datetime:Year", type: "number", typeUse: "number" }, { - name: "Month", + name: "Datetime:Month", type: "number", typeUse: "number" }, { - name: "Day", + name: "Datetime:Day", type: "number", typeUse: "number" }, { - name: "Hour", + name: "Datetime:Hour", type: "number", typeUse: "number" }, { - name: "Minute", + name: "Datetime:Minute", type: "number", typeUse: "number" }, { - name: "Second", + name: "Datetime:Second", type: "number", typeUse: "number" }, { - name: "Nanosecond", + name: "Datetime:Nanosecond", type: "number", typeUse: "number" }, { - name: "Name", + name: "Locale:Name", type: "string", typeUse: "string" }, { - name: "Bcp47Id", + name: "TimeZone:Bcp47Id", type: "string", typeUse: "string" }, { - name: "OffsetSeconds", + name: "TimeZone:OffsetSeconds", type: "number", typeUse: "number" }, { - name: "Dst", + name: "TimeZone:Dst", type: "boolean", typeUse: "boolean" } @@ -1595,73 +1595,73 @@ let termini = Object.assign({ parameters: [ { - name: "Name", + name: "Locale:Name", type: "string", typeUse: "string" }, { - name: "Length", + name: "Self:Length", type: "DateTimeLength", typeUse: "enumerator" }, { - name: "Year", + name: "Datetime:Year", type: "number", typeUse: "number" }, { - name: "Month", + name: "Datetime:Month", type: "number", typeUse: "number" }, { - name: "Day", + name: "Datetime:Day", type: "number", typeUse: "number" }, { - name: "Hour", + name: "Datetime:Hour", type: "number", typeUse: "number" }, { - name: "Minute", + name: "Datetime:Minute", type: "number", typeUse: "number" }, { - name: "Second", + name: "Datetime:Second", type: "number", typeUse: "number" }, { - name: "Nanosecond", + name: "Datetime:Nanosecond", type: "number", typeUse: "number" }, { - name: "Bcp47Id", + name: "TimeZone:Bcp47Id", type: "string", typeUse: "string" }, { - name: "OffsetSeconds", + name: "TimeZone:OffsetSeconds", type: "number", typeUse: "number" }, { - name: "Dst", + name: "TimeZone:Dst", type: "boolean", typeUse: "boolean" }