From 24d3dacf0182bc28c0f2987e85f8b708abd0ac8a Mon Sep 17 00:00:00 2001
From: Colin Murphy <colmurph@adobe.com>
Date: Wed, 23 Aug 2023 09:05:44 -0400
Subject: [PATCH] Make timezone a per-instance value.

Timezone and clock should be handled similarly. If clocks are switched
back to resources, then timezones could be switched back as well.
---
 example-world.md | 24 +-----------------------
 wit/timezone.wit | 20 ++------------------
 2 files changed, 3 insertions(+), 41 deletions(-)

diff --git a/example-world.md b/example-world.md
index 6f768f8..f716f89 100644
--- a/example-world.md
+++ b/example-world.md
@@ -149,7 +149,7 @@ also known as <a href="https://en.wikipedia.org/wiki/Unix_time">Unix Time</a>.</
 <p>
 #### <a name="timezone_display">`record timezone-display`</a>
 <p>Information useful for displaying the timezone of a specific <a href="#datetime"><code>datetime</code></a>.</p>
-<p>This information may vary within a single <a href="#timezone"><code>timezone</code></a> to reflect daylight
+<p>This information may vary within a single <code>timezone</code> to reflect daylight
 saving time adjustments.</p>
 <h5>Record Fields</h5>
 <ul>
@@ -179,21 +179,8 @@ representation of the UTC offset may be returned, such as <code>-04:00</code>.</
 should return false.</p>
 </li>
 </ul>
-<h4><a name="timezone"><code>type timezone</code></a></h4>
-<p><code>u32</code></p>
-<p>A timezone.
-<p>In timezones that recognize daylight saving time, also known as daylight
-time and summer time, the information returned from the functions varies
-over time to reflect these adjustments.</p>
-<p>This <a href="https://github.com/WebAssembly/WASI/blob/main/docs/WitInWasi.md#Resources">represents a resource</a>.</p>
 <hr />
 <h3>Functions</h3>
-<h4><a name="instance_timezone"><code>instance-timezone: func</code></a></h4>
-<p>Return the system timezone, creating the resource.</p>
-<h5>Return values</h5>
-<ul>
-<li><a name="instance_timezone.0"></a> <a href="#timezone"><a href="#timezone"><code>timezone</code></a></a></li>
-</ul>
 <h4><a name="display"><code>display: func</code></a></h4>
 <p>Return information needed to display the given <a href="#datetime"><code>datetime</code></a>. This includes
 the UTC offset, the time zone name, and a flag indicating whether
@@ -203,7 +190,6 @@ daylight saving time is active.</p>
 saving time.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="display.this"><code>this</code></a>: <a href="#timezone"><a href="#timezone"><code>timezone</code></a></a></li>
 <li><a name="display.when"><code>when</code></a>: <a href="#datetime"><a href="#datetime"><code>datetime</code></a></a></li>
 </ul>
 <h5>Return values</h5>
@@ -214,17 +200,9 @@ saving time.</p>
 <p>The same as <a href="#display"><code>display</code></a>, but only return the UTC offset.</p>
 <h5>Params</h5>
 <ul>
-<li><a name="utc_offset.this"><code>this</code></a>: <a href="#timezone"><a href="#timezone"><code>timezone</code></a></a></li>
 <li><a name="utc_offset.when"><code>when</code></a>: <a href="#datetime"><a href="#datetime"><code>datetime</code></a></a></li>
 </ul>
 <h5>Return values</h5>
 <ul>
 <li><a name="utc_offset.0"></a> <code>s32</code></li>
 </ul>
-<h4><a name="drop_timezone"><code>drop-timezone: func</code></a></h4>
-<p>Dispose of the specified input-stream, after which it may no longer
-be used.</p>
-<h5>Params</h5>
-<ul>
-<li><a name="drop_timezone.this"><code>this</code></a>: <a href="#timezone"><a href="#timezone"><code>timezone</code></a></a></li>
-</ul>
diff --git a/wit/timezone.wit b/wit/timezone.wit
index 41734f6..a872bff 100644
--- a/wit/timezone.wit
+++ b/wit/timezone.wit
@@ -1,18 +1,6 @@
 interface timezone {
     use wall-clock.{datetime}
 
-    /// A timezone.
-    ///
-    /// In timezones that recognize daylight saving time, also known as daylight
-    /// time and summer time, the information returned from the functions varies
-    /// over time to reflect these adjustments.
-    ///
-    /// This [represents a resource](https://github.com/WebAssembly/WASI/blob/main/docs/WitInWasi.md#Resources).
-    type timezone = u32
-
-    /// Return the system timezone, creating the resource.
-    instance-timezone: func() -> timezone
-
     /// Return information needed to display the given `datetime`. This includes
     /// the UTC offset, the time zone name, and a flag indicating whether
     /// daylight saving time is active.
@@ -20,14 +8,10 @@ interface timezone {
     /// If the timezone cannot be determined for the given `datetime`, return a
     /// `timezone-display` for `UTC` with a `utc-offset` of 0 and no daylight
     /// saving time.
-    display: func(this: timezone, when: datetime) -> timezone-display
+    display: func(when: datetime) -> timezone-display
 
     /// The same as `display`, but only return the UTC offset.
-    utc-offset: func(this: timezone, when: datetime) -> s32
-
-    /// Dispose of the specified input-stream, after which it may no longer
-    /// be used.
-    drop-timezone: func(this: timezone)
+    utc-offset: func(when: datetime) -> s32
 
     /// Information useful for displaying the timezone of a specific `datetime`.
     ///