Refactor Local #1072

pitdicker · 2023-05-18T15:51:40Z

This extracts two commits from #1017.

The platform-specific implementations of Local can get quite a bit simpler if they just return the offset for a local or UTC NaiveDateTime, instead of constructing a DateTime themselves. This also allows them to pick up the fix in #1071.

The second commit was for a strange difference: Utc::now uses the standard library to get the current date, while for Local::now we call a Windows API ourselves. Because on both Unix and Windows we (should) get an UTC timestamp from the OS and then convert it to local time, we may just as well always use Utc::now inside Local::now and be consistent.

djc

Great PR!

src/offset/local/unix.rs

src/offset/local/windows.rs

djc · 2023-05-26T09:35:19Z

src/offset/local/stub.rs

@@ -8,218 +8,12 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.

-use std::time::{SystemTime, UNIX_EPOCH};
+use crate::{FixedOffset, LocalResult, NaiveDateTime};


I think I'd prefer to keep the non-WASM and wasmbind code in the same module. Or maybe both stub and wasmbind can become inline modules? In either case, please think about the optimally reviewable commit sequence for making changes like this.

Inline modules are a good idea 👍.

In either case, please think about the optimally reviewable commit sequence for making changes like this.

I made an effort.

Looks good, thanks!

pitdicker · 2023-05-26T12:15:09Z

One builder seemed stuck. I have rebased on the current 0.4.x for another run.

This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [chrono](https://github.com/chronotope/chrono) | dependencies | patch | `0.4.24` -> `0.4.26` | --- ### Release Notes <details> <summary>chronotope/chrono</summary> ### [`v0.4.26`](https://github.com/chronotope/chrono/releases/tag/v0.4.26): 0.4.26 [Compare Source](chronotope/chrono@v0.4.25...v0.4.26) The changes from [#807](chronotope/chrono#807) we merged for 0.4.25 unfortunately restricted parsing in a way that was incompatible with earlier 0.4.x releases. We reverted this in [#1113](chronotope/chrono#1113). A small amount of other changes were merged since. - Update README ([#1111](chronotope/chrono#1111), thanks to [@pitdicker](https://github.com/pitdicker)) - Revert backport of [#807](chronotope/chrono#807) ([#1113](chronotope/chrono#1113), thanks to [@pitdicker](https://github.com/pitdicker)) - Update to 2021 edition ([#1109](chronotope/chrono#1109), thanks to [@tottoto](https://github.com/tottoto)) - Fix `DurationRound` panics from issue [#1010](chronotope/chrono#1010) ([#1093](chronotope/chrono#1093), thanks to [@pitdicker](https://github.com/pitdicker)) - tests: date path consolidate (branch 0.4.x) ([#1090](chronotope/chrono#1090), thanks to [@jtmoon79](https://github.com/jtmoon79)) - Parse tests nanosecond bare dot (branch 0.4.x) ([#1098](chronotope/chrono#1098), thanks to [@jtmoon79](https://github.com/jtmoon79)) - yamllint cleanup lint.yml test.yml ([#1102](chronotope/chrono#1102), thanks to [@jtmoon79](https://github.com/jtmoon79)) - Remove num-iter dependency ([#1107](chronotope/chrono#1107), thanks to [@tottoto](https://github.com/tottoto)) Thanks on behalf of the chrono team ([@djc](https://github.com/djc) and [@esheppa](https://github.com/esheppa)) to all contributors! ### [`v0.4.25`](https://github.com/chronotope/chrono/releases/tag/v0.4.25): 0.4.25 [Compare Source](chronotope/chrono@v0.4.24...v0.4.25) Time for another maintenance release. This release bumps the MSRV to 1.56; given MSRV bumps in chrono's dependencies (notably for syn 2), we felt that it no longer made sense to support any older versions. Feedback welcome in our issue tracker! ##### Additions - Bump the MSRV to 1.56 ([#1053](chronotope/chrono#1053)) - Apply comments from MSRV bump ([#1026](chronotope/chrono#1026), thanks to [@pitdicker](https://github.com/pitdicker)) - Remove num-integer dependency ([#1037](chronotope/chrono#1037), thanks to [@pitdicker](https://github.com/pitdicker)) - Add `NaiveDateTime::and_utc()` method ([#952](chronotope/chrono#952), thanks to [@klnusbaum](https://github.com/klnusbaum)) - derive `Hash` for most pub types that also derive `PartialEq` ([#938](chronotope/chrono#938), thanks to [@bruceg](https://github.com/bruceg)) - Add `parse_and_remainder()` methods ([#1011](chronotope/chrono#1011), thanks to [@pitdicker](https://github.com/pitdicker)) - Add `DateTime::fix_offset()` ([#1030](chronotope/chrono#1030), thanks to [@pitdicker](https://github.com/pitdicker)) - Add `#[track_caller]` to `LocalResult::unwrap` ([#1046](chronotope/chrono#1046), thanks to [@pitdicker](https://github.com/pitdicker)) - Add `#[must_use]` to some methods ([#1007](chronotope/chrono#1007), thanks to [@aceArt-GmbH](https://github.com/aceArt-GmbH)) - Implement `PartialOrd` for `Month` ([#999](chronotope/chrono#999), thanks to [@Munksgaard](https://github.com/Munksgaard)) - Add `impl From<NaiveDateTime> for NaiveDate` ([#1012](chronotope/chrono#1012), thanks to [@pezcore](https://github.com/pezcore)) - Extract timezone info from tzdata file on Android ([#978](chronotope/chrono#978), thanks to [@RumovZ](https://github.com/RumovZ)) ##### Fixes - Prevent string slicing inside char boundaries ([#1024](chronotope/chrono#1024), thanks to [@pitdicker](https://github.com/pitdicker)) - fix IsoWeek so that its flags are always correct ([#991](chronotope/chrono#991), thanks to [@moshevds](https://github.com/moshevds)) - Fix out-of-range panic in `NaiveWeek::last_day` ([#1070](chronotope/chrono#1070), thanks to [@pitdicker](https://github.com/pitdicker)) - Use correct offset in conversion from `Local` to `FixedOffset` ([#1041](chronotope/chrono#1041), thanks to [@pitdicker](https://github.com/pitdicker)) - Fix military timezones in RFC 2822 parsing ([#1013](chronotope/chrono#1013), thanks to [@pitdicker](https://github.com/pitdicker)) - Guard against overflow in NaiveDate::with_\*0 methods ([#1023](chronotope/chrono#1023), thanks to [@pitdicker](https://github.com/pitdicker)) - Fix panic in from_num_days_from_ce_opt ([#1052](chronotope/chrono#1052), thanks to [@pitdicker](https://github.com/pitdicker)) ##### Refactoring - Rely on std for getting local time offset ([#1072](chronotope/chrono#1072), thanks to [@pitdicker](https://github.com/pitdicker)) - Make functions in internals const ([#1043](chronotope/chrono#1043), thanks to [@pitdicker](https://github.com/pitdicker)) - Refactor windows module in `Local` ([#992](chronotope/chrono#992), thanks to [@nekevss](https://github.com/nekevss)) - Simplify from_timestamp_millis, from_timestamp_micros ([#1032](chronotope/chrono#1032), thanks to [@pitdicker](https://github.com/pitdicker)) - Backport [#983](chronotope/chrono#983) and [#1000](chronotope/chrono#1000) ([#1063](chronotope/chrono#1063), thanks to [@pitdicker](https://github.com/pitdicker)) ##### Documentation - Backport documentation improvements ([#1066](chronotope/chrono#1066), thanks to [@pitdicker](https://github.com/pitdicker)) - Add documentation for %Z quirk ([#1051](chronotope/chrono#1051), thanks to [@campbellcole](https://github.com/campbellcole)) - Add an example to Weekday ([#1019](chronotope/chrono#1019), thanks to [@pitdicker](https://github.com/pitdicker)) ##### Internal improvements - Gate test on `clock` feature ([#1061](chronotope/chrono#1061), thanks to [@pitdicker](https://github.com/pitdicker)) - CI: Also run tests with `--no-default-features` ([#1059](chronotope/chrono#1059), thanks to [@pitdicker](https://github.com/pitdicker)) - Prevent `bench_year_flags_from_year` from being optimized out ([#1034](chronotope/chrono#1034), thanks to [@pitdicker](https://github.com/pitdicker)) - Fix test_leap_second during DST transition ([#1064](chronotope/chrono#1064), thanks to [@pitdicker](https://github.com/pitdicker)) - Fix warnings when running tests on Windows ([#1038](chronotope/chrono#1038), thanks to [@pitdicker](https://github.com/pitdicker)) - Fix tests on AIX ([#1028](chronotope/chrono#1028), thanks to [@ecnelises](https://github.com/ecnelises)) - Fix doctest warnings, remove mention of deprecated methods from main doc ([#1081](chronotope/chrono#1081), thanks to [@pitdicker](https://github.com/pitdicker)) - Reformat `test_datetime_parse_from_str` ([#1078](chronotope/chrono#1078), thanks to [@pitdicker](https://github.com/pitdicker)) - GitHub yml shell `set -eux`, use bash ([#1103](chronotope/chrono#1103), thanks to [@jtmoon79](https://github.com/jtmoon79)) - test: explicitly set `LANG` to `c` in gnu `date` ([#1089](chronotope/chrono#1089), thanks to [@scarf005](https://github.com/scarf005)) - Switch test to `TryFrom` ([#1086](chronotope/chrono#1086), thanks to [@pitdicker](https://github.com/pitdicker)) - Add test for issue 551 ([#1020](chronotope/chrono#1020), thanks to [@pitdicker](https://github.com/pitdicker)) - RFC 2822 single-letter obsolete tests ([#1014](chronotope/chrono#1014), thanks to [@jtmoon79](https://github.com/jtmoon79)) - \[CI] Lint Windows target and documentation links ([#1062](chronotope/chrono#1062), thanks to [@pitdicker](https://github.com/pitdicker)) - add test_issue\_866 ([#1077](chronotope/chrono#1077), thanks to [@jtmoon79](https://github.com/jtmoon79)) - Remove AUTHORS metadata ([#1074](chronotope/chrono#1074)) On behalf of [@djc](https://github.com/djc) and [@esheppa](https://github.com/esheppa), thanks to all contributors! </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).  Co-authored-by: cabr2-bot <cabr2.help@gmail.com> Reviewed-on: https://codeberg.org/Calciumdibromid/CaBr2/pulls/1909 Reviewed-by: crapStone <crapstone@noreply.codeberg.org> Co-authored-by: Calciumdibromid Bot <cabr2_bot@noreply.codeberg.org> Co-committed-by: Calciumdibromid Bot <cabr2_bot@noreply.codeberg.org>

pitdicker mentioned this pull request May 18, 2023

Fix panic in TimeZone::from_local_datetime #1071

Merged

pitdicker force-pushed the refactor_local branch from 2da325b to 6d82f95 Compare May 18, 2023 15:57

pitdicker mentioned this pull request May 18, 2023

Windows: base implementation on GetTimeZoneInformationForYear #1017

Merged

djc reviewed May 26, 2023

View reviewed changes

pitdicker force-pushed the refactor_local branch from 6d82f95 to 7b74d3b Compare May 26, 2023 11:47

djc approved these changes May 26, 2023

View reviewed changes

pitdicker force-pushed the refactor_local branch from 7b74d3b to c521150 Compare May 26, 2023 11:52

pitdicker added 4 commits May 26, 2023 14:11

Just rely on the standard library for Local::now

7e1cb63

Only implement the offset_from_ methods on Local

aa6ae09

Move stub into local/mod.rs

23b6d16

Move wasmbind methods into inner module

ec1948d

pitdicker force-pushed the refactor_local branch from c521150 to ec1948d Compare May 26, 2023 12:14

djc merged commit a8f177e into chronotope:0.4.x May 26, 2023
32 checks passed

pitdicker deleted the refactor_local branch May 26, 2023 14:27

This was referenced Jun 4, 2023

Can't leak crate-private type in stub.rs #662

Closed

Test wasm-bindgen feature on CI and fix implementation #1131

Merged

pitdicker mentioned this pull request Feb 7, 2024

Recognize our review capacity is limited for non-trivial work #1417

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Refactor Local #1072

Refactor Local #1072

pitdicker commented May 18, 2023

djc left a comment

djc May 26, 2023

pitdicker May 26, 2023

djc May 26, 2023

pitdicker commented May 26, 2023

Refactor Local #1072

Refactor Local #1072

Conversation

pitdicker commented May 18, 2023

djc left a comment

Choose a reason for hiding this comment

djc May 26, 2023

Choose a reason for hiding this comment

pitdicker May 26, 2023

Choose a reason for hiding this comment

djc May 26, 2023

Choose a reason for hiding this comment

pitdicker commented May 26, 2023