Skip to content

Destabilize cfg(target_has_atomic_load_store = ...)#94040

Merged
bors merged 1 commit intorust-lang:masterfrom
Mark-Simulacrum:destabilize-load-store
Feb 17, 2022
Merged

Destabilize cfg(target_has_atomic_load_store = ...)#94040
bors merged 1 commit intorust-lang:masterfrom
Mark-Simulacrum:destabilize-load-store

Conversation

@Mark-Simulacrum
Copy link
Member

@Mark-Simulacrum Mark-Simulacrum commented Feb 16, 2022 •
edited
Loading

This was not intended to be stabilized yet.

This keeps the cfg_target_has_atomic feature gate name since compiler-builtins otherwise depends on it and I'd rather not try to manage a bump across a crates.io published repository given the time-sensitivity here (we need to land this quickly to avoid a beta backport).

Closes #32976

r? @Amanieu

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Feb 16, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 16, 2022
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Feb 16, 2022
Closed
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Mark-Simulacrum
Copy link
Member Author

Mark-Simulacrum commented Feb 16, 2022

Bumped with a version that re-uses the old cfg_target_has_atomic gate to avoid the compiler-builtins failure.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Amanieu
Copy link
Member

Amanieu commented Feb 16, 2022

r=me once CI failure is fixed.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Mark-Simulacrum
Destabilize cfg(target_has_atomic_load_store = ...)
fc01d2b 
This was not intended to be stabilized yet.
@Mark-Simulacrum
Copy link
Member Author

Mark-Simulacrum commented Feb 16, 2022

@bors r=Amanieu p=1 (needed before beta branch on Friday)

@bors
Copy link
Collaborator

bors commented Feb 16, 2022

📌 Commit fc01d2b has been approved by Amanieu

@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 Feb 16, 2022
@bors
Copy link
Collaborator

bors commented Feb 16, 2022

⌛ Testing commit fc01d2b with merge 02e9008ac62b70bd28e538eb5f519876c10d0b24...

@rust-log-analyzer
Copy link
Collaborator

rust-log-analyzer commented Feb 16, 2022

The job armhf-gnu failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot) 
---- [ui] ui/issues/issue-42210.rs stdout ----

error: test run failed!
status: exit status: 101
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/remote-test-client" "run" "0" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/issues/issue-42210/a"
------------------------------------------
uploaded "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/issues/issue-42210/a", waiting for result

------------------------------------------
------------------------------------------
stderr:
------------------------------------------
thread 'main' panicked at 'client.read_exact(&mut header) failed with Connection reset by peer (os error 104)', src/tools/remote-test-client/src/main.rs:310:9

------------------------------------------

@bors
Copy link
Collaborator

bors commented Feb 16, 2022

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 16, 2022
@Mark-Simulacrum
Copy link
Member Author

Mark-Simulacrum commented Feb 16, 2022

@bors retry

'client.read_exact(&mut header) failed with Connection reset by peer (os error 104)', src/tools/remote-test-client/src/main.rs:310:9

@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 Feb 16, 2022
@bors
Copy link
Collaborator

bors commented Feb 17, 2022

⌛ Testing commit fc01d2b with merge 930fc4f...

@bors
Copy link
Collaborator

bors commented Feb 17, 2022

☀️ Test successful - checks-actions
Approved by: Amanieu
Pushing 930fc4f to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 17, 2022
@bors bors merged commit 930fc4f into rust-lang:master Feb 17, 2022
@rustbot rustbot added this to the 1.60.0 milestone Feb 17, 2022
@rust-timer
Copy link
Collaborator

rust-timer commented Feb 17, 2022

Finished benchmarking commit (930fc4f): comparison url.

Summary: This benchmark run did not return any relevant results.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

@Mark-Simulacrum Mark-Simulacrum deleted the destabilize-load-store branch February 17, 2022 12:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@Amanieu Amanieu

Labels

merged-by-bors This PR was explicitly merged by bors. 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.

Projects

None yet

Milestone

1.60.0

Development

Successfully merging this pull request may close these issues.

Tracking issue for #[cfg(target_has_atomic = ...)]

7 participants

@Mark-Simulacrum @rust-log-analyzer @Amanieu @bors @rust-timer @rust-highfive @rustbot