Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove macOS 10.10 dynamic linker bug workaround #128209

Merged
merged 1 commit into from
Sep 20, 2024

Conversation

beetrees
Copy link
Contributor

@beetrees beetrees commented Jul 25, 2024

Rust's current minimum macOS version is 10.12, so the hack can be removed. This PR also updates the remove_dir_all docs to reflect that all supported macOS versions are protected against TOCTOU race conditions (the fallback implementation was already removed in #127683).

try-job: dist-x86_64-apple
try-job: dist-aarch64-apple
try-job: dist-apple-various
try-job: aarch64-apple
try-job: x86_64-apple-1

@rustbot
Copy link
Collaborator

rustbot commented Jul 25, 2024

r? @fmease

rustbot has assigned @fmease.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Jul 25, 2024
@Urgau
Copy link
Member

Urgau commented Jul 31, 2024

@thomcc @madsmtm any objections to doing this?

@BlackHoleFox
Copy link
Contributor

Not one of the people you tagged, but this looks fine. Rust no longer supports either compiling from <10.12 or running there, so people building Rust should no longer be able to hit any buggy linkers or loaders that were involved in the original problem.

Copy link
Contributor

@madsmtm madsmtm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fine by me

@Urgau
Copy link
Member

Urgau commented Sep 4, 2024

Let's try a few apple CI jobs...

@bors try

@bors
Copy link
Contributor

bors commented Sep 4, 2024

⌛ Trying commit 81b0b96 with merge 1e3d339...

bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 4, 2024
Remove macOS 10.10 dynamic linker bug workaround

Rust's current minimum macOS version is 10.12, so the hack can be removed. This PR also updates the `remove_dir_all` docs to reflect that all supported macOS versions are protected against TOCTOU race conditions (the fallback implementation was already removed in rust-lang#127683).

try-job: dist-x86_64-apple
try-job: dist-aarch64-apple
try-job: dist-apple-various
try-job: aarch64-apple
try-job: x86_64-apple-1
@rust-log-analyzer

This comment has been minimized.

@bors
Copy link
Contributor

bors commented Sep 4, 2024

💔 Test failed - checks-actions

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 4, 2024
@beetrees
Copy link
Contributor Author

beetrees commented Sep 4, 2024

I've removed the failing codegen test as it was testing that the workaround (which this PR removes) was present. The PR implementing the workaround also included a UI test, so CI would still fail if this bug were still present.

@rustbot ready

Another @bors try would be much appreciated.

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 4, 2024
@Urgau
Copy link
Member

Urgau commented Sep 4, 2024

@bors try

@bors
Copy link
Contributor

bors commented Sep 4, 2024

⌛ Trying commit 0444056 with merge 2afea33...

bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 4, 2024
Remove macOS 10.10 dynamic linker bug workaround

Rust's current minimum macOS version is 10.12, so the hack can be removed. This PR also updates the `remove_dir_all` docs to reflect that all supported macOS versions are protected against TOCTOU race conditions (the fallback implementation was already removed in rust-lang#127683).

try-job: dist-x86_64-apple
try-job: dist-aarch64-apple
try-job: dist-apple-various
try-job: aarch64-apple
try-job: x86_64-apple-1
@bors
Copy link
Contributor

bors commented Sep 4, 2024

☀️ Try build successful - checks-actions
Build commit: 2afea33 (2afea33030801c20845adeb1284545a1a59e290b)

Copy link
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks

@jieyouxu
Copy link
Member

jieyouxu commented Sep 20, 2024

Does this need compatibility relnotes? EDIT: no it does not, because min supported macOS version is higher than the hack's version.

@jieyouxu jieyouxu assigned jieyouxu and unassigned fmease Sep 20, 2024
@jieyouxu
Copy link
Member

But otherwise,

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Sep 20, 2024

📌 Commit 0444056 has been approved by jieyouxu

It is now in the queue for this repository.

@bors bors 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 Sep 20, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 20, 2024
…llaumeGomez

Rollup of 7 pull requests

Successful merges:

 - rust-lang#128209 (Remove macOS 10.10 dynamic linker bug workaround)
 - rust-lang#130526 (Begin experimental support for pin reborrowing)
 - rust-lang#130611 (Address diagnostics regression for `const_char_encode_utf8`.)
 - rust-lang#130614 (Add arm64e-apple-tvos target)
 - rust-lang#130617 (bail if there are too many non-region infer vars in the query response)
 - rust-lang#130619 (Fix scraped examples height)
 - rust-lang#130624 (Add `Vec::as_non_null`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit bf6389f into rust-lang:master Sep 20, 2024
7 checks passed
@rustbot rustbot added this to the 1.83.0 milestone Sep 20, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Sep 20, 2024
Rollup merge of rust-lang#128209 - beetrees:no-macos-10.10, r=jieyouxu

Remove macOS 10.10 dynamic linker bug workaround

Rust's current minimum macOS version is 10.12, so the hack can be removed. This PR also updates the `remove_dir_all` docs to reflect that all supported macOS versions are protected against TOCTOU race conditions (the fallback implementation was already removed in rust-lang#127683).

try-job: dist-x86_64-apple
try-job: dist-aarch64-apple
try-job: dist-apple-various
try-job: aarch64-apple
try-job: x86_64-apple-1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants