Skip to content

Regression fix to avoid further beta backports: Remove unsound TrustedRandomAccess implementations - #87343

Merged
bors merged 1 commit into
rust-lang:masterfrom
steffahn:fix_unsound_zip_optimization_only_regression_fix
Jul 22, 2021
Merged

Regression fix to avoid further beta backports: Remove unsound TrustedRandomAccess implementations#87343
bors merged 1 commit into
rust-lang:masterfrom
steffahn:fix_unsound_zip_optimization_only_regression_fix

Conversation

@steffahn

@steffahnsteffahn commented Jul 21, 2021

Copy link
Copy Markdown
Member

Removes the implementations that depend on the user-definable trait Copy.

Only fix regressions to ensure merge in 1.55: Does not modify vec::IntoIter.


This PR applies the beta-1.53 backport #86222 (merged as part of #86225), a reduced version of #85874 that only fixes regressions, to master in order to avoid the need for further backports from 1.55 onwards. Beta-1.54 backport already happened with #87136. In case that #85874 gets merged quickly (within a week), this PR would be unnecessary.

r? @cuviper

Removes the implementations that depend on the user-definable trait `Copy`.
Only fix regressions to ensure merge in 1.55: Does not modify `vec::IntoIter`.
@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 21, 2021
@steffahnsteffahn changed the title Remove unsound TrustedRandomAccess implementationsRegression fix to avoid further beta backports: Remove unsound TrustedRandomAccess implementationsJul 21, 2021
@cuviper

Copy link
Copy Markdown
Member

Thanks! Let's go ahead and merge this first, since #85874 has more complicated changes to review.

@bors r+

@bors

bors commented Jul 21, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit 1b66a79 has been approved by cuviper

@borsbors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 21, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 22, 2021
…laumeGomez
Rollup of 6 pull requests
Successful merges:
- rust-lang#87270 (Don't display <table> in item summary)
- rust-lang#87281 (Normalize generic_ty before checking if bound is met)
- rust-lang#87288 (rustdoc: Restore --default-theme, etc, by restoring varname escaping)
- rust-lang#87307 (Allow combining -Cprofile-generate and -Cpanic=unwind when targeting MSVC.)
- rust-lang#87343 (Regression fix to avoid further beta backports: Remove unsound TrustedRandomAccess implementations)
- rust-lang#87357 (Update my name/email in .mailmap)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit aece3df into rust-lang:masterJul 22, 2021
@rustbotrustbot added this to the 1.55.0 milestone Jul 22, 2021
@steffahn
steffahn deleted the fix_unsound_zip_optimization_only_regression_fix branch July 22, 2021 15:43
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@steffahn@cuviper@bors@rust-highfive@rustbot