diff options
| author | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2024-05-05 16:42:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-05 16:42:47 +0200 |
| commit | 3953df53f88ac9783ba27c094425a1993d35248f (patch) | |
| tree | 8f4f8b639080c576f534e53df2606aad0950610a /compiler/rustc_parse/src | |
| parent | b3342e1f62ab723dfb413cd46b89bb165e83e810 (diff) | |
| parent | 43c8e139fd36c83711e3f2331153f7c2065ff1df (diff) | |
| download | rust-3953df53f88ac9783ba27c094425a1993d35248f.tar.gz rust-3953df53f88ac9783ba27c094425a1993d35248f.zip | |
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: https://github.com/time-rs/time/pull/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 https://github.com/rust-lang/rust/pull/99969#issuecomment-2001422230. 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 https://github.com/rust-lang/cargo/pull/13834.
Diffstat (limited to 'compiler/rustc_parse/src')
0 files changed, 0 insertions, 0 deletions