Skip to content

Commit 9469587

Browse files
authored
Unrolled build for rust-lang#124736
Rollup merge of rust-lang#124736 - calebsander:feature/upgrade-time, r=dtolnay compiler: upgrade time from 0.3.34 to 0.3.36 This ensures the version of `time` used in `rustc` includes this change: time-rs/time#671. This fix is a necessary prerequisite for rust-lang#99969, which adds `FromIterator` implementations for `Box<str>`. Previously, `time` had an `Into::into` that resolved to the identity impl followed by a `collect::<Result<Box<_>, _>>()`. With the new FromIterator implementations for Box<str>, the Into::into resolution is ambiguous and time fails to compile. Thanks to `@dtolnay` for the analysis in rust-lang#99969 (comment). The `time` fix removes the identity `Into::into` conversion, allowing `time` to compile with the new `FromIterator` implementations. This version of `time` also matches what `cargo` recently switched to in rust-lang/cargo#13834.
2 parents 06e88c3 + 43c8e13 commit 9469587

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Diff for: Cargo.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -5597,9 +5597,9 @@ version = "0.1.0"
55975597

55985598
[[package]]
55995599
name = "time"
5600-
version = "0.3.34"
5600+
version = "0.3.36"
56015601
source = "registry+https://github.com/rust-lang/crates.io-index"
5602-
checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"
5602+
checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
56035603
dependencies = [
56045604
"deranged",
56055605
"itoa",
@@ -5618,9 +5618,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
56185618

56195619
[[package]]
56205620
name = "time-macros"
5621-
version = "0.2.17"
5621+
version = "0.2.18"
56225622
source = "registry+https://github.com/rust-lang/crates.io-index"
5623-
checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774"
5623+
checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
56245624
dependencies = [
56255625
"num-conv",
56265626
"time-core",

Diff for: compiler/rustc_driver_impl/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ rustc_trait_selection = { path = "../rustc_trait_selection" }
4949
rustc_ty_utils = { path = "../rustc_ty_utils" }
5050
serde_json = "1.0.59"
5151
shlex = "1.0"
52-
time = { version = "0.3", default-features = false, features = ["alloc", "formatting", "parsing", "macros"] }
52+
time = { version = "0.3.36", default-features = false, features = ["alloc", "formatting", "parsing", "macros"] }
5353
tracing = { version = "0.1.35" }
5454
# tidy-alphabetical-end
5555

0 commit comments

Comments
 (0)