From 205bdc8c73e7bdda25dd1bd4b703a1680e47acd1 Mon Sep 17 00:00:00 2001
From: Philip Chimento <pchimento@igalia.com>
Date: Thu, 11 Jul 2024 11:42:09 -0700
Subject: [PATCH] Refactor timezone-display into separate methods

If the timezone-display ID is an IANA ID, and we are going with the
approach of not making the localized ("PST" vs "PDT" vs "PT") name part of
this component, then the current time zone doesn't depend on the current
time.

After removing the isDST flag, timezone-display contains two pieces of
data, the ID and the UTC offset. The UTC offset is already available via
a function that takes an Instant as input. The ID could just be available
via its own function that doesn't take any input.

In that case there would be no need for timezone-display.
---
 README.md        |  7 +++---
 imports.md       | 50 +++++++++++++----------------------------
 wit/timezone.wit | 58 ++++++++++++++++++------------------------------
 3 files changed, 40 insertions(+), 75 deletions(-)

diff --git a/README.md b/README.md
index 8af2de6..e1018be 100644
--- a/README.md
+++ b/README.md
@@ -89,10 +89,9 @@ default-monotonic-clock: monotonic-clock
 
 ```rust
     let instant: Instant = system_clock::now();
-
-    let timezone_display: TimezoneDisplay = timezone::display(instant);
-
-    println!("the timezone is {}", timezone_display.id);
+    let id = timezone::id();
+    let offset_h = timezone::utc_offset(instant) as f64 / 3600e9;
+    println!("the timezone is {} at UTC{:+}", id, offset_h);
 ```
 
 ### Detailed design discussion
diff --git a/imports.md b/imports.md
index c181109..a96f702 100644
--- a/imports.md
+++ b/imports.md
@@ -165,51 +165,31 @@ also known as <a href="https://en.wikipedia.org/wiki/Unix_time">Unix Time</a>.</
 <h4><a name="instant"></a><code>type instant</code></h4>
 <p><a href="#instant"><a href="#instant"><code>instant</code></a></a></p>
 <p>
-#### <a name="timezone_display"></a>`record timezone-display`
-<p>Information useful for displaying a specific <a href="#instant"><code>instant</code></a> in the currently
-configured time zone.</p>
-<h5>Record Fields</h5>
-<ul>
-<li>
-<p><a name="timezone_display.utc_offset"></a><a href="#utc_offset"><code>utc-offset</code></a>: <code>s64</code></p>
-<p>The number of nanoseconds difference between UTC time and the local
-time of the timezone.
-<p>The returned value will always be less than 86,400,000,000,000 which
-is the number of nanoseconds in a day (24<em>60</em>60*1e9).</p>
-<p>In implementations that do not expose an actual time zone, this
-should return 0.</p>
-</li>
-<li>
-<p><a name="timezone_display.id"></a><code>id</code>: <code>string</code></p>
-<p>The IANA identifier of the timezone. The id `UTC` indicates
-Coordinated Universal Time. Otherwise, this should be an identifier
-from the IANA Time Zone Database.
+----
+<h3>Functions</h3>
+<h4><a name="id"></a><code>id: func</code></h4>
+<p>Return the IANA identifier of the currently configured timezone. The id
+<code>UTC</code> indicates Coordinated Universal Time. Otherwise, this should be an
+identifier from the IANA Time Zone Database.</p>
 <p>For displaying to a user, the identifier should be converted into a
 localized name by means of an internationalization API.</p>
 <p>In implementations that do not expose an actual time zone, this
 should be the string <code>UTC</code>.</p>
 <p>In time zones that do not have an applicable name, a formatted
 representation of the UTC offset may be returned, such as <code>-04:00</code>.</p>
-</li>
-</ul>
-<hr />
-<h3>Functions</h3>
-<h4><a name="display"></a><code>display: func</code></h4>
-<p>Return information needed to display the given <a href="#instant"><code>instant</code></a> in the
-currently configured time zone. This includes the UTC offset and the
-time zone name.</p>
-<p>If the currently configured timezone cannot be determined, return a
-<a href="#timezone_display"><code>timezone-display</code></a> for <code>UTC</code> with a <a href="#utc_offset"><code>utc-offset</code></a> of 0.</p>
-<h5>Params</h5>
-<ul>
-<li><a name="display.when"></a><code>when</code>: <a href="#instant"><a href="#instant"><code>instant</code></a></a></li>
-</ul>
 <h5>Return values</h5>
 <ul>
-<li><a name="display.0"></a> <a href="#timezone_display"><a href="#timezone_display"><code>timezone-display</code></a></a></li>
+<li><a name="id.0"></a> <code>string</code></li>
 </ul>
 <h4><a name="utc_offset"></a><code>utc-offset: func</code></h4>
-<p>The same as <a href="#display"><code>display</code></a>, but only return the UTC offset.</p>
+<p>The number of nanoseconds difference between UTC time and the local
+time of the currently configured timezone at the exact time of
+<a href="#instant"><code>instant</code></a>.</p>
+<p>The magnitude of the returned value will always be less than
+86,400,000,000,000 which is the number of nanoseconds in a day
+(24<em>60</em>60*1e9).</p>
+<p>In implementations that do not expose an actual time zone, this
+should return 0.</p>
 <h5>Params</h5>
 <ul>
 <li><a name="utc_offset.when"></a><code>when</code>: <a href="#instant"><a href="#instant"><code>instant</code></a></a></li>
diff --git a/wit/timezone.wit b/wit/timezone.wit
index 60ab6cc..be59640 100644
--- a/wit/timezone.wit
+++ b/wit/timezone.wit
@@ -5,45 +5,31 @@ interface timezone {
     @unstable(feature = clocks-timezone)
     use system-clock.{instant};
 
-    /// Return information needed to display the given `instant` in the
-    /// currently configured time zone. This includes the UTC offset and the
-    /// time zone name.
+    /// Return the IANA identifier of the currently configured timezone. The id
+    /// `UTC` indicates Coordinated Universal Time. Otherwise, this should be an
+    /// identifier from the IANA Time Zone Database.
     ///
-    /// If the currently configured timezone cannot be determined, return a
-    /// `timezone-display` for `UTC` with a `utc-offset` of 0.
+    /// For displaying to a user, the identifier should be converted into a
+    /// localized name by means of an internationalization API.
+    ///
+    /// In implementations that do not expose an actual time zone, this
+    /// should be the string `UTC`.
+    ///
+    /// In time zones that do not have an applicable name, a formatted
+    /// representation of the UTC offset may be returned, such as `-04:00`.
     @unstable(feature = clocks-timezone)
-    display: func(when: instant) -> timezone-display;
+    id: func() -> string;
 
-    /// The same as `display`, but only return the UTC offset.
+    /// The number of nanoseconds difference between UTC time and the local
+    /// time of the currently configured timezone at the exact time of
+    /// `instant`.
+    ///
+    /// The magnitude of the returned value will always be less than
+    /// 86,400,000,000,000 which is the number of nanoseconds in a day
+    /// (24*60*60*1e9).
+    ///
+    /// In implementations that do not expose an actual time zone, this
+    /// should return 0.
     @unstable(feature = clocks-timezone)
     utc-offset: func(when: instant) -> s64;
-
-    /// Information useful for displaying a specific `instant` in the currently
-    /// configured time zone.
-    @unstable(feature = clocks-timezone)
-    record timezone-display {
-        /// The number of nanoseconds difference between UTC time and the local
-        /// time of the timezone.
-        ///
-        /// The returned value will always be less than 86,400,000,000,000 which
-        /// is the number of nanoseconds in a day (24*60*60*1e9).
-        ///
-        /// In implementations that do not expose an actual time zone, this
-        /// should return 0.
-        utc-offset: s64,
-
-        /// The IANA identifier of the timezone. The id `UTC` indicates
-        /// Coordinated Universal Time. Otherwise, this should be an identifier
-        /// from the IANA Time Zone Database.
-        ///
-        /// For displaying to a user, the identifier should be converted into a
-        /// localized name by means of an internationalization API.
-        ///
-        /// In implementations that do not expose an actual time zone, this
-        /// should be the string `UTC`.
-        ///
-        /// In time zones that do not have an applicable name, a formatted
-        /// representation of the UTC offset may be returned, such as `-04:00`.
-        id: string,
-    }
 }