Refactor Epoch to its own time scale

src/asn1der.rs

@@ -126,7 +126,7 @@ fn test_encdec() {
         let encdec_epoch = Epoch::from_der(&buf).unwrap();
         // Check that the duration in J1900 TAI is the same
         assert_eq!(
-            encdec_epoch.duration_since_j1900_tai, epoch.duration_since_j1900_tai,
+            encdec_epoch.duration, epoch.duration,
             "Decoded epoch incorrect ({ts:?}):\ngot: {encdec_epoch}\nexp: {epoch}",
         );
         // Check that the time scale used is preserved

src/deprecated.rs

@@ -78,14 +78,16 @@ impl Epoch {
         self.to_duration_since_j1900()
     }
 
-    #[must_use]
-    #[deprecated(
-        note = "Prefix for this function is now `to_` instead of `as_`.",
-        since = "3.5.0"
-    )]
-    pub fn as_duration_since_j1900_in_time_scale(&self, time_scale: TimeScale) -> Duration {
-        self.to_duration_since_j1900_in_time_scale(time_scale)
-    }
+    /*
+        #[must_use]
+        #[deprecated(
+            note = "Prefix for this function is now `to_` instead of `as_`.",
+            since = "3.5.0"
+        )]
+        pub fn as_duration_since_j1900_in_time_scale(&self, time_scale: TimeScale) -> Duration {
+            self.to_duration_since_j1900_in_time_scale(time_scale)
+        }
+    */
 
     #[must_use]
     #[deprecated(
@@ -96,14 +98,16 @@ impl Epoch {
         self.to_tai_seconds()
     }
 
-    #[must_use]
-    #[deprecated(
-        note = "Prefix for this function is now `to_` instead of `as_`.",
-        since = "3.5.0"
-    )]
-    pub const fn as_tai_duration(&self) -> Duration {
-        self.to_tai_duration()
-    }
+    /*
+        #[must_use]
+        #[deprecated(
+            note = "Prefix for this function is now `to_` instead of `as_`.",
+            since = "3.5.0"
+        )]
+        pub const fn as_tai_duration(&self) -> Duration {
+            self.to_tai_duration()
+        }
+    */
 
     #[must_use]
     #[deprecated(

src/efmt/formatter.rs

@@ -99,8 +99,8 @@ impl Formatter {
         }
     }
 
-    pub fn in_time_scale(epoch: Epoch, format: Format, time_scale: TimeScale) -> Self {
-        Self::new(epoch.in_time_scale(time_scale), format)
+    pub fn to_time_scale(epoch: Epoch, format: Format, time_scale: TimeScale) -> Self {
+        Self::new(epoch.to_time_scale(time_scale), format)
     }
 
     pub fn set_timezone(&mut self, offset: Duration) {
@@ -127,7 +127,8 @@ impl fmt::Display for Formatter {
 
         if self.format.need_gregorian() {
             // This is a specific branch so we don't recompute the gregorian information for each token.
-            let (y, mm, dd, hh, min, s, nanos) = Epoch::compute_gregorian(self.epoch.to_duration());
+            let (y, mm, dd, hh, min, s, nanos) =
+                Epoch::compute_gregorian(self.epoch.to_duration_in_time_scale(TimeScale::TAI));
             // And format.
             for (i, maybe_item) in self
                 .format