compiler: upgrade time from 0.3.34 to 0.3.36 #124736
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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. The 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.
|
rustbot has assigned @Mark-Simulacrum. Use |
rustbot
added
S-waiting-on-review
|
These commits modify the If this was unintentional then you should revert the changes before this PR is merged. |
|
r? @dtolnay |
|
@bors r+ |
|
🌲 The tree is currently closed for pull requests below priority 9999. This pull request will be tested once the tree is reopened. |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 5, 2024
…llaumeGomez Rollup of 6 pull requests Successful merges: - rust-lang#124148 (rustdoc-search: search for references) - rust-lang#124668 (Fix bootstrap panic when build from tarball) - rust-lang#124736 (compiler: upgrade time from 0.3.34 to 0.3.36) - rust-lang#124748 (Fix unwinding on 32-bit watchOS ARM (v2)) - rust-lang#124749 (Stabilize exclusive_range_pattern (v2)) - rust-lang#124750 (Document That `f16` And `f128` Hardware Support is Limited (v2)) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 5, 2024
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.
This comment was marked as off-topic.
This comment was marked as off-topic.
1 task
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This ensures the version of
timeused inrustcincludes this change: time-rs/time#671.This fix is a necessary prerequisite for #99969, which adds
FromIteratorimplementations forBox<str>. Previously,timehad anInto::intothat resolved to the identity impl, followed by acollect::<Result<Box<_>, _>>(). With the newFromIteratorimplementations forBox<str>, theInto::intoresolution is ambiguous and time fails to compile. Thanks to @dtolnay for the analysis in #99969 (comment).The
timefix removes the identityInto::intoconversion, allowingtimeto compile with the newFromIteratorimplementations. This version oftimealso matches whatcargorecently switched to in rust-lang/cargo#13834.