Commit 3953df5
authored
Rollup merge of #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 #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 #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 files changed
+5
-5
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5597 | 5597 | | |
5598 | 5598 | | |
5599 | 5599 | | |
5600 | | - | |
| 5600 | + | |
5601 | 5601 | | |
5602 | | - | |
| 5602 | + | |
5603 | 5603 | | |
5604 | 5604 | | |
5605 | 5605 | | |
| |||
5618 | 5618 | | |
5619 | 5619 | | |
5620 | 5620 | | |
5621 | | - | |
| 5621 | + | |
5622 | 5622 | | |
5623 | | - | |
| 5623 | + | |
5624 | 5624 | | |
5625 | 5625 | | |
5626 | 5626 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
49 | 49 | | |
50 | 50 | | |
51 | 51 | | |
52 | | - | |
| 52 | + | |
53 | 53 | | |
54 | 54 | | |
55 | 55 | | |
| |||
0 commit comments