Track upstream Instant and SystemTime sources

daxpedda · Dec 9, 2024 · e55e7d3 · e55e7d3
1 parent df3a54a
commit e55e7d3
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/.github/upstream-sources.json b/.github/upstream-sources.json
@@ -3,6 +3,13 @@
 	{ "owner": "rust-lang", "repo": "libm", "tag": "libm-v0.2.11", "path": "src/math/copysign.rs" },
 	{ "owner": "rust-lang", "repo": "libm", "tag": "libm-v0.2.11", "path": "src/math/round.rs" },
 	{ "owner": "rust-lang", "repo": "rust", "tag": "1.83.0", "path": "library/core/src/time.rs" },
+	{ "owner": "rust-lang", "repo": "rust", "tag": "1.83.0", "path": "library/std/src/time.rs" },
+	{
+		"owner": "rust-lang",
+		"repo": "rust",
+		"tag": "1.83.0",
+		"path": "library/std/src/sys/pal/unsupported/time.rs"
+	},
 	{
 		"owner": "rust-lang",
 		"repo": "rust",

diff --git a/src/time/instant.rs b/src/time/instant.rs
@@ -1,4 +1,6 @@
 //! Re-implementation of [`std::time::Instant`].
+//!
+//! See <https://github.com/rust-lang/rust/blob/1.83.0/library/std/src/time.rs#L271-L468>.
 #![cfg_attr(
 	not(feature = "std"),
 	doc = "",

diff --git a/src/time/system_time.rs b/src/time/system_time.rs
@@ -1,5 +1,6 @@
 //! Re-implementation of [`std::time::SystemTime`].
-
+//!
+//! See <https://github.com/rust-lang/rust/blob/1.83.0/library/std/src/time.rs#L470-L707>.
 #![cfg_attr(
 	not(feature = "std"),
 	doc = "",
@@ -56,11 +57,10 @@ impl SystemTime {
 	)]
 	#[allow(clippy::missing_errors_doc, clippy::trivially_copy_pass_by_ref)]
 	pub fn duration_since(&self, earlier: Self) -> Result<Duration, SystemTimeError> {
-		if self.0 < earlier.0 {
-			Err(SystemTimeError(earlier.0 - self.0))
-		} else {
-			Ok(self.0 - earlier.0)
-		}
+		// See <https://github.com/rust-lang/rust/blob/1.83.0/library/std/src/sys/pal/unsupported/time.rs#L34-L36>.
+		self.0
+			.checked_sub(earlier.0)
+			.ok_or_else(|| SystemTimeError(earlier.0 - self.0))
 	}
 
 	/// See [`std::time::SystemTime::elapsed()`].