Implement formatting for Chinese calendar with some todos #3760

atcupps · 2023-08-01T17:14:31Z

This PR implements formatting for the Chinese calendar, including adding support for cyclic years U and related ISO years r. There are still some issues to be addressed, however @sffc and I have agreed these are non-blocking for this PR and can be addressed separately (see #3761 and #3762).

provider/datagen/src/transform/cldr/datetime/symbols.rs

Manishearth · 2023-08-02T20:01:58Z

components/calendar/src/types.rs

+}
+
+#[test]
+fn test_get_normal_month_code_if_leap() {


praise: thanks for writing a test!

Manishearth · 2023-08-02T20:02:32Z

provider/datagen/src/transform/cldr/datetime/symbols.rs

    match calendar {
        "gregory" | "buddhist" | "japanese" | "japanext" | "indian" | "persian" | "roc" => {
            &SOLAR_MONTH_CODES[0..12]
        }
-        "coptic" | "ethiopic" | "chinese" => SOLAR_MONTH_CODES,
+        "coptic" | "ethiopic" => SOLAR_MONTH_CODES,
+        "chinese" => LUNAR_MONTH_CODES,


nit: I think here we should actually just return the SOLAR_MONTH_CODES! We're handling the lunar stuff in formatting code.

Manishearth · 2023-08-03T04:29:30Z

components/calendar/src/types.rs

@@ -97,7 +97,7 @@ impl MonthCode {
    /// Returns an option which is Some containing the non-month version of a leap month
    /// if the MonthCode this method is called upon is a leap month, and None otherwise.
    /// This method assumes the MonthCode is valid.
-    pub fn get_normal_if_leap(self) -> Option<MonthCode> {
+    pub fn get_normal_if_leap(&self) -> Option<MonthCode> {


nit: MonthCode is Copy, this should just take self

Manishearth · 2023-08-03T04:34:16Z

components/datetime/src/format/datetime.rs

-                let symbol = symbols.get(code).ok_or(Error::MissingMonthSymbol(code))?;
+
+                let symbol_option = symbols.get(code); //.ok_or(Error::MissingMonthSymbol(code))?;
+                let symbol = if symbol_option.is_none() {


I would use if let Some(symbol) = symbol_option {} else {}

I would also put the write_str call inside the if let, so no need to let symbol = . This way the else branch can pick which order to print things in (and we probably want to output the (leap) after symbol)

I put write_str directly inside the if statement, so there is no more need for symbol or an if let

sffc

I have a few comments which you can fix in a follow-up PR

sffc · 2023-08-08T00:06:05Z

components/calendar/src/types.rs

+        if bytes[3] == b'L' {
+            Some(MonthCode(TinyAsciiStr::from_bytes(&bytes[0..3]).ok()?))
+        } else {
+            None
+        }


Question: how does this code not create a clippy::indexing_slicing failure? Is Clippy smart enough to know that this is a [u8; 4] and that the indices are in range?

sffc · 2023-08-08T00:07:44Z

components/datetime/src/fields/symbols.rs

+        /// TODO: Docs
+        'U' => Cyclic = 2,
+        /// TODO: Docs
+        'r' => RelatedIso = 3,


Nit: File an issue for the TODO since it got merged without fixing. Our linting won't catch this.

sffc · 2023-08-08T00:09:04Z

components/datetime/src/format/datetime.rs

+                        .ok_or(Error::MissingDateSymbols)?
+                        .get_symbols_for_month(month, length)?;
+                    w.write_str(symbols.get(code).ok_or(Error::MissingMonthSymbol(code))?)?;
+                    w.write_str("(leap)")?;


Nit: Add a // TODO(#1234) comment pointing to the issue number

sffc · 2023-08-08T00:09:18Z

components/datetime/src/format/datetime.rs

+    #[test]
+    fn test_year_formatting() {}


Nit: Delete this empty test

sffc · 2023-08-08T00:56:09Z

components/datetime/src/provider/date_time.rs

+        if symbols.is_empty() {
+            return ""; // If symbols is empty, this calendar doesn't use eras (ex. Chinese)
+        }


Issue: Not sure this is the right way to solve this problem. The era symbol should never have been requested if the calendar doesn't have eras. The pre-existing fallback behavior of using the era code name (which is the calendar name) seems acceptable.

sffc · 2023-08-08T00:57:07Z

provider/datagen/src/transform/cldr/datetime/mod.rs

@@ -102,6 +103,7 @@ macro_rules! impl_data_provider {

                    let mundi_name = ethioaa_data
                        .eras
+                       // .ok_or_else(|| DataError::custom("Could not find eras"))?


Nit: Remove old code

sffc · 2023-08-08T00:57:35Z

provider/datagen/src/transform/cldr/datetime/symbols.rs

@@ -64,7 +64,7 @@ fn get_month_code_map(calendar: &str) -> &'static [TinyStr4] {
        "gregory" | "buddhist" | "japanese" | "japanext" | "indian" | "persian" | "roc" => {
            &SOLAR_MONTH_CODES[0..12]
        }
-        "coptic" | "ethiopic" => SOLAR_MONTH_CODES,
+        "coptic" | "ethiopic" | "chinese" => SOLAR_MONTH_CODES,


Please add a TODO comment here with the issue number for fixing leap month formatting

* Docs for `U` and `r` * Delete empty test and add todo * Remove old code and empty era check * Add todo

commit c85e861 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 17:40:53 2023 +0200 borrow SingleID commit 06425a1 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 17:22:03 2023 +0200 fix comment indentation commit 2f70922 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 17:09:13 2023 +0200 update comments commit 47444ee Author: Niels Saurer <[email protected]> Date: Wed Aug 9 17:06:43 2023 +0200 fmt commit c0de3a0 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 17:03:19 2023 +0200 fix clippy, allow testing of intermediate pass1 values commit 227f738 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 16:55:53 2023 +0200 fix compile errors by introducing 2 small clones per transliterator commit 512b158 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 16:49:01 2023 +0200 doesn't compile - missing self deconstruction commit 7848f09 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 16:40:51 2023 +0200 use rule group aggregation in pass1 commit 93663e4 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 16:09:29 2023 +0200 add rule group aggregation commit 57666eb Author: Niels Saurer <[email protected]> Date: Wed Aug 9 14:12:19 2023 +0200 Squash of transliterator-compiler commit d1812b4 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 13:31:53 2023 +0200 fix merge mistake commit f15f6eb Merge: abb91cc a39cfed Author: Niels Saurer <[email protected]> Date: Wed Aug 9 13:27:08 2023 +0200 Merge branch 'main' into transliterator-compiler commit abb91cc Author: Niels Saurer <[email protected]> Date: Wed Aug 9 01:12:13 2023 +0200 reformat tests commit f6a10f5 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 00:30:09 2023 +0200 sizes => counts commit 9ffc2f0 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 00:26:27 2023 +0200 add more docs commit eae5748 Author: Niels Saurer <[email protected]> Date: Tue Aug 8 23:46:20 2023 +0200 remove TODO commit 6b09689 Author: Niels Saurer <[email protected]> Date: Tue Aug 8 23:28:42 2023 +0200 improve docs commit c9b16d5 Author: Niels Saurer <[email protected]> Date: Tue Aug 8 23:15:23 2023 +0200 clippy commit 020a677 Author: Niels Saurer <[email protected]> Date: Tue Aug 8 22:53:14 2023 +0200 add result aggregation to first pass commit 2d1bfd7 Author: Niels Saurer <[email protected]> Date: Tue Aug 8 16:28:23 2023 +0200 add tests commit 6f35ea5 Author: Niels Saurer <[email protected]> Date: Mon Aug 7 22:25:56 2023 +0200 CI fixes commit c6c4844 Author: Niels Saurer <[email protected]> Date: Sun Aug 6 20:06:31 2023 +0200 first steps commit fb68218 Author: Niels Saurer <[email protected]> Date: Wed Jul 19 16:21:33 2023 +0000 Squash transliterator-parser structure for transliterator parser start parsing ':: ... ;' rules complete ::-rule parsing add more global filter tests add negative tests for '::'-rules, be more restrictive update error docs add comment about static UnicodeSet type alias add variable defs escaping and fix unicodeset handling fix unicodeset tests function calls add variable-inside-unicodesets update tests rewrite parse_section using parse_element fix unquoted literal handling add cursor/placeholder tests add cursor support add allow(unused) for this PR remove unused dependencies add todo about inefficient unicodeset variablemap handling allow usage of UnicodeSet's VariableMap directly in TransliteratorParser avoid one allocation per parsed unicodeset remove done todo about allocation-free unicodeset parser hook avoid allocations for number parsing invalid num err with offset update comment switch to allocation free hex parsing (and support for multi escapes) fix main merge conflict support \p unicodesets remove todo for \p unicodeset parsing turn low-prio todo about avoiding clones into note turn non-memory-safety safety comments into regular comments add issue number to TODOs add transliteration component crate commit a39cfed Author: Niels Saurer <[email protected]> Date: Wed Aug 9 13:19:28 2023 +0200 Add Parsing for Rule-Based Transliterators (unicode-org#3730) commit 57e9d59 Author: Andrew Cupps <[email protected]> Date: Tue Aug 8 18:53:26 2023 -0700 Resolve follow-up comments to unicode-org#3760 (unicode-org#3818) * Docs for `U` and `r` * Delete empty test and add todo * Remove old code and empty era check * Add todo

commit ae14cdc Author: Niels Saurer <[email protected]> Date: Wed Aug 9 21:04:38 2023 +0200 clippy commit 8a14e3e Author: Niels Saurer <[email protected]> Date: Wed Aug 9 21:02:28 2023 +0200 tutorials cargo lock commit 4256873 Merge: 72cff57 f549131 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 20:56:20 2023 +0200 Merge branch 'main' into transliterator-datastruct-generation commit 72cff57 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 20:42:03 2023 +0200 refactor pass2 interface commit 8fa4dfd Author: Niels Saurer <[email protected]> Date: Wed Aug 9 20:31:29 2023 +0200 skip compilation of cursors on source side, anchors on target side commit 54b0542 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 19:09:50 2023 +0200 add comment commit cba53a7 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 19:04:27 2023 +0200 fix clippy warnings commit 2dd2ec8 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 19:01:15 2023 +0200 fmt commit 56774fe Author: Niels Saurer <[email protected]> Date: Wed Aug 9 18:45:22 2023 +0200 refactor MutVarTable commit 6176769 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 18:31:18 2023 +0200 revamp pass2 API commit f8459c9 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 18:22:47 2023 +0200 initial final data struct generation commit d6873b0 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 17:48:41 2023 +0200 Squash of transliterator-ir commit c85e861 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 17:40:53 2023 +0200 borrow SingleID commit 06425a1 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 17:22:03 2023 +0200 fix comment indentation commit 2f70922 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 17:09:13 2023 +0200 update comments commit 47444ee Author: Niels Saurer <[email protected]> Date: Wed Aug 9 17:06:43 2023 +0200 fmt commit c0de3a0 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 17:03:19 2023 +0200 fix clippy, allow testing of intermediate pass1 values commit 227f738 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 16:55:53 2023 +0200 fix compile errors by introducing 2 small clones per transliterator commit 512b158 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 16:49:01 2023 +0200 doesn't compile - missing self deconstruction commit 7848f09 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 16:40:51 2023 +0200 use rule group aggregation in pass1 commit 93663e4 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 16:09:29 2023 +0200 add rule group aggregation commit 57666eb Author: Niels Saurer <[email protected]> Date: Wed Aug 9 14:12:19 2023 +0200 Squash of transliterator-compiler commit d1812b4 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 13:31:53 2023 +0200 fix merge mistake commit f15f6eb Merge: abb91cc a39cfed Author: Niels Saurer <[email protected]> Date: Wed Aug 9 13:27:08 2023 +0200 Merge branch 'main' into transliterator-compiler commit abb91cc Author: Niels Saurer <[email protected]> Date: Wed Aug 9 01:12:13 2023 +0200 reformat tests commit f6a10f5 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 00:30:09 2023 +0200 sizes => counts commit 9ffc2f0 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 00:26:27 2023 +0200 add more docs commit eae5748 Author: Niels Saurer <[email protected]> Date: Tue Aug 8 23:46:20 2023 +0200 remove TODO commit 6b09689 Author: Niels Saurer <[email protected]> Date: Tue Aug 8 23:28:42 2023 +0200 improve docs commit c9b16d5 Author: Niels Saurer <[email protected]> Date: Tue Aug 8 23:15:23 2023 +0200 clippy commit 020a677 Author: Niels Saurer <[email protected]> Date: Tue Aug 8 22:53:14 2023 +0200 add result aggregation to first pass commit 2d1bfd7 Author: Niels Saurer <[email protected]> Date: Tue Aug 8 16:28:23 2023 +0200 add tests commit 6f35ea5 Author: Niels Saurer <[email protected]> Date: Mon Aug 7 22:25:56 2023 +0200 CI fixes commit c6c4844 Author: Niels Saurer <[email protected]> Date: Sun Aug 6 20:06:31 2023 +0200 first steps commit fb68218 Author: Niels Saurer <[email protected]> Date: Wed Jul 19 16:21:33 2023 +0000 Squash transliterator-parser structure for transliterator parser start parsing ':: ... ;' rules complete ::-rule parsing add more global filter tests add negative tests for '::'-rules, be more restrictive update error docs add comment about static UnicodeSet type alias add variable defs escaping and fix unicodeset handling fix unicodeset tests function calls add variable-inside-unicodesets update tests rewrite parse_section using parse_element fix unquoted literal handling add cursor/placeholder tests add cursor support add allow(unused) for this PR remove unused dependencies add todo about inefficient unicodeset variablemap handling allow usage of UnicodeSet's VariableMap directly in TransliteratorParser avoid one allocation per parsed unicodeset remove done todo about allocation-free unicodeset parser hook avoid allocations for number parsing invalid num err with offset update comment switch to allocation free hex parsing (and support for multi escapes) fix main merge conflict support \p unicodesets remove todo for \p unicodeset parsing turn low-prio todo about avoiding clones into note turn non-memory-safety safety comments into regular comments add issue number to TODOs add transliteration component crate commit a39cfed Author: Niels Saurer <[email protected]> Date: Wed Aug 9 13:19:28 2023 +0200 Add Parsing for Rule-Based Transliterators (unicode-org#3730) commit 57e9d59 Author: Andrew Cupps <[email protected]> Date: Tue Aug 8 18:53:26 2023 -0700 Resolve follow-up comments to unicode-org#3760 (unicode-org#3818) * Docs for `U` and `r` * Delete empty test and add todo * Remove old code and empty era check * Add todo commit c55c641 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 02:36:53 2023 +0200 wip commit c6cbb0a Author: Niels Saurer <[email protected]> Date: Wed Aug 9 01:20:08 2023 +0200 Squash of transliterator-compiler commit abb91cc Author: Niels Saurer <[email protected]> Date: Wed Aug 9 01:12:13 2023 +0200 reformat tests commit f6a10f5 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 00:30:09 2023 +0200 sizes => counts commit 9ffc2f0 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 00:26:27 2023 +0200 add more docs commit eae5748 Author: Niels Saurer <[email protected]> Date: Tue Aug 8 23:46:20 2023 +0200 remove TODO commit 6b09689 Author: Niels Saurer <[email protected]> Date: Tue Aug 8 23:28:42 2023 +0200 improve docs commit c9b16d5 Author: Niels Saurer <[email protected]> Date: Tue Aug 8 23:15:23 2023 +0200 clippy commit 020a677 Author: Niels Saurer <[email protected]> Date: Tue Aug 8 22:53:14 2023 +0200 add result aggregation to first pass commit 2d1bfd7 Author: Niels Saurer <[email protected]> Date: Tue Aug 8 16:28:23 2023 +0200 add tests commit 6f35ea5 Author: Niels Saurer <[email protected]> Date: Mon Aug 7 22:25:56 2023 +0200 CI fixes commit c6c4844 Author: Niels Saurer <[email protected]> Date: Sun Aug 6 20:06:31 2023 +0200 first steps commit fb68218 Author: Niels Saurer <[email protected]> Date: Wed Jul 19 16:21:33 2023 +0000 Squash transliterator-parser structure for transliterator parser start parsing ':: ... ;' rules complete ::-rule parsing add more global filter tests add negative tests for '::'-rules, be more restrictive update error docs add comment about static UnicodeSet type alias add variable defs escaping and fix unicodeset handling fix unicodeset tests function calls add variable-inside-unicodesets update tests rewrite parse_section using parse_element fix unquoted literal handling add cursor/placeholder tests add cursor support add allow(unused) for this PR remove unused dependencies add todo about inefficient unicodeset variablemap handling allow usage of UnicodeSet's VariableMap directly in TransliteratorParser avoid one allocation per parsed unicodeset remove done todo about allocation-free unicodeset parser hook avoid allocations for number parsing invalid num err with offset update comment switch to allocation free hex parsing (and support for multi escapes) fix main merge conflict support \p unicodesets remove todo for \p unicodeset parsing turn low-prio todo about avoiding clones into note turn non-memory-safety safety comments into regular comments add issue number to TODOs add transliteration component crate

commit 1145a17 Author: Niels Saurer <[email protected]> Date: Thu Aug 10 02:06:46 2023 +0200 Squash merge transliterator-ir commit 9d55038 Author: Niels Saurer <[email protected]> Date: Thu Aug 10 02:03:34 2023 +0200 fix push_front/push_back mixup commit dc8dda7 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 23:02:10 2023 +0200 remove empty line commit bfe5827 Merge: c85e861 f549131 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 20:57:11 2023 +0200 Merge branch 'main' into transliterator-ir commit c85e861 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 17:40:53 2023 +0200 borrow SingleID commit 06425a1 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 17:22:03 2023 +0200 fix comment indentation commit 2f70922 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 17:09:13 2023 +0200 update comments commit 47444ee Author: Niels Saurer <[email protected]> Date: Wed Aug 9 17:06:43 2023 +0200 fmt commit c0de3a0 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 17:03:19 2023 +0200 fix clippy, allow testing of intermediate pass1 values commit 227f738 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 16:55:53 2023 +0200 fix compile errors by introducing 2 small clones per transliterator commit 512b158 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 16:49:01 2023 +0200 doesn't compile - missing self deconstruction commit 7848f09 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 16:40:51 2023 +0200 use rule group aggregation in pass1 commit 93663e4 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 16:09:29 2023 +0200 add rule group aggregation commit 57666eb Author: Niels Saurer <[email protected]> Date: Wed Aug 9 14:12:19 2023 +0200 Squash of transliterator-compiler commit d1812b4 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 13:31:53 2023 +0200 fix merge mistake commit f15f6eb Merge: abb91cc a39cfed Author: Niels Saurer <[email protected]> Date: Wed Aug 9 13:27:08 2023 +0200 Merge branch 'main' into transliterator-compiler commit abb91cc Author: Niels Saurer <[email protected]> Date: Wed Aug 9 01:12:13 2023 +0200 reformat tests commit f6a10f5 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 00:30:09 2023 +0200 sizes => counts commit 9ffc2f0 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 00:26:27 2023 +0200 add more docs commit eae5748 Author: Niels Saurer <[email protected]> Date: Tue Aug 8 23:46:20 2023 +0200 remove TODO commit 6b09689 Author: Niels Saurer <[email protected]> Date: Tue Aug 8 23:28:42 2023 +0200 improve docs commit c9b16d5 Author: Niels Saurer <[email protected]> Date: Tue Aug 8 23:15:23 2023 +0200 clippy commit 020a677 Author: Niels Saurer <[email protected]> Date: Tue Aug 8 22:53:14 2023 +0200 add result aggregation to first pass commit 2d1bfd7 Author: Niels Saurer <[email protected]> Date: Tue Aug 8 16:28:23 2023 +0200 add tests commit 6f35ea5 Author: Niels Saurer <[email protected]> Date: Mon Aug 7 22:25:56 2023 +0200 CI fixes commit c6c4844 Author: Niels Saurer <[email protected]> Date: Sun Aug 6 20:06:31 2023 +0200 first steps commit fb68218 Author: Niels Saurer <[email protected]> Date: Wed Jul 19 16:21:33 2023 +0000 Squash transliterator-parser structure for transliterator parser start parsing ':: ... ;' rules complete ::-rule parsing add more global filter tests add negative tests for '::'-rules, be more restrictive update error docs add comment about static UnicodeSet type alias add variable defs escaping and fix unicodeset handling fix unicodeset tests function calls add variable-inside-unicodesets update tests rewrite parse_section using parse_element fix unquoted literal handling add cursor/placeholder tests add cursor support add allow(unused) for this PR remove unused dependencies add todo about inefficient unicodeset variablemap handling allow usage of UnicodeSet's VariableMap directly in TransliteratorParser avoid one allocation per parsed unicodeset remove done todo about allocation-free unicodeset parser hook avoid allocations for number parsing invalid num err with offset update comment switch to allocation free hex parsing (and support for multi escapes) fix main merge conflict support \p unicodesets remove todo for \p unicodeset parsing turn low-prio todo about avoiding clones into note turn non-memory-safety safety comments into regular comments add issue number to TODOs add transliteration component crate commit 208abd7 Author: Niels Saurer <[email protected]> Date: Thu Aug 10 02:02:23 2023 +0200 add data struct generation tests commit d1f7e7c Author: Niels Saurer <[email protected]> Date: Thu Aug 10 00:58:50 2023 +0200 fix debug_assert bug commit 1f5c8dd Author: Niels Saurer <[email protected]> Date: Wed Aug 9 23:25:17 2023 +0200 refactor pass2 slightly commit ae14cdc Author: Niels Saurer <[email protected]> Date: Wed Aug 9 21:04:38 2023 +0200 clippy commit 8a14e3e Author: Niels Saurer <[email protected]> Date: Wed Aug 9 21:02:28 2023 +0200 tutorials cargo lock commit 4256873 Merge: 72cff57 f549131 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 20:56:20 2023 +0200 Merge branch 'main' into transliterator-datastruct-generation commit 72cff57 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 20:42:03 2023 +0200 refactor pass2 interface commit 8fa4dfd Author: Niels Saurer <[email protected]> Date: Wed Aug 9 20:31:29 2023 +0200 skip compilation of cursors on source side, anchors on target side commit 54b0542 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 19:09:50 2023 +0200 add comment commit cba53a7 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 19:04:27 2023 +0200 fix clippy warnings commit 2dd2ec8 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 19:01:15 2023 +0200 fmt commit 56774fe Author: Niels Saurer <[email protected]> Date: Wed Aug 9 18:45:22 2023 +0200 refactor MutVarTable commit 6176769 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 18:31:18 2023 +0200 revamp pass2 API commit f8459c9 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 18:22:47 2023 +0200 initial final data struct generation commit d6873b0 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 17:48:41 2023 +0200 Squash of transliterator-ir commit c85e861 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 17:40:53 2023 +0200 borrow SingleID commit 06425a1 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 17:22:03 2023 +0200 fix comment indentation commit 2f70922 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 17:09:13 2023 +0200 update comments commit 47444ee Author: Niels Saurer <[email protected]> Date: Wed Aug 9 17:06:43 2023 +0200 fmt commit c0de3a0 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 17:03:19 2023 +0200 fix clippy, allow testing of intermediate pass1 values commit 227f738 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 16:55:53 2023 +0200 fix compile errors by introducing 2 small clones per transliterator commit 512b158 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 16:49:01 2023 +0200 doesn't compile - missing self deconstruction commit 7848f09 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 16:40:51 2023 +0200 use rule group aggregation in pass1 commit 93663e4 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 16:09:29 2023 +0200 add rule group aggregation commit 57666eb Author: Niels Saurer <[email protected]> Date: Wed Aug 9 14:12:19 2023 +0200 Squash of transliterator-compiler commit d1812b4 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 13:31:53 2023 +0200 fix merge mistake commit f15f6eb Merge: abb91cc a39cfed Author: Niels Saurer <[email protected]> Date: Wed Aug 9 13:27:08 2023 +0200 Merge branch 'main' into transliterator-compiler commit abb91cc Author: Niels Saurer <[email protected]> Date: Wed Aug 9 01:12:13 2023 +0200 reformat tests commit f6a10f5 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 00:30:09 2023 +0200 sizes => counts commit 9ffc2f0 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 00:26:27 2023 +0200 add more docs commit eae5748 Author: Niels Saurer <[email protected]> Date: Tue Aug 8 23:46:20 2023 +0200 remove TODO commit 6b09689 Author: Niels Saurer <[email protected]> Date: Tue Aug 8 23:28:42 2023 +0200 improve docs commit c9b16d5 Author: Niels Saurer <[email protected]> Date: Tue Aug 8 23:15:23 2023 +0200 clippy commit 020a677 Author: Niels Saurer <[email protected]> Date: Tue Aug 8 22:53:14 2023 +0200 add result aggregation to first pass commit 2d1bfd7 Author: Niels Saurer <[email protected]> Date: Tue Aug 8 16:28:23 2023 +0200 add tests commit 6f35ea5 Author: Niels Saurer <[email protected]> Date: Mon Aug 7 22:25:56 2023 +0200 CI fixes commit c6c4844 Author: Niels Saurer <[email protected]> Date: Sun Aug 6 20:06:31 2023 +0200 first steps commit fb68218 Author: Niels Saurer <[email protected]> Date: Wed Jul 19 16:21:33 2023 +0000 Squash transliterator-parser structure for transliterator parser start parsing ':: ... ;' rules complete ::-rule parsing add more global filter tests add negative tests for '::'-rules, be more restrictive update error docs add comment about static UnicodeSet type alias add variable defs escaping and fix unicodeset handling fix unicodeset tests function calls add variable-inside-unicodesets update tests rewrite parse_section using parse_element fix unquoted literal handling add cursor/placeholder tests add cursor support add allow(unused) for this PR remove unused dependencies add todo about inefficient unicodeset variablemap handling allow usage of UnicodeSet's VariableMap directly in TransliteratorParser avoid one allocation per parsed unicodeset remove done todo about allocation-free unicodeset parser hook avoid allocations for number parsing invalid num err with offset update comment switch to allocation free hex parsing (and support for multi escapes) fix main merge conflict support \p unicodesets remove todo for \p unicodeset parsing turn low-prio todo about avoiding clones into note turn non-memory-safety safety comments into regular comments add issue number to TODOs add transliteration component crate commit a39cfed Author: Niels Saurer <[email protected]> Date: Wed Aug 9 13:19:28 2023 +0200 Add Parsing for Rule-Based Transliterators (unicode-org#3730) commit 57e9d59 Author: Andrew Cupps <[email protected]> Date: Tue Aug 8 18:53:26 2023 -0700 Resolve follow-up comments to unicode-org#3760 (unicode-org#3818) * Docs for `U` and `r` * Delete empty test and add todo * Remove old code and empty era check * Add todo commit c55c641 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 02:36:53 2023 +0200 wip commit c6cbb0a Author: Niels Saurer <[email protected]> Date: Wed Aug 9 01:20:08 2023 +0200 Squash of transliterator-compiler commit abb91cc Author: Niels Saurer <[email protected]> Date: Wed Aug 9 01:12:13 2023 +0200 reformat tests commit f6a10f5 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 00:30:09 2023 +0200 sizes => counts commit 9ffc2f0 Author: Niels Saurer <[email protected]> Date: Wed Aug 9 00:26:27 2023 +0200 add more docs commit eae5748 Author: Niels Saurer <[email protected]> Date: Tue Aug 8 23:46:20 2023 +0200 remove TODO commit 6b09689 Author: Niels Saurer <[email protected]> Date: Tue Aug 8 23:28:42 2023 +0200 improve docs commit c9b16d5 Author: Niels Saurer <[email protected]> Date: Tue Aug 8 23:15:23 2023 +0200 clippy commit 020a677 Author: Niels Saurer <[email protected]> Date: Tue Aug 8 22:53:14 2023 +0200 add result aggregation to first pass commit 2d1bfd7 Author: Niels Saurer <[email protected]> Date: Tue Aug 8 16:28:23 2023 +0200 add tests commit 6f35ea5 Author: Niels Saurer <[email protected]> Date: Mon Aug 7 22:25:56 2023 +0200 CI fixes commit c6c4844 Author: Niels Saurer <[email protected]> Date: Sun Aug 6 20:06:31 2023 +0200 first steps commit fb68218 Author: Niels Saurer <[email protected]> Date: Wed Jul 19 16:21:33 2023 +0000 Squash transliterator-parser structure for transliterator parser start parsing ':: ... ;' rules complete ::-rule parsing add more global filter tests add negative tests for '::'-rules, be more restrictive update error docs add comment about static UnicodeSet type alias add variable defs escaping and fix unicodeset handling fix unicodeset tests function calls add variable-inside-unicodesets update tests rewrite parse_section using parse_element fix unquoted literal handling add cursor/placeholder tests add cursor support add allow(unused) for this PR remove unused dependencies add todo about inefficient unicodeset variablemap handling allow usage of UnicodeSet's VariableMap directly in TransliteratorParser avoid one allocation per parsed unicodeset remove done todo about allocation-free unicodeset parser hook avoid allocations for number parsing invalid num err with offset update comment switch to allocation free hex parsing (and support for multi escapes) fix main merge conflict support \p unicodesets remove todo for \p unicodeset parsing turn low-prio todo about avoiding clones into note turn non-memory-safety safety comments into regular comments add issue number to TODOs add transliteration component crate

atcupps added 6 commits July 31, 2023 14:47

Necessary additions of Chinese to AnyCalendar

ba3d48c

First phase of formatting for chinese calendar

2afaf93

Add macros for chinese calendar fmt

981a3b5

Add field support for U and r

5f714a8

Merge branch 'extra-year-fields' into chinese-fmt

53995a2

Complete formatting with some todos

29a8c95

atcupps requested review from a team, sffc, robertbastian, Manishearth, zbraniecki, gregtatum and nordzilla as code owners August 1, 2023 17:14

This was referenced Aug 1, 2023

Add data for cyclic year names #3761

Closed

Support field symbols U and r for Bag #3762

Open

atcupps added 4 commits August 1, 2023 10:23

Add issues to todos

7030380

Cargo fmt

5d1a32e

Add files

4370a0e

Merge branch 'main' into chinese-fmt

2b67c84

Manishearth previously approved these changes Aug 1, 2023

View reviewed changes

Merge branch 'main' into chinese-fmt

ec9517b

atcupps dismissed Manishearth’s stale review via ec9517b August 1, 2023 19:55

atcupps requested a review from Manishearth August 1, 2023 19:56

Manishearth requested changes Aug 1, 2023

View reviewed changes

provider/datagen/src/transform/cldr/datetime/symbols.rs Show resolved Hide resolved

robertbastian removed their request for review August 2, 2023 08:59

Manishearth and others added 2 commits August 2, 2023 11:52

get_symbol_for_month -> get_symbols_for_month

b971070

Add get_normal_if_leap method on MonthCode

c61257a

Manishearth reviewed Aug 2, 2023

View reviewed changes

components/calendar/src/types.rs

}

#[test]

fn test_get_normal_month_code_if_leap() {

Copy link

Member

Manishearth Aug 2, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

praise: thanks for writing a test!

Manishearth reviewed Aug 2, 2023

View reviewed changes

Placeholder support for leap months

1b5424d

atcupps requested a review from Manishearth August 2, 2023 22:11

atcupps mentioned this pull request Aug 2, 2023

Support leap months in datetime #3766

Closed

Manishearth reviewed Aug 3, 2023

View reviewed changes

atcupps added 3 commits August 3, 2023 07:41

Address clippy

27c7666

Address comments from @Manishearth

0c5cae8

Merge branch 'main' into chinese-fmt

fb2d2e0

atcupps requested a review from Manishearth August 3, 2023 18:16

Manishearth previously approved these changes Aug 3, 2023

View reviewed changes

Manishearth removed request for zbraniecki, gregtatum and nordzilla August 3, 2023 19:30

Merge branch 'main' into chinese-fmt

e29f54c

atcupps dismissed Manishearth’s stale review via e29f54c August 7, 2023 18:23

atcupps requested review from Manishearth and echeran August 7, 2023 18:24

Manishearth approved these changes Aug 7, 2023

View reviewed changes

Manishearth merged commit 88cae68 into unicode-org:main Aug 7, 2023
25 checks passed

sffc reviewed Aug 8, 2023

View reviewed changes

atcupps mentioned this pull request Aug 8, 2023

Follow up #3760 #3815

Closed

6 tasks

Manishearth pushed a commit that referenced this pull request Aug 9, 2023

Resolve follow-up comments to #3760 (#3818)

57e9d59

* Docs for `U` and `r` * Delete empty test and add todo * Remove old code and empty era check * Add todo

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Implement formatting for Chinese calendar with some todos #3760

Implement formatting for Chinese calendar with some todos #3760

atcupps commented Aug 1, 2023 •

edited

Loading

Manishearth Aug 2, 2023

Manishearth Aug 2, 2023

atcupps Aug 2, 2023

Manishearth Aug 3, 2023

atcupps Aug 3, 2023

Manishearth Aug 3, 2023

atcupps Aug 3, 2023

sffc left a comment

sffc Aug 8, 2023

Manishearth Aug 8, 2023

sffc Aug 8, 2023

sffc Aug 8, 2023

sffc Aug 8, 2023

sffc Aug 8, 2023

sffc Aug 8, 2023

sffc Aug 8, 2023

Implement formatting for Chinese calendar with some todos #3760

Implement formatting for Chinese calendar with some todos #3760

Conversation

atcupps commented Aug 1, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sffc left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

atcupps commented Aug 1, 2023 •

edited

Loading