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

Revert "Make the c feature for compiler-builtins opt-in instead of inferred" #103732

Merged
merged 1 commit into from
Oct 31, 2022

Conversation

Mark-Simulacrum
Copy link
Member

@Mark-Simulacrum Mark-Simulacrum commented Oct 29, 2022

This reverts commit 3acb505 (PR #101833).

The changes in this commit caused several bugs/incompatibilities (#101833 (comment), #102560). For now we're reverting this commit and will re-land it alongside fixes for those bugs.

Re-opens #101172
cc #102560
cc #102579

…f inferred"

This reverts commit 3acb505
(PR rust-lang#101833).

The changes in this commit caused several bugs or at least
incompatibilies. For now we're reverting this commit and will re-land it
alongside fixes for those bugs.
@rustbot
Copy link
Collaborator

rustbot commented Oct 29, 2022

r? @jyn514

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Oct 29, 2022
@Mark-Simulacrum Mark-Simulacrum added beta-nominated Nominated for backporting to the compiler in the beta channel. beta-accepted Accepted for backporting to the compiler in the beta channel. labels Oct 29, 2022
@jyn514
Copy link
Member

jyn514 commented Oct 29, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Oct 29, 2022

📌 Commit 5984b1d has been approved by jyn514

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 Oct 29, 2022
@Mark-Simulacrum Mark-Simulacrum removed beta-nominated Nominated for backporting to the compiler in the beta channel. beta-accepted Accepted for backporting to the compiler in the beta channel. labels Oct 29, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 31, 2022
Rollup of 5 pull requests

Successful merges:

 - rust-lang#103338 (Fix unreachable_pub suggestion for enum with fields)
 - rust-lang#103603 (Lang item cleanups)
 - rust-lang#103732 (Revert "Make the `c` feature for `compiler-builtins` opt-in instead of inferred")
 - rust-lang#103766 (Add tracking issue to `error_in_core`)
 - rust-lang#103789 (Update E0382.md)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 3affb05 into rust-lang:master Oct 31, 2022
@rustbot rustbot added this to the 1.67.0 milestone Oct 31, 2022
@Mark-Simulacrum Mark-Simulacrum deleted the revert-compiler-builtins branch January 4, 2023 21:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants